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

Timestamp:

2017-07-26T23:18:38+02:00 (7 years ago)

Author:

Don-vip

Message:

see #11924 - use extended event modifiers, deprecate old methods - see ​https://bugs.openjdk.java.net/browse/JDK-8143077

File:

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

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

@@ -35 +35 @@
 
     private final List<KeyPressReleaseListener> keyListeners = new CopyOnWriteArrayList<>();
+    @Deprecated
     private final List<ModifierListener> modifierListeners = new CopyOnWriteArrayList<>();
+    private final List<ModifierExListener> modifierExListeners = new CopyOnWriteArrayList<>();
     private int previousModifiers;
+    private int previousModifiersEx;
 
     private boolean enabled = true;
@@ -51 +54 @@
      * 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);
@@ -57 +62 @@
 
     /**
+     * Adds an object that wants to receive extended key modifier changed events.
+     * @param l listener to add
+     * @since 12516
+     */
+    public void addModifierExListener(ModifierExListener l) {
+        modifierExListeners.add(l);
+    }
+
+    /**
      * Removes the listener.
      * @param l listener to remove
@@ -67 +81 @@
      * Removes the key modifier listener.
      * @param l listener to remove
-     */
+     * @deprecated use {@link #removeModifierExListener} instead
+     */
+    @Deprecated
     public void removeModifierListener(ModifierListener l) {
         modifierListeners.remove(l);
+    }
+
+    /**
+     * Removes the extended key modifier listener.
+     * @param l listener to remove
+     * @since 12516
+     */
+    public void removeModifierExListener(ModifierExListener l) {
+        modifierExListeners.remove(l);
     }
 
@@ -105 +130 @@
         if (!modifierListeners.isEmpty()) {
             Main.warn(tr("Some of the key modifier listeners forgot to remove themselves: {0}"), modifierListeners.toString());
+        }
+        if (!modifierExListeners.isEmpty()) {
+            Main.warn(tr("Some of the key modifier listeners forgot to remove themselves: {0}"), modifierExListeners.toString());
         }
         try {
@@ -147 +175 @@
 
     @Override
+    @SuppressWarnings("deprecation")
     public void eventDispatched(AWTEvent e) {
         if (!(e instanceof KeyEvent)) {
@@ -162 +191 @@
         }
 
+        // check if ctrl, alt, shift extended modifiers are changed
+        int modifEx = ke.getModifiersEx();
+        if (previousModifiersEx != modifEx) {
+            previousModifiersEx = modifEx;
+            for (ModifierExListener m: modifierExListeners) {
+                m.modifiersExChanged(modifEx);
+            }
+        }
+
         processKeyEvent(ke);
     }