Changeset 2327 in josm for trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java

Timestamp:

27.10.2009 01:21:32 (3 years ago)

Author:

Gubaer

Message:

Cleanup in download logic (less global, more encapsulation)

File:

• trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java

@@ -9 +9 @@
 import java.awt.event.FocusEvent;
 import java.awt.event.FocusListener;
-import java.awt.event.KeyEvent;
-import java.awt.event.KeyListener;
 
 import javax.swing.JLabel;
@@ -56 +54 @@
                             double maxlat = Double.parseDouble(latlon[2].getText());
                             double maxlon = Double.parseDouble(latlon[3].getText());
-                            if (minlat != gui.minlat || minlon != gui.minlon || maxlat != gui.maxlat || maxlon != gui.maxlon) {
-                                gui.minlat = minlat; gui.minlon = minlon;
-                                gui.maxlat = maxlat; gui.maxlon = maxlon;
-                                gui.boundingBoxChanged(BoundingBoxSelection.this);
+                            Bounds b = new Bounds(minlat,minlon, maxlat,maxlon);
+                            if (gui.getSelectedDownloadArea() == null) return;
+                            if (gui.getSelectedDownloadArea() == null || !gui.getSelectedDownloadArea().equals(new Bounds(minlat,minlon, maxlat,maxlon))) {
+                                gui.boundingBoxChanged(b, BoundingBoxSelection.this);
                             }
                         } catch (NumberFormatException x) {
@@ -119 +117 @@
         });
 
-        gui.tabpane.addTab(tr("Bounding Box"), dlg);
+        gui.addDownloadAreaSelector(dlg, tr("Bounding Box"));
     }
 
@@ -132 +130 @@
     private boolean parseURL(DownloadDialog gui) {
         Bounds b = OsmUrlToBounds.parse(osmUrl.getText());
-        if(b == null) return false;
-        gui.minlon = b.min.lon();
-        gui.minlat = b.min.lat();
-        gui.maxlon = b.max.lon();
-        gui.maxlat = b.max.lat();
-        gui.boundingBoxChanged(BoundingBoxSelection.this);
+        if(b == null) return false;        
+        gui.boundingBoxChanged(b,BoundingBoxSelection.this);
         updateBboxFields(gui);
         updateUrl(gui);
@@ -144 +138 @@
 
     private void updateBboxFields(DownloadDialog gui) {
-        latlon[0].setText(Double.toString(gui.minlat));
-        latlon[1].setText(Double.toString(gui.minlon));
-        latlon[2].setText(Double.toString(gui.maxlat));
-        latlon[3].setText(Double.toString(gui.maxlon));
+        Bounds b = gui.getSelectedDownloadArea();
+        if (b == null) return;
+        latlon[0].setText(Double.toString(b.getMin().lat()));
+        latlon[1].setText(Double.toString(b.getMin().lon()));
+        latlon[2].setText(Double.toString(b.getMax().lat()));
+        latlon[3].setText(Double.toString(b.getMax().lon()));
         for (JTextField f : latlon) {
             f.setCaretPosition(0);
@@ -154 +150 @@
 
     private void updateUrl(DownloadDialog gui) {
-        showUrl.setText(OsmUrlToBounds.getURL(new Bounds(
-                new LatLon(gui.minlat, gui.minlon), new LatLon(gui.maxlat, gui.maxlon))));
+        if (gui.getSelectedDownloadArea() == null) return;
+        showUrl.setText(OsmUrlToBounds.getURL(gui.getSelectedDownloadArea()));
     }
 }