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

Timestamp:

2009-10-29T05:18:55+01:00 (14 years ago)

Author:

Gubaer

Message:

fixed #3525: Double-clicking on a bookmark should initiate its download
fixed #3802: Download button is not highlighted anymore in the download dialog
Improved bookmark tab in Download Dialog

File:

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

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

@@ -55 +55 @@
     static private DownloadDialog instance;
     
+    
     /**
      * Replies the unique instance of the download dialog
@@ -75 +76 @@
     private JCheckBox cbDownloadOsmData = new JCheckBox(tr("OpenStreetMap data"), true);
     private JCheckBox cbDownloadGpxData = new JCheckBox(tr("Raw GPS data"));
+    /** the download action and button */
+    private DownloadAction actDownload;
+    private SideButton btnDownload;
 
     
@@ -124 +128 @@
         JPanel pnl = new JPanel();
         pnl.setLayout(new FlowLayout());
-        
-        pnl.add(new SideButton(new DownloadAction()));
+         
+        pnl.add(btnDownload = new SideButton(actDownload = new DownloadAction()));
+        btnDownload.setFocusable(true);
         pnl.add(new SideButton(new CancelAction()));
         pnl.add(new SideButton(new ContextSensitiveHelpAction(ht("/Dialog/DownloadDialog"))));
@@ -199 +204 @@
         }
         updateSizeCheck();
+    }
+    
+    /**
+     * Invoked by 
+     * @param b
+     */
+    public void startDownload(Bounds b) {
+        this.currentBounds = b;
+        actDownload.run();
     }
     
@@ -343 +357 @@
         }
         
-        public void actionPerformed(ActionEvent e) {
+        public void run() {
             if (currentBounds == null) {
                 JOptionPane.showMessageDialog(
@@ -367 +381 @@
             }
             setCanceled(false);
-            setVisible(false);            
+            setVisible(false);  
+        }
+        
+        public void actionPerformed(ActionEvent e) {
+            run();
         }       
     }
@@ -375 +393 @@
         public void windowClosing(WindowEvent e) {
             new CancelAction().run();
+        }
+
+        @Override
+        public void windowActivated(WindowEvent e) {
+            btnDownload.requestFocusInWindow();
         }        
     }