Changes in src/org/openstreetmap/josm/data/projection/UTM.java [17:23] in josm

File:

• src/org/openstreetmap/josm/data/projection/UTM.java (modified) (7 diffs)

src/org/openstreetmap/josm/data/projection/UTM.java

@@ -15 +15 @@
 import javax.swing.SpinnerNumberModel;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.GeoPoint;
-import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.GBC;
-import org.openstreetmap.josm.gui.Main;
 
 /**
@@ -80 +79 @@
         };
 
-        private enum Hemisphere {north, south};
+        private enum Hemisphere {north, south}
 
         /**
@@ -102 +101 @@
          * Spinner with all possible zones for the configuration panel
          */
-        private JSpinner zoneSpinner;
+        JSpinner zoneSpinner;
         /**
          * Hemisphere combo for the configuration panel
          */
-        private JComboBox hemisphereCombo;
+        JComboBox hemisphereCombo;
 
         
@@ -187 +186 @@
          * @author imi
          */
-        private class ZoneData {
+        private static class ZoneData {
                 int zone = 0;
                 Hemisphere hemisphere = Hemisphere.north;
@@ -193 +192 @@
         /**
          * Try to autodetect the zone and hemisphere from the dataset.
-         * @param dataSet The dataset to extrakt zone information from.
          * @return The zone data extrakted from the dataset.
          */
-        private ZoneData autoDetect(DataSet dataSet) {
+        ZoneData autoDetect(Bounds b) {
                 ZoneData zd = new ZoneData();
-                
-                Bounds b = dataSet.getBoundsLatLon();
                 if (b == null)
                         return zd;
@@ -234 +230 @@
          */
         @Override
-        public void init(DataSet dataSet) {
+        public void init(Bounds b) {
                 if (zone == 0) {
-                        ZoneData zd = autoDetect(dataSet);
+                        ZoneData zd = autoDetect(b);
                         zone = zd.zone;
                         hemisphere = zd.hemisphere;
@@ -274 +270 @@
                         public void actionPerformed(ActionEvent e) {
                                 if (Main.main.getMapFrame() != null) {
-                                        DataSet ds = Main.main.getMapFrame().mapView.getActiveDataSet();
-                                        ZoneData zd = autoDetect(ds);
+                                        ZoneData zd = autoDetect(Main.main.ds.getBoundsLatLon());
                                         if (zd.zone == 0)
                                                 JOptionPane.showMessageDialog(Main.main, "Autodetection failed. Maybe the data set contain too few information.");