Changeset 13261 in josm for trunk

Timestamp:

2017-12-30T00:17:44+01:00 (7 years ago)

Author:

Don-vip

Message:

Open Location: new expert combobox to choose whether to zoom on downloaded data (like in download dialog) + remember window geometry (no i18n impact)

Location:

trunk

Files:

• src/org/openstreetmap/josm/actions/OpenLocationAction.java (modified) (7 diffs)
• src/org/openstreetmap/josm/actions/downloadtasks/AbstractDownloadTask.java (modified) (1 diff)
• src/org/openstreetmap/josm/actions/downloadtasks/DownloadTask.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandlerTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/OpenLocationAction.java

@@ -43 +43 @@
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.progress.swing.PleaseWaitProgressMonitor;
+import org.openstreetmap.josm.gui.util.WindowGeometry;
 import org.openstreetmap.josm.gui.widgets.HistoryComboBox;
 import org.openstreetmap.josm.spi.preferences.Config;
@@ -59 +60 @@
      * true if the URL needs to be opened in a new layer, false otherwise
      */
-    private static final BooleanProperty USE_NEW_LAYER = new BooleanProperty("download.newlayer", false);
+    private static final BooleanProperty USE_NEW_LAYER = new BooleanProperty("download.location.newlayer", false);
+    /**
+     * true to zoom to entire newly downloaded data, false otherwise
+     */
+    private static final BooleanProperty DOWNLOAD_ZOOMTODATA = new BooleanProperty("download.location.zoomtodata", true);
     /**
      * the list of download tasks
@@ -139 +144 @@
         all.add(layer, GBC.eop().fill(GBC.BOTH));
 
+        // zoom to downloaded data
+        JCheckBox zoom = new JCheckBox(tr("Zoom to downloaded data"));
+        zoom.setToolTipText(tr("Select to zoom to entire newly downloaded data."));
+        zoom.setSelected(DOWNLOAD_ZOOMTODATA.get());
+        all.add(zoom, GBC.eop().fill(GBC.BOTH));
+
+        ExpertToggleAction.addVisibilitySwitcher(zoom);
+
         ExtendedDialog dialog = new ExtendedDialog(Main.parent,
                 tr("Download Location"),
@@ -148 +161 @@
                 tr("Close dialog and cancel downloading"))
             .configureContextsensitiveHelp("/Action/OpenLocation", true /* show help button */);
+        dialog.setupDialog();
+        dialog.pack();
+        dialog.setRememberWindowGeometry(getClass().getName() + ".geometry",
+                    WindowGeometry.centerInWindow(Main.parent, dialog.getPreferredSize()));
         if (dialog.showDialog().getValue() == 1) {
             USE_NEW_LAYER.put(layer.isSelected());
+            DOWNLOAD_ZOOMTODATA.put(zoom.isSelected());
             remindUploadAddressHistory(uploadAddresses);
             openUrl(Utils.strip(uploadAddresses.getText()));
@@ -207 +225 @@
      */
     public List<Future<?>> openUrl(boolean newLayer, String url) {
-        return realOpenUrl(newLayer, url);
+        return openUrl(newLayer, DOWNLOAD_ZOOMTODATA.get(), url);
     }
 
@@ -217 +235 @@
      */
     public List<Future<?>> openUrl(String url) {
-        return realOpenUrl(USE_NEW_LAYER.get(), url);
-    }
-
-    private List<Future<?>> realOpenUrl(boolean newLayer, String url) {
+        return openUrl(USE_NEW_LAYER.get(), DOWNLOAD_ZOOMTODATA.get(), url);
+    }
+
+    /**
+     * Open the given URL.
+     * @param newLayer true if the URL needs to be opened in a new layer, false otherwise
+     * @param zoomToData true to zoom to entire newly downloaded data, false otherwise
+     * @param url The URL to open
+     * @return the list of tasks that have been started successfully (can be empty).
+     * @since 13261
+     */
+    public List<Future<?>> openUrl(boolean newLayer, boolean zoomToData, String url) {
         Collection<DownloadTask> tasks = findDownloadTasks(url, false);
 
@@ -235 +261 @@
         for (final DownloadTask task : tasks) {
             try {
+                task.setZoomAfterDownload(zoomToData);
                 result.add(MainApplication.worker.submit(new PostDownloadHandler(task, task.loadUrl(newLayer, url, monitor))));
             } catch (IllegalArgumentException e) {

trunk/src/org/openstreetmap/josm/actions/downloadtasks/AbstractDownloadTask.java

@@ -79 +79 @@
     }
 
-    /**
-     * Sets whether the map view will zoom to download area after download
-     * @param zoomAfterDownload if true, the map view will zoom to download area after download
-     * @since 11658
-     */
+    @Override
     public final void setZoomAfterDownload(boolean zoomAfterDownload) {
         this.zoomAfterDownload = zoomAfterDownload;

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadTask.java

@@ -128 +128 @@
      */
     String getConfirmationMessage(URL url);
+
+    /**
+     * Sets whether the map view will zoom to download area after download
+     * @param zoomAfterDownload if true, the map view will zoom to download area after download
+     * @since 13261
+     */
+    void setZoomAfterDownload(boolean zoomAfterDownload);
 }

trunk/test/unit/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandlerTest.java

@@ -79 +79 @@
                 return null;
             }
+
+            @Override
+            public void setZoomAfterDownload(boolean zoomAfterDownload) {
+                // Do nothing
+            }
         };
     }