projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Fix ao_ignite.c to work without HAS_IGNITE
[fw/altos]
/
altoslib
/
AltosLaunchSites.java
diff --git
a/altoslib/AltosLaunchSites.java
b/altoslib/AltosLaunchSites.java
index 0922bcea296eebef1f6a50a64804650f2ddc6757..67d163bc073bf4454553448de6741ce1778e67fe 100644
(file)
--- 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
*
* 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
*
* 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.
*/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altoslib_
7
;
+package org.altusmetrum.altoslib_
14
;
import java.io.*;
import java.lang.*;
import java.io.*;
import java.lang.*;
@@
-29,6
+30,8
@@
public class AltosLaunchSites extends Thread {
LinkedList<AltosLaunchSite> sites;
AltosLaunchSiteListener listener;
LinkedList<AltosLaunchSite> sites;
AltosLaunchSiteListener listener;
+ public static String launch_sites_url;
+
void notify_complete() {
listener.notify_launch_sites(sites);
}
void notify_complete() {
listener.notify_launch_sites(sites);
}
@@
-47,7
+50,16
@@
public class AltosLaunchSites extends Thread {
public void run() {
try {
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);
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) {
add(line);
}
} catch (Exception e) {
+ System.out.printf("file exception %s\n", e.toString());
} finally {
notify_complete();
}
} finally {
notify_complete();
}