Changeset 2331 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2009-10-27T14:51:46+01:00 (14 years ago)

Author:

Gubaer

Message:

Cleanup in DownloadAction and DownloadDialog
Added context-sensitive help to DownloadDialog

File:

• trunk/src/org/openstreetmap/josm/actions/DownloadAction.java (modified) (2 diffs)

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

@@ -35 +35 @@
 public class DownloadAction extends JosmAction {
     private static final Logger logger = Logger.getLogger(DownloadAction.class.getName());
-    
-    private DownloadDialog dialog;
-    private ExtendedDialog downloadDialog;
-
+ 
     public DownloadAction() {
         super(tr("Download from OSM..."), "download", tr("Download map data from the OSM server."),
@@ -45 +42 @@
     }
 
-    /**
-     * Creates the download dialog
-     * 
-     * @return the downlaod dialog
-     */
-    protected ExtendedDialog createDownloadDialog() {
-        if (dialog == null) 
-            dialog = new DownloadDialog();
-        dialog.restoreSettings();
-
-        final String prefName = dialog.getClass().getName()+ ".geometry";
-        final WindowGeometry wg = WindowGeometry.centerInWindow(Main.parent,
-                new Dimension(1000,600));
-
-        if (downloadDialog == null) {
-            JPanel downPanel = new JPanel(new BorderLayout());
-            downPanel.add(dialog, BorderLayout.CENTER);
-            downloadDialog= new ExtendedDialog(Main.parent,
-                tr("Download"),
-                new String[] {tr("OK"), tr("Cancel")});
-            downloadDialog.setContent(downPanel, false /* don't use a scroll pane inside the dialog */);
-            downloadDialog.setButtonIcons(new String[] {"ok", "cancel"});
-            downloadDialog.setRememberWindowGeometry(prefName, wg);
-        }
-        return downloadDialog;
-    }
-
     public void actionPerformed(ActionEvent e) {
-        ExtendedDialog dlg = createDownloadDialog();
-        boolean finish = false;
-        while (!finish) {            
-            dlg.showDialog();
-            if (dlg.getValue() == 1 /* OK */) {
-                dialog.rememberSettings();
-                Bounds area = dialog.getSelectedDownloadArea();                
-                if (dialog.isDownloadOsmData()) {
-                    DownloadOsmTask task = new DownloadOsmTask();
-                    Future<?> future = task.download(dialog.isNewLayerRequired(), area, null);
-                    Main.worker.submit(new PostDownloadHandler(task, future));
-                    finish = true;
-                }
-                if (dialog.isDownloadGpxData()) {
-                    DownloadGpsTask task = new DownloadGpsTask();
-                    Future<?> future = task.download(dialog.isNewLayerRequired(),area, null);
-                    Main.worker.submit(new PostDownloadHandler(task, future));
-                    finish = true;
-                }
-            } else {
-                finish = true;
+        DownloadDialog dialog = DownloadDialog.getInstance();
+        dialog.setVisible(true);
+        if (! dialog.isCanceled()) {
+            dialog.rememberSettings();
+            Bounds area = dialog.getSelectedDownloadArea();                
+            if (dialog.isDownloadOsmData()) {
+                DownloadOsmTask task = new DownloadOsmTask();
+                Future<?> future = task.download(dialog.isNewLayerRequired(), area, null);
+                Main.worker.submit(new PostDownloadHandler(task, future));
             }
-            if (!finish) {
-                JOptionPane.showMessageDialog(
-                        Main.parent,
-                        tr("Please select at least one task to download"),
-                        tr("Error"),
-                        JOptionPane.ERROR_MESSAGE
-                );
+            if (dialog.isDownloadGpxData()) {
+                DownloadGpsTask task = new DownloadGpsTask();
+                Future<?> future = task.download(dialog.isNewLayerRequired(),area, null);
+                Main.worker.submit(new PostDownloadHandler(task, future));
             }
-        }
-    }
+        } 
+    }    
 }