Changeset 2898 in josm for trunk/src/org/openstreetmap/josm/gui/download

Timestamp:

2010-01-27T21:58:17+01:00 (14 years ago)

Author:

jttt

Message:

Fixed #4436 Changing bbox resets zoom after search

File:

• trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java (modified) (7 diffs)

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

@@ -9 +9 @@
 import java.awt.GridBagLayout;
 import java.awt.GridLayout;
-import java.awt.Insets;
 import java.awt.event.ActionEvent;
 import java.awt.event.MouseAdapter;
@@ -82 +81 @@
         public String thirdcol;
         public String fourthcol;
+        @Override
         public String toString() {
             return name;
@@ -103 +103 @@
         String s = Main.pref.get("namefinder.server", servers[0].name);
         for(int i = 0; i < servers.length; ++i) {
-            if(servers[i].name.equals(s))
+            if(servers[i].name.equals(s)) {
                 server.setSelectedIndex(i);
+            }
         }
         lpanel.add(new JLabel(tr("Enter a place name to search for:")));
@@ -210 +211 @@
                     currentResult.name = atts.getValue("name");
                     currentResult.info = atts.getValue("info");
-                    if(currentResult.info != null)
+                    if(currentResult.info != null) {
                         currentResult.info = tr(currentResult.info);
+                    }
                     currentResult.lat = Double.parseDouble(atts.getValue("lat"));
                     currentResult.lon = Double.parseDouble(atts.getValue("lon"));
@@ -234 +236 @@
                     String[] bbox = atts.getValue("boundingbox").split(",");
                     currentResult.bounds = new Bounds(
-                        new LatLon(Double.parseDouble(bbox[0]), Double.parseDouble(bbox[2])),
-                        new LatLon(Double.parseDouble(bbox[1]), Double.parseDouble(bbox[3])));
+                            new LatLon(Double.parseDouble(bbox[0]), Double.parseDouble(bbox[2])),
+                            new LatLon(Double.parseDouble(bbox[1]), Double.parseDouble(bbox[3])));
                     data.add(currentResult);
                 }
@@ -464 +466 @@
     class ListSelectionHandler implements ListSelectionListener {
         public void valueChanged(ListSelectionEvent lse) {
-            SearchResult r = null;
-            try {
-                r = (SearchResult) model.getValueAt(lse.getFirstIndex(), 0);
-            } catch (Exception x) {
-                // Ignore
-            }
+            SearchResult r = model.getSelectedSearchResult();
             if (r != null) {
                 parent.boundingBoxChanged(r.getDownloadArea(), PlaceSelection.this);
@@ -538 +535 @@
                 break;
             case 3:
-                if(sr.bounds != null)
+                if(sr.bounds != null) {
                     setText(sr.bounds.toShortString(new DecimalFormat("0.000")));
-                else
+                } else {
                     setText(sr.zoom != 0 ? Integer.toString(sr.zoom) : tr("unknown"));
+                }
                 break;
             }