Changeset 2142 in josm for trunk

Timestamp:

2009-09-15T21:16:43+02:00 (15 years ago)

Author:

Gubaer

Message:

fixed #3514: NullPointerException when double-clicking on a download bookmark

Location:

trunk/src/org/openstreetmap/josm/gui/download

Files:

• BookmarkSelection.java (modified) (1 diff)
• BoundingBoxSelection.java (modified) (4 diffs)
• DownloadDialog.java (modified) (5 diffs)

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

@@ -45 +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/BoundingBoxSelection.java

@@ -81 +81 @@
         }
 
-        KeyListener osmUrlKeyListener = new KeyListener() {
-            public void keyPressed(KeyEvent keyEvent) {}
-            public void keyReleased(KeyEvent keyEvent) {
-                if (keyEvent.getKeyCode() == KeyEvent.VK_ENTER && parseURL(gui))
-                    gui.closeDownloadDialog(true);
-            }
-            public void keyTyped(KeyEvent keyEvent) {}
-        };
-
-        osmUrl.addKeyListener(osmUrlKeyListener);
         osmUrl.getDocument().addDocumentListener(new osmUrlRefresher());
 
@@ -99 +89 @@
             @Override public void focusGained(FocusEvent e) {
                 SwingUtilities.invokeLater(new Runnable() {
-                        public void run() {
-                            osmUrl.selectAll();
-                        }
+                    public void run() {
+                        osmUrl.selectAll();
+                    }
                 });
             }
@@ -123 +113 @@
         showUrl.setBackground(dlg.getBackground());
         showUrl.addFocusListener(new FocusAdapter(){
-           @Override
+            @Override
             public void focusGained(FocusEvent e) {
                 showUrl.selectAll();
@@ -158 +148 @@
         latlon[2].setText(Double.toString(gui.maxlat));
         latlon[3].setText(Double.toString(gui.maxlon));
-        for (JTextField f : latlon)
+        for (JTextField f : latlon) {
             f.setCaretPosition(0);
+        }
     }
 
     private void updateUrl(DownloadDialog gui) {
         showUrl.setText(OsmUrlToBounds.getURL(new Bounds(
-        new LatLon(gui.minlat, gui.minlon), new LatLon(gui.maxlat, gui.maxlon))));
+                new LatLon(gui.minlat, gui.minlon), new LatLon(gui.maxlat, gui.maxlon))));
     }
 }

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

@@ -19 +19 @@
 import javax.swing.JCheckBox;
 import javax.swing.JLabel;
-import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JTabbedPane;
@@ -47 +46 @@
 public class DownloadDialog extends JPanel {
 
-    // the JOptionPane that contains this dialog. required for the closeDialog() method.
-    private JOptionPane optionPane;
-
     public interface DownloadTask {
         /**
@@ -179 +175 @@
 
         getInputMap(WHEN_IN_FOCUSED_WINDOW).put(
-        KeyStroke.getKeyStroke(KeyEvent.VK_V, InputEvent.CTRL_MASK), "checkClipboardContents");
+                KeyStroke.getKeyStroke(KeyEvent.VK_V, InputEvent.CTRL_MASK), "checkClipboardContents");
 
         getActionMap().put("checkClipboardContents", new AbstractAction() {
@@ -231 +227 @@
     public void boundingBoxChanged(DownloadSelection eventSource) {
         for (DownloadSelection s : downloadSelections) {
-            if (s != eventSource) s.boundingBoxChanged(this);
+            if (s != eventSource) {
+                s.boundingBoxChanged(this);
+            }
         }
         updateSizeCheck();
@@ -242 +240 @@
         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;
-    }
 }