X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosLaunchSites.java;h=2c04c90eeeb50a28d905a1b1233dbcc61e40a21a;hp=fa4026ba0f71dbcff27d80984f17b4f3cb417b48;hb=eaf2ee0f498b519d64e1664a2b8c66c52ac1497c;hpb=87c8bb3956897830da1f7aaca2990a9571767b73

diff --git a/altoslib/AltosLaunchSites.java b/altoslib/AltosLaunchSites.java
index fa4026ba..2c04c90e 100644
--- a/altoslib/AltosLaunchSites.java
+++ b/altoslib/AltosLaunchSites.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_8;
+package org.altusmetrum.altoslib_13;
 
 import java.io.*;
 import java.lang.*;
@@ -29,6 +30,8 @@ public class AltosLaunchSites extends Thread {
 	LinkedList<AltosLaunchSite>	sites;
 	AltosLaunchSiteListener		listener;
 
+	public static String		launch_sites_url;
+
 	void notify_complete() {
 		listener.notify_launch_sites(sites);
 	}
@@ -47,7 +50,16 @@ public class AltosLaunchSites extends Thread {
 
 	public void run() {
 		try {
-			url = new URL(AltosLib.launch_sites_url);
+			String	path;
+
+			if (launch_sites_url != null)
+				path = launch_sites_url;
+			else {
+				path = System.getenv(AltosLib.launch_sites_env);
+				if (path == null)
+					path = AltosLib.launch_sites_url;
+			}
+			url = new URL(path);
 			URLConnection uc = url.openConnection();
 
 			InputStreamReader in_stream = new InputStreamReader(uc.getInputStream(), AltosLib.unicode_set);
@@ -60,6 +72,7 @@ public class AltosLaunchSites extends Thread {
 				add(line);
 			}
 		} catch (Exception e) {
+			System.out.printf("file exception %s\n", e.toString());
 		} finally {
 			notify_complete();
 		}