Changeset 435 in josm for trunk/src/org

Timestamp:

2007-10-27T18:09:50+02:00 (17 years ago)

Author:

framm

Message:

• add a call for download area selection classes to close the download dialog
• close download dialog on double-click of a bookmark (patch by Ulf Lamping)

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/DownloadAction.java (modified) (1 diff)
• gui/download/BookmarkSelection.java (modified) (3 diffs)
• gui/download/DownloadDialog.java (modified) (3 diffs)

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

@@ -42 +42 @@
                 JOptionPane pane = new JOptionPane(downPanel, JOptionPane.PLAIN_MESSAGE, JOptionPane.OK_CANCEL_OPTION);
                 JDialog dlg = pane.createDialog(Main.parent, tr("Download"));
+                dialog.setOptionPane(pane);
 
                 if (dlg.getWidth() > 1000)

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

@@ -8 +8 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.MouseListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
 
 import javax.swing.DefaultListModel;
@@ -33 +36 @@
 public class BookmarkSelection implements DownloadSelection {
 
-        private Preferences.Bookmark tempBookmark= null;
+        private Preferences.Bookmark tempBookmark = null;
         private BookmarkList bookmarks; 
         
@@ -42 +45 @@
 
                 bookmarks = new BookmarkList();
+                
+                /* add a handler for "double click" mouse events */
+                MouseListener mouseListener = new MouseAdapter() {
+                        @Override public void mouseClicked(MouseEvent e) {
+                                if (e.getClickCount() == 2) {
+                                        int index = bookmarks.locationToIndex(e.getPoint());
+                                        gui.closeDownloadDialog(true);
+                                }
+                        }
+                };
+                bookmarks.addMouseListener(mouseListener);
+                
                 bookmarks.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
                         public void valueChanged(ListSelectionEvent e) {

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

@@ -10 +10 @@
 import javax.swing.JCheckBox;
 import javax.swing.JLabel;
+import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JTabbedPane;
@@ -33 +34 @@
 public class DownloadDialog extends JPanel {
         
-
+        // the JOptionPane that contains this dialog. required for the closeDialog() method.
+        private JOptionPane optionPane;
+        
         public interface DownloadTask {
                 /**
@@ -138 +141 @@
                 return tabpane.getSelectedIndex();
         }
+        
+        /**
+         * Closes the download dialog. This is intended to be called by one of
+         * the various download area selection "plugins".
+         * 
+         * @param download true to download selected data, false to cancel download
+         */
+        public void closeDownloadDialog(boolean download) {
+                optionPane.setValue(download ? JOptionPane.OK_OPTION : JOptionPane.CANCEL_OPTION);
+        }
+
+        /**
+         * Has to be called after this dialog has been added to a JOptionPane.
+         * @param optionPane
+         */
+        public void setOptionPane(JOptionPane optionPane) {
+        this.optionPane = optionPane;
+    }
 }