summaryrefslogtreecommitdiff
path: root/altoslib/AltosLaunchSites.java
diff options
context:
space:
mode:
authorBdale Garbee <bdale@gag.com>2018-10-08 17:52:22 -0600
committerBdale Garbee <bdale@gag.com>2018-10-08 17:52:22 -0600
commit2450e69d3afd3345a6e5f7ca133d929fbdcfdf53 (patch)
treec04aa34bdecbf909dbeea8854390364bf140e7ca /altoslib/AltosLaunchSites.java
parent449ed72371f80f03dcc5dcf66af5c9465e7ed57e (diff)
parent5a86ff43a2b4a90dbddc1bba48019626e1b83e10 (diff)
Merge branch 'branch-1.8' into debian
Diffstat (limited to 'altoslib/AltosLaunchSites.java')
-rw-r--r--altoslib/AltosLaunchSites.java14
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();