Changeset 8932 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2015-10-23T12:12:50+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #11971 - -/=`key in Overpass Download changes map size

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/OverpassDownloadAction.java (modified) (7 diffs)
• gui/download/DownloadDialog.java (modified) (1 diff)
• gui/download/SlippyMapChooser.java (modified) (3 diffs)

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

@@ -11 +11 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.FocusEvent;
+import java.awt.event.FocusListener;
 import java.awt.event.KeyEvent;
 import java.util.ArrayList;
@@ -21 +23 @@
 
 import javax.swing.AbstractAction;
+import javax.swing.Action;
+import javax.swing.ActionMap;
 import javax.swing.JButton;
 import javax.swing.JComponent;
@@ -83 +87 @@
     }
 
-    static final class OverpassDownloadDialog extends DownloadDialog {
-
-        protected HistoryComboBox overpassServer;
-        protected HistoryComboBox overpassWizard;
-        protected JosmTextArea overpassQuery;
+    private static final class DisableActionsFocusListener implements FocusListener {
+
+        private final ActionMap actionMap;
+
+        private DisableActionsFocusListener(ActionMap actionMap) {
+            this.actionMap = actionMap;
+        }
+
+        @Override
+        public void focusGained(FocusEvent e) {
+            enableActions(false);
+        }
+
+        @Override
+        public void focusLost(FocusEvent e) {
+            enableActions(true);
+        }
+
+        private void enableActions(boolean enabled) {
+            for (Object key : actionMap.allKeys()) {
+                Action action = actionMap.get(key);
+                if (action != null) {
+                    action.setEnabled(enabled);
+                }
+            }
+        }
+    }
+
+    private static final class OverpassDownloadDialog extends DownloadDialog {
+
+        private HistoryComboBox overpassServer;
+        private HistoryComboBox overpassWizard;
+        private JosmTextArea overpassQuery;
         private static OverpassDownloadDialog instance;
-        static final StringProperty OVERPASS_SERVER = new StringProperty("download.overpass.server", "http://overpass-api.de/api/");
-        static final CollectionProperty OVERPASS_SERVER_HISTORY = new CollectionProperty("download.overpass.servers",
+        private static final StringProperty OVERPASS_SERVER = new StringProperty("download.overpass.server", "http://overpass-api.de/api/");
+        private static final CollectionProperty OVERPASS_SERVER_HISTORY = new CollectionProperty("download.overpass.servers",
                 Arrays.asList("http://overpass-api.de/api/", "http://overpass.osm.rambler.ru/cgi/"));
-        static final CollectionProperty OVERPASS_WIZARD_HISTORY = new CollectionProperty("download.overpass.wizard", new ArrayList<String>());
+        private static final CollectionProperty OVERPASS_WIZARD_HISTORY = new CollectionProperty("download.overpass.wizard",
+                new ArrayList<String>());
 
         private OverpassDownloadDialog(Component parent) {
@@ -113 +146 @@
         protected void buildMainPanelAboveDownloadSelections(JPanel pnl) {
 
+            DisableActionsFocusListener disableActionsFocusListener =
+                    new DisableActionsFocusListener(slippyMapChooser.getNavigationComponentActionMap());
+
             pnl.add(new JLabel(), GBC.eol()); // needed for the invisible checkboxes cbDownloadGpxData, cbDownloadNotes
 
@@ -118 +154 @@
             overpassWizard = new HistoryComboBox();
             overpassWizard.setToolTipText(tooltip);
+            overpassWizard.getEditor().getEditorComponent().addFocusListener(disableActionsFocusListener);
             final JButton buildQuery = new JButton(tr("Build query"));
             buildQuery.addActionListener(new AbstractAction() {
@@ -143 +180 @@
             overpassQuery = new JosmTextArea("", 8, 80);
             overpassQuery.setFont(GuiHelper.getMonospacedFont(overpassQuery));
+            overpassQuery.addFocusListener(disableActionsFocusListener);
             JScrollPane scrollPane = new JScrollPane(overpassQuery);
             final JPanel pane = new JPanel(new BorderLayout());
@@ -160 +198 @@
 
             overpassServer = new HistoryComboBox();
+            overpassServer.getEditor().getEditorComponent().addFocusListener(disableActionsFocusListener);
             pnl.add(new JLabel(tr("Overpass server: ")), GBC.std().insets(5, 5, 5, 5));
             pnl.add(overpassServer, GBC.eol().fill(GBC.HORIZONTAL));
-
         }
 

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

@@ -117 +117 @@
         pnl.add(cbDownloadNotes, GBC.eol().insets(50, 5, 1, 5));
 
+        // must be created before hook
+        slippyMapChooser = new SlippyMapChooser();
+
         // hook for subclasses
         buildMainPanelAboveDownloadSelections(pnl);
-
-        slippyMapChooser = new SlippyMapChooser();
 
         // predefined download selections

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

@@ -9 +9 @@
 import java.beans.PropertyChangeListener;
 
+import javax.swing.ActionMap;
 import javax.swing.JPanel;
 
@@ -16 +17 @@
 
 /**
- * JComponent that displays the slippy map tiles
+ * JComponent that displays the slippy map tiles.
  *
  * @author Tim Haussmann
- *
+ * @since 1390
  */
 public class SlippyMapChooser extends JPanel implements DownloadSelection, PropertyChangeListener {
 
     private DownloadDialog iGui;
-    private SlippyMapBBoxChooser pnlSlippyMapBBoxChooser;
+    private final SlippyMapBBoxChooser pnlSlippyMapBBoxChooser;
     // standard dimension
     private Dimension iDownloadDialogDimension;
@@ -87 +88 @@
         }
     }
+
+    /**
+     * Returns the action map of the underlying navigation component.
+     * @return the action map of the underlying navigation component
+     * @since 8932
+     */
+    public final ActionMap getNavigationComponentActionMap() {
+        return pnlSlippyMapBBoxChooser.getActionMap();
+    }
 }