altosui/altosuilib: Cleanup -Xlint:unchecked warnings

[fw/altos] / altosui / AltosSiteMapPreload.java

diff --git a/altosui/AltosSiteMapPreload.java b/altosui/AltosSiteMapPreload.java
index 33849c660bb1fa12124cd0bc6f89540883defa0c..8380b9673c253ec00f0954bc0e3d0beee4a0bcf3 100644 (file)
--- a/altosui/AltosSiteMapPreload.java
+++ b/altosui/AltosSiteMapPreload.java
@@ -26,6 +26,7 @@ import java.text.*;
 import java.lang.Math;
 import java.net.URL;
 import java.net.URLConnection;
+import org.altusmetrum.altosuilib_1.*;
 
 class AltosMapPos extends Box {
        AltosUI         owner;
@@ -177,7 +178,7 @@ class AltosSites extends Thread {
                try {
                        URLConnection uc = url.openConnection();
                        //int length = uc.getContentLength();
-                       
+
                        InputStreamReader in_stream = new InputStreamReader(uc.getInputStream(), Altos.unicode_set);
                        BufferedReader in = new BufferedReader(in_stream);
 
@@ -205,14 +206,14 @@ class AltosSites extends Thread {
        }
 }
 
-public class AltosSiteMapPreload extends AltosDialog implements ActionListener, ItemListener {
+public class AltosSiteMapPreload extends AltosUIDialog implements ActionListener, ItemListener {
        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);
 
@@ -221,7 +222,7 @@ public class AltosSiteMapPreload extends AltosDialog implements ActionListener,
        AltosSites      sites;
        JLabel          site_list_label;
        JComboBox       site_list;
-               
+
        JToggleButton   load_button;
        boolean         loading;
        JButton         close_button;
@@ -325,7 +326,7 @@ public class AltosSiteMapPreload extends AltosDialog implements ActionListener,
 
                pane.setLayout(new GridBagLayout());
 
-               map = new AltosSiteMap(4);
+               map = new AltosSiteMap(radius);
 
                c.fill = GridBagConstraints.BOTH;
                c.anchor = GridBagConstraints.CENTER;
@@ -346,7 +347,7 @@ public class AltosSiteMapPreload extends AltosDialog implements ActionListener,
                pbar.setValue(0);
                pbar.setString("");
                pbar.setStringPainted(true);
-               
+
                c.fill = GridBagConstraints.HORIZONTAL;
                c.anchor = GridBagConstraints.CENTER;
                c.insets = i;
@@ -372,7 +373,7 @@ public class AltosSiteMapPreload extends AltosDialog implements ActionListener,
                c.gridwidth = 1;
 
                pane.add(site_list_label, c);
-               
+
                site_list = new JComboBox(new String[] { "Site List" });
                site_list.addItemListener(this);
 
@@ -389,7 +390,7 @@ public class AltosSiteMapPreload extends AltosDialog implements ActionListener,
                c.gridwidth = 1;
 
                pane.add(site_list, c);
-               
+
                lat = new AltosMapPos(owner,
                                      "Latitude:",
                                      lat_hemi_names,
@@ -406,7 +407,7 @@ public class AltosSiteMapPreload extends AltosDialog implements ActionListener,
                c.anchor = GridBagConstraints.CENTER;
 
                pane.add(lat, c);
-               
+
                lon = new AltosMapPos(owner,
                                      "Longitude:",
                                      lon_hemi_names,
@@ -428,7 +429,7 @@ public class AltosSiteMapPreload extends AltosDialog implements ActionListener,
                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;
@@ -445,7 +446,7 @@ public class AltosSiteMapPreload extends AltosDialog implements ActionListener,
                close_button = new JButton("Close");
                close_button.addActionListener(this);
                close_button.setActionCommand("close");
-               
+
                c.fill = GridBagConstraints.NONE;
                c.anchor = GridBagConstraints.CENTER;
                c.insets = i;
@@ -463,4 +464,4 @@ public class AltosSiteMapPreload extends AltosDialog implements ActionListener,
                setLocationRelativeTo(owner);
                setVisible(true);
        }
-}
\ No newline at end of file
+}