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

Timestamp:

2010-02-21T09:34:24+01:00 (15 years ago)

Author:

bastiK

Message:

fixed #4583 - "Download object" ignores Enter

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/DownloadPrimitiveAction.java (modified) (3 diffs)
• gui/widgets/AbstractTextComponentValidator.java (modified) (1 diff)
• gui/widgets/OsmIdTextField.java (modified) (1 diff)

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

@@ -13 +13 @@
 import javax.swing.JLabel;
 import javax.swing.JPanel;
+import javax.swing.KeyStroke;
 
 import org.openstreetmap.josm.Main;
@@ -62 +63 @@
         OsmIdTextField tfId = new OsmIdTextField();
         tfId.setToolTipText(tr("Enter the ID of the object that should be downloaded"));
+        // forward the enter key stroke to the download button
+        tfId.getKeymap().removeKeyStrokeBinding(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0, false));
         gc.weightx = 1;
         all.add(tfId, gc);
@@ -81 +84 @@
                 tr("Close dialog and cancel downloading")
         });
+        dialog.setDefaultButton(1);
         dialog.configureContextsensitiveHelp("/Action/DownloadObject", true /* show help button */);
         dialog.showDialog();

trunk/src/org/openstreetmap/josm/gui/widgets/AbstractTextComponentValidator.java

@@ -84 +84 @@
      */
     public AbstractTextComponentValidator(JTextComponent tc) throws IllegalArgumentException {
+        this(tc, true);
+    }
+
+    /**
+     * Alternative constructor that allows to turn off the actionListener.
+     * This can be useful if the enter key stroke needs to be forwarded to the default button in a dialog.
+     */
+    public AbstractTextComponentValidator(JTextComponent tc, boolean addActionListener) throws IllegalArgumentException {
         CheckParameterUtil.ensureParameterNotNull(tc, "tc");
         this.tc = tc;
         tc.addFocusListener(this);
         tc.getDocument().addDocumentListener(this);
-        if (tc instanceof JTextField) {
-            JTextField tf = (JTextField)tc;
-            tf.addActionListener(this);
+        if (addActionListener) {
+            if (tc instanceof JTextField) {
+                JTextField tf = (JTextField)tc;
+                tf.addActionListener(this);
+            }
         }
         tc.addPropertyChangeListener("enabled", this);

trunk/src/org/openstreetmap/josm/gui/widgets/OsmIdTextField.java

@@ -33 +33 @@
 
         public OsmIdValidator(JTextComponent tc) {
-            super(tc);
+            super(tc, false);
         }