Changeset 11308 in josm for trunk

Timestamp:

2016-11-25T21:07:05+01:00 (8 years ago)

Author:

Don-vip

Message:

fix #14031 - change focus with TAB in "add imagery" dialogs

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• preferences/imagery/AddImageryPanel.java (modified) (1 diff)
• preferences/imagery/AddTMSLayerPanel.java (modified) (1 diff)
• preferences/imagery/AddWMSLayerPanel.java (modified) (1 diff)
• widgets/JosmTextArea.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddImageryPanel.java

@@ -26 +26 @@
 public abstract class AddImageryPanel extends JPanel {
 
-    protected final JosmTextArea rawUrl = new JosmTextArea(3, 40);
+    protected final JosmTextArea rawUrl = new JosmTextArea(3, 40).transferFocusOnTab();
     protected final JosmTextField name = new JosmTextField();
 

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddTMSLayerPanel.java

@@ -23 +23 @@
 
     private final JosmTextField tmsZoom = new JosmTextField();
-    private final JosmTextArea tmsUrl = new JosmTextArea(3, 40);
+    private final JosmTextArea tmsUrl = new JosmTextArea(3, 40).transferFocusOnTab();
     private final transient KeyAdapter keyAdapter = new KeyAdapter() {
         @Override

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java

@@ -38 +38 @@
     private final JComboBox<String> formats = new JComboBox<>();
     private final JLabel wmsInstruction;
-    private final JosmTextArea wmsUrl = new JosmTextArea(3, 40);
+    private final JosmTextArea wmsUrl = new JosmTextArea(3, 40).transferFocusOnTab();
     private final JButton showBounds = new JButton(tr("Show bounds"));
 

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

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.widgets;
 
+import java.awt.KeyboardFocusManager;
 import java.awt.event.FocusEvent;
 import java.awt.event.FocusListener;
@@ -90 +91 @@
     }
 
+    /**
+     * Restore default behaviour of focus transfer with TAB, overriden by {@link JTextArea}.
+     * @return {@code this}
+     * @since 11308
+     */
+    public JosmTextArea transferFocusOnTab() {
+        // http://stackoverflow.com/a/525867/2257172
+        setFocusTraversalKeys(KeyboardFocusManager.FORWARD_TRAVERSAL_KEYS, null);
+        setFocusTraversalKeys(KeyboardFocusManager.BACKWARD_TRAVERSAL_KEYS, null);
+        return this;
+    }
+
     @Override
     public void focusGained(FocusEvent e) {