Changeset 8489 in josm for trunk

Timestamp:

2015-06-15T08:24:47+02:00 (9 years ago)

Author:

Don-vip

Message:

fix #11562 - use CopyOnWriteArrayList for listeners to avoid ConcurrentModificationException

File:

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

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

@@ -12 +12 @@
 import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 import javax.swing.JFrame;
@@ -36 +36 @@
     private Timer timer;
 
-    private final List<KeyPressReleaseListener> keyListeners = new ArrayList<>();
-    private final List<ModifierListener> modifierListeners = new ArrayList<>();
+    private final List<KeyPressReleaseListener> keyListeners = new CopyOnWriteArrayList<>();
+    private final List<ModifierListener> modifierListeners = new CopyOnWriteArrayList<>();
     private int previousModifiers;
 
@@ -46 +46 @@
      * @param l listener to add
      */
-    public synchronized void addKeyListener(KeyPressReleaseListener l) {
+    public void addKeyListener(KeyPressReleaseListener l) {
         keyListeners.add(l);
     }
@@ -54 +54 @@
      * @param l listener to add
      */
-    public synchronized void addModifierListener(ModifierListener l) {
+    public void addModifierListener(ModifierListener l) {
         modifierListeners.add(l);
     }
@@ -62 +62 @@
      * @param l listener to remove
      */
-    public synchronized void removeKeyListener(KeyPressReleaseListener l) {
+    public void removeKeyListener(KeyPressReleaseListener l) {
         keyListeners.remove(l);
     }
@@ -70 +70 @@
      * @param l listener to remove
      */
-    public synchronized void removeModifierListener(ModifierListener l) {
+    public void removeModifierListener(ModifierListener l) {
         modifierListeners.remove(l);
     }
@@ -88 +88 @@
                 timer.stop();
                 if (set.remove(releaseEvent.getKeyCode()) && enabled) {
-                    synchronized (AdvancedKeyPressDetector.this) {
-                        if (isFocusInMainWindow()) {
-                            for (KeyPressReleaseListener q: keyListeners) {
-                                q.doKeyReleased(releaseEvent);
-                            }
+                    if (isFocusInMainWindow()) {
+                        for (KeyPressReleaseListener q: keyListeners) {
+                            q.doKeyReleased(releaseEvent);
                         }
                     }
@@ -107 +105 @@
         timer.stop();
         set.clear();
-        synchronized (this) {
-            if (!keyListeners.isEmpty()) {
-                Main.warn(tr("Some of the key listeners forgot to remove themselves: {0}"), keyListeners.toString());
-            }
-            if (!modifierListeners.isEmpty()) {
-                Main.warn(tr("Some of the key modifier listeners forgot to remove themselves: {0}"), modifierListeners.toString());
-            }
+        if (!keyListeners.isEmpty()) {
+            Main.warn(tr("Some of the key listeners forgot to remove themselves: {0}"), keyListeners.toString());
+        }
+        if (!modifierListeners.isEmpty()) {
+            Main.warn(tr("Some of the key modifier listeners forgot to remove themselves: {0}"), modifierListeners.toString());
         }
         try {
@@ -130 +126 @@
                 timer.stop();
             } else if (set.add(e.getKeyCode()) && enabled) {
-                synchronized (this) {
-                    if (isFocusInMainWindow()) {
-                        for (KeyPressReleaseListener q: keyListeners) {
-                            if (Main.isDebugEnabled()) {
-                                Main.debug(q+" => doKeyPressed("+e+")");
-                            }
-                            q.doKeyPressed(e);
+                if (isFocusInMainWindow()) {
+                    for (KeyPressReleaseListener q: keyListeners) {
+                        if (Main.isDebugEnabled()) {
+                            Main.debug(q+" => doKeyPressed("+e+")");
                         }
+                        q.doKeyPressed(e);
                     }
                 }
@@ -145 +139 @@
                 timer.stop();
                 if (set.remove(e.getKeyCode()) && enabled) {
-                    synchronized (this) {
-                        if (isFocusInMainWindow()) {
-                            for (KeyPressReleaseListener q: keyListeners) {
-                                if (Main.isDebugEnabled()) {
-                                    Main.debug(q+" => doKeyReleased("+e+")");
-                                }
-                                q.doKeyReleased(e);
+                    if (isFocusInMainWindow()) {
+                        for (KeyPressReleaseListener q: keyListeners) {
+                            if (Main.isDebugEnabled()) {
+                                Main.debug(q+" => doKeyReleased("+e+")");
                             }
+                            q.doKeyReleased(e);
                         }
                     }
@@ -174 +166 @@
         if (previousModifiers != modif) {
             previousModifiers = modif;
-            synchronized (this) {
-                for (ModifierListener m: modifierListeners) {
-                    m.modifiersChanged(modif);
-                }
+            for (ModifierListener m: modifierListeners) {
+                m.modifiersChanged(modif);
             }
         }