projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib/altosui/altosuilib/libaltos: Remove trailing whitespace
[fw/altos]
/
altosui
/
AltosSiteMapPreload.java
diff --git
a/altosui/AltosSiteMapPreload.java
b/altosui/AltosSiteMapPreload.java
index 972765aea446fc28e80b94e81ecee9fe7175003f..8380b9673c253ec00f0954bc0e3d0beee4a0bcf3 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,8
+177,8
@@
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);
@@
-228,7
+222,7
@@
public class AltosSiteMapPreload extends JDialog implements ActionListener, Item
AltosSites sites;
JLabel site_list_label;
JComboBox site_list;
AltosSites sites;
JLabel site_list_label;
JComboBox site_list;
-
+
JToggleButton load_button;
boolean loading;
JButton close_button;
JToggleButton load_button;
boolean loading;
JButton close_button;
@@
-312,6
+306,7
@@
public class AltosSiteMapPreload extends JDialog implements ActionListener, Item
final double latitude = lat.get_value();
final double longitude = lon.get_value();
map.setBaseLocation(latitude,longitude);
final double latitude = lat.get_value();
final double longitude = lon.get_value();
map.setBaseLocation(latitude,longitude);
+ map.draw_circle(latitude,longitude);
loading = true;
bgLoad thread = new bgLoad(map);
thread.start();
loading = true;
bgLoad thread = new bgLoad(map);
thread.start();
@@
-331,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;
@@
-352,7
+347,7
@@
public class AltosSiteMapPreload extends JDialog implements ActionListener, Item
pbar.setValue(0);
pbar.setString("");
pbar.setStringPainted(true);
pbar.setValue(0);
pbar.setString("");
pbar.setStringPainted(true);
-
+
c.fill = GridBagConstraints.HORIZONTAL;
c.anchor = GridBagConstraints.CENTER;
c.insets = i;
c.fill = GridBagConstraints.HORIZONTAL;
c.anchor = GridBagConstraints.CENTER;
c.insets = i;
@@
-378,7
+373,7
@@
public class AltosSiteMapPreload extends JDialog implements ActionListener, Item
c.gridwidth = 1;
pane.add(site_list_label, c);
c.gridwidth = 1;
pane.add(site_list_label, c);
-
+
site_list = new JComboBox(new String[] { "Site List" });
site_list.addItemListener(this);
site_list = new JComboBox(new String[] { "Site List" });
site_list.addItemListener(this);
@@
-395,7
+390,7
@@
public class AltosSiteMapPreload extends JDialog implements ActionListener, Item
c.gridwidth = 1;
pane.add(site_list, c);
c.gridwidth = 1;
pane.add(site_list, c);
-
+
lat = new AltosMapPos(owner,
"Latitude:",
lat_hemi_names,
lat = new AltosMapPos(owner,
"Latitude:",
lat_hemi_names,
@@
-412,7
+407,7
@@
public class AltosSiteMapPreload extends JDialog implements ActionListener, Item
c.anchor = GridBagConstraints.CENTER;
pane.add(lat, c);
c.anchor = GridBagConstraints.CENTER;
pane.add(lat, c);
-
+
lon = new AltosMapPos(owner,
"Longitude:",
lon_hemi_names,
lon = new AltosMapPos(owner,
"Longitude:",
lon_hemi_names,
@@
-434,7
+429,7
@@
public class AltosSiteMapPreload extends JDialog implements ActionListener, Item
load_button = new JToggleButton("Load Map");
load_button.addActionListener(this);
load_button.setActionCommand("load");
load_button = new JToggleButton("Load Map");
load_button.addActionListener(this);
load_button.setActionCommand("load");
-
+
c.fill = GridBagConstraints.NONE;
c.anchor = GridBagConstraints.CENTER;
c.insets = i;
c.fill = GridBagConstraints.NONE;
c.anchor = GridBagConstraints.CENTER;
c.insets = i;
@@
-451,7
+446,7
@@
public class AltosSiteMapPreload extends JDialog implements ActionListener, Item
close_button = new JButton("Close");
close_button.addActionListener(this);
close_button.setActionCommand("close");
close_button = new JButton("Close");
close_button.addActionListener(this);
close_button.setActionCommand("close");
-
+
c.fill = GridBagConstraints.NONE;
c.anchor = GridBagConstraints.CENTER;
c.insets = i;
c.fill = GridBagConstraints.NONE;
c.anchor = GridBagConstraints.CENTER;
c.insets = i;
@@
-469,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
+}