Changeset 7618 in josm for trunk

Timestamp:

2014-10-14T00:25:24+02:00 (10 years ago)

Author:

Don-vip

Message:

fix #10633 - fix disabled shortcuts after focusing relation filter, command line field, etc. Regression from r7539 + r7505

File:

• trunk/src/org/openstreetmap/josm/gui/widgets/DisableShortcutsOnFocusGainedTextField.java (modified) (9 diffs)

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

@@ -3 +3 @@
 
 import java.awt.event.FocusEvent;
-import java.awt.event.FocusListener;
 import java.awt.event.KeyEvent;
 import java.util.ArrayList;
@@ -27 +26 @@
  * @since 5696
  */
-public class DisableShortcutsOnFocusGainedTextField extends JosmTextField implements FocusListener {
+public class DisableShortcutsOnFocusGainedTextField extends JosmTextField {
 
     /**
@@ -35 +34 @@
      */
     public DisableShortcutsOnFocusGainedTextField() {
-        init();
     }
 
@@ -47 +45 @@
     public DisableShortcutsOnFocusGainedTextField(String text) {
         super(text);
-        init();
     }
 
@@ -63 +60 @@
     public DisableShortcutsOnFocusGainedTextField(int columns) {
         super(columns);
-        init();
     }
 
@@ -78 +74 @@
     public DisableShortcutsOnFocusGainedTextField(String text, int columns) {
         super(text, columns);
-        init();
     }
 
@@ -99 +94 @@
     public DisableShortcutsOnFocusGainedTextField(Document doc, String text, int columns) {
         super(doc, text, columns);
-        init();
     }
 
@@ -105 +99 @@
     private final Set<JosmAction> disabledMenuActions = new HashSet<>();
 
-    protected final void init() {
-        addFocusListener(this);
-    }
-
     @Override
     public void focusGained(FocusEvent e) {
+        super.focusGained(e);
         disableMenuActions();
         unregisterActionShortcuts();
@@ -118 +109 @@
     @Override
     public void focusLost(FocusEvent e) {
+        super.focusLost(e);
         Main.map.keyDetector.setEnabled(true);
         restoreActionShortcuts();