Changeset 13173 in josm for trunk/src/org/openstreetmap/josm/gui/util/AdvancedKeyPressDetector.java

Timestamp:

2017-11-28T00:56:29+01:00 (8 years ago)

Author:

Don-vip

Message:

see #15310 - remove most of deprecated APIs

File:

• trunk/src/org/openstreetmap/josm/gui/util/AdvancedKeyPressDetector.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/util/AdvancedKeyPressDetector.java

@@ -36 +36 @@
 
     private final List<KeyPressReleaseListener> keyListeners = new CopyOnWriteArrayList<>();
-    /** @deprecated replaced by {@link #modifierExListeners} */
-    @Deprecated
-    private final List<ModifierListener> modifierListeners = new CopyOnWriteArrayList<>();
     private final ListenerList<ModifierExListener> modifierExListeners = ListenerList.create();
-    /** @deprecated replaced by {@link #previousModifiersEx} */
-    @Deprecated
-    private int previousModifiers;
     private int previousModifiersEx;
 
@@ -53 +47 @@
     public void addKeyListener(KeyPressReleaseListener l) {
         keyListeners.add(l);
-    }
-
-    /**
-     * Adds an object that wants to receive key modifier changed events.
-     * @param l listener to add
-     * @deprecated use {@link #addModifierExListener} instead
-     */
-    @Deprecated
-    public void addModifierListener(ModifierListener l) {
-        modifierListeners.add(l);
     }
 
@@ -80 +64 @@
     public void removeKeyListener(KeyPressReleaseListener l) {
         keyListeners.remove(l);
-    }
-
-    /**
-     * Removes the key modifier listener.
-     * @param l listener to remove
-     * @deprecated use {@link #removeModifierExListener} instead
-     */
-    @Deprecated
-    public void removeModifierListener(ModifierListener l) {
-        modifierListeners.remove(l);
     }
 
@@ -131 +105 @@
         if (!keyListeners.isEmpty()) {
             Logging.warn(tr("Some of the key listeners forgot to remove themselves: {0}"), keyListeners.toString());
-        }
-        if (!modifierListeners.isEmpty()) {
-            Logging.warn(tr("Some of the key modifier listeners forgot to remove themselves: {0}"), modifierListeners.toString());
         }
         if (modifierExListeners.hasListeners()) {
@@ -183 +154 @@
         KeyEvent ke = (KeyEvent) e;
 
-        // check if ctrl, alt, shift modifiers are changed
-        int modif = ke.getModifiers();
-        if (previousModifiers != modif) {
-            previousModifiers = modif;
-            for (ModifierListener m: modifierListeners) {
-                m.modifiersChanged(modif);
-            }
-        }
-
         // check if ctrl, alt, shift extended modifiers are changed
         int modifEx = ke.getModifiersEx();