Changeset 6509 in josm for trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java

Timestamp:

2013-12-22T18:18:43+01:00 (10 years ago)

Author:

Don-vip

Message:

fix #9459 - initialize default center view of MapView to last download location, if any, instead of (0,0)

File:

• trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java (modified) (4 diffs)

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

@@ -307 +307 @@
     
     /**
-     * Remembers the current settings in the download dialog
-     *
+     * Remembers the current settings in the download dialog.
      */
     public void rememberSettings() {
@@ -320 +319 @@
     }
 
+    /**
+     * Restores the previous settings in the download dialog.
+     */
     public void restoreSettings() {
         cbDownloadOsmData.setSelected(Main.pref.getBoolean("download.osm", true));
@@ -339 +341 @@
             boundingBoxChanged(currentBounds,null);
         }
-        else if (!Main.pref.get("osm-download.bounds").isEmpty()) {
-            // read the bounding box from the preferences
+        else {
+            Bounds bounds = getSavedDownloadBounds();
+            if (bounds != null) {
+                currentBounds = bounds;
+                boundingBoxChanged(currentBounds, null);
+            }
+        }
+    }
+    
+    /**
+     * Returns the previously saved bounding box from preferences.
+     * @return The bounding box saved in preferences if any, {@code null} otherwise
+     * @since 6509
+     */
+    public static Bounds getSavedDownloadBounds() {
+        String value = Main.pref.get("osm-download.bounds");
+        if (!value.isEmpty()) {
             try {
-                currentBounds = new Bounds(Main.pref.get("osm-download.bounds"), ";");
-                boundingBoxChanged(currentBounds,null);
-            }
-            catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
+                return new Bounds(value, ";");
+            } catch (IllegalArgumentException e) {
+                Main.warn(e);
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Determines if the dialog autorun is enabled in preferences.
+     * @return {@code true} if the download dialog must be open at startup, {@code false} otherwise
+     */
     public static boolean isAutorunEnabled() {
         return Main.pref.getBoolean("download.autorun",false);
@@ -362 +382 @@
 
     /**
-     * Replies the currently selected download area. May be null, if no download area is selected yet.
+     * Replies the currently selected download area.
+     * @return the currently selected download area. May be {@code null}, if no download area is selected yet.
      */
     public Bounds getSelectedDownloadArea() {