Changeset 2655 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/tags

Timestamp:

2009-12-19T10:47:49+01:00 (14 years ago)

Author:

jttt

Message:

Fixed #4161 Major slowdown in recent versions, used correct pattern for listeners realized using CopyOnWriteArrayList

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java

@@ -45 +45 @@
 
     public void addNavigationListeners(NavigationListener listener) {
-        if (listener != null && ! (listeners.contains(listener))) {
-            listeners.add(listener);
+        if (listener != null) {
+            listeners.addIfAbsent(listener);
         }
     }
 
     public void removeavigationListeners(NavigationListener listener) {
-        if (listener != null && listeners.contains(listener)) {
-            listeners.remove(listener);
-        }
+        listeners.remove(listener);
     }
 
@@ -116 +114 @@
         }
         switch(decision.getDecisionType()) {
-            case UNDECIDED:
-                editor.setSelectedIndex(0);
-                break;
-            case KEEP_ONE:
-                editor.setSelectedItem(decision.getChosenValue());
-                break;
-            case KEEP_NONE:
-                editor.setSelectedItem(MultiValueDecisionType.KEEP_NONE);
-                break;
-            case KEEP_ALL:
-                editor.setSelectedItem(MultiValueDecisionType.KEEP_ALL);
+        case UNDECIDED:
+            editor.setSelectedIndex(0);
+            break;
+        case KEEP_ONE:
+            editor.setSelectedItem(decision.getChosenValue());
+            break;
+        case KEEP_NONE:
+            editor.setSelectedItem(MultiValueDecisionType.KEEP_NONE);
+            break;
+        case KEEP_ALL:
+            editor.setSelectedItem(MultiValueDecisionType.KEEP_ALL);
         }
     }
@@ -167 +165 @@
             } else if (MultiValueDecisionType.class.isInstance(value)) {
                 switch(MultiValueDecisionType.class.cast(value)) {
-                    case KEEP_NONE:
-                        setText(tr("none"));
-                        setFont(UIManager.getFont("ComboBox.font").deriveFont(Font.ITALIC + Font.BOLD));
-                        break;
-                    case KEEP_ALL:
-                        setText(tr("all"));
-                        setFont(UIManager.getFont("ComboBox.font").deriveFont(Font.ITALIC + Font.BOLD));
-                        break;
-                    default:
-                        // don't display other values
+                case KEEP_NONE:
+                    setText(tr("none"));
+                    setFont(UIManager.getFont("ComboBox.font").deriveFont(Font.ITALIC + Font.BOLD));
+                    break;
+                case KEEP_ALL:
+                    setText(tr("all"));
+                    setFont(UIManager.getFont("ComboBox.font").deriveFont(Font.ITALIC + Font.BOLD));
+                    break;
+                default:
+                    // don't display other values
                 }
             }