diff options
| author | Bdale Garbee <bdale@gag.com> | 2018-10-08 17:49:47 -0600 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2018-10-08 17:49:47 -0600 |
| commit | 34658a1236e34891b41a0a51a480717db98779e7 (patch) | |
| tree | 1e29cdc000c50e4f01e5c54aa69befd8e6919524 /altoslib/AltosLaunchSites.java | |
| parent | 3a2a5a05bb6372d9003905cee7afdfcd6d38ae7e (diff) | |
| parent | 88ae4c5ebd64215f05f5efc18f9660560b409ace (diff) | |
Merge branch 'master' into branch-1.8
Diffstat (limited to 'altoslib/AltosLaunchSites.java')
| -rw-r--r-- | altoslib/AltosLaunchSites.java | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/altoslib/AltosLaunchSites.java b/altoslib/AltosLaunchSites.java index 365f19e3..2c04c90e 100644 --- a/altoslib/AltosLaunchSites.java +++ b/altoslib/AltosLaunchSites.java @@ -16,7 +16,7 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -package org.altusmetrum.altoslib_12; +package org.altusmetrum.altoslib_13; import java.io.*; import java.lang.*; @@ -30,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); } @@ -50,9 +52,13 @@ public class AltosLaunchSites extends Thread { try { String path; - path = System.getenv(AltosLib.launch_sites_env); - if (path == null) - path = AltosLib.launch_sites_url; + 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(); |