projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
[fw/altos]
/
altosui
/
AltosSiteMapPreload.java
diff --git
a/altosui/AltosSiteMapPreload.java
b/altosui/AltosSiteMapPreload.java
index 5d437e175f4863d47eb79d8d1cf32913951d1741..66399557e6813289da168fd511bcc711a84e442f 100644
(file)
--- a/
altosui/AltosSiteMapPreload.java
+++ b/
altosui/AltosSiteMapPreload.java
@@
-18,21
+18,15
@@
package altosui;
import java.awt.*;
package altosui;
import java.awt.*;
-import java.awt.image.*;
import java.awt.event.*;
import javax.swing.*;
import java.awt.event.*;
import javax.swing.*;
-import javax.swing.event.MouseInputAdapter;
-import javax.imageio.ImageIO;
-import javax.swing.table.*;
import java.io.*;
import java.util.*;
import java.text.*;
import java.io.*;
import java.util.*;
import java.text.*;
-import java.util.prefs.*;
import java.lang.Math;
import java.lang.Math;
-import java.awt.geom.Point2D;
-import java.awt.geom.Line2D;
import java.net.URL;
import java.net.URLConnection;
import java.net.URL;
import java.net.URLConnection;
+import org.altusmetrum.altosuilib_1.*;
class AltosMapPos extends Box {
AltosUI owner;
class AltosMapPos extends Box {
AltosUI owner;
@@
-183,7
+177,7
@@
class AltosSites extends Thread {
public void run() {
try {
URLConnection uc = url.openConnection();
public void run() {
try {
URLConnection uc = url.openConnection();
- int length = uc.getContentLength();
+
//
int length = uc.getContentLength();
InputStreamReader in_stream = new InputStreamReader(uc.getInputStream(), Altos.unicode_set);
BufferedReader in = new BufferedReader(in_stream);
InputStreamReader in_stream = new InputStreamReader(uc.getInputStream(), Altos.unicode_set);
BufferedReader in = new BufferedReader(in_stream);
@@
-204,7
+198,7
@@
class AltosSites extends Thread {
sites = new LinkedList<AltosSite>();
preload = in_preload;
try {
sites = new LinkedList<AltosSite>();
preload = in_preload;
try {
- url = new URL(
"http://gag.com/~keithp/launch-sites.txt"
);
+ url = new URL(
Altos.launch_sites_url
);
} catch (java.net.MalformedURLException e) {
notify_complete();
}
} catch (java.net.MalformedURLException e) {
notify_complete();
}
@@
-212,14
+206,14
@@
class AltosSites extends Thread {
}
}
}
}
-public class AltosSiteMapPreload extends
J
Dialog implements ActionListener, ItemListener {
+public class AltosSiteMapPreload extends
AltosUI
Dialog implements ActionListener, ItemListener {
AltosUI owner;
AltosSiteMap map;
AltosMapPos lat;
AltosMapPos lon;
AltosUI owner;
AltosSiteMap map;
AltosMapPos lat;
AltosMapPos lon;
- final static int radius =
4
;
+ final static int radius =
5
;
final static int width = (radius * 2 + 1);
final static int height = (radius * 2 + 1);
final static int width = (radius * 2 + 1);
final static int height = (radius * 2 + 1);
@@
-332,7
+326,7
@@
public class AltosSiteMapPreload extends JDialog implements ActionListener, Item
pane.setLayout(new GridBagLayout());
pane.setLayout(new GridBagLayout());
- map = new AltosSiteMap(
4
);
+ map = new AltosSiteMap(
radius
);
c.fill = GridBagConstraints.BOTH;
c.anchor = GridBagConstraints.CENTER;
c.fill = GridBagConstraints.BOTH;
c.anchor = GridBagConstraints.CENTER;
@@
-470,4
+464,4
@@
public class AltosSiteMapPreload extends JDialog implements ActionListener, Item
setLocationRelativeTo(owner);
setVisible(true);
}
setLocationRelativeTo(owner);
setVisible(true);
}
-}
\ No newline at end of file
+}