Changeset 11170 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2016-10-26T18:49:40+02:00 (7 years ago)

Author:

simon04

Message:

fix #13808 see #12030 - Custom shortcuts are broken

File:

• trunk/src/org/openstreetmap/josm/tools/Shortcut.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/tools/Shortcut.java

@@ -7 +7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -13 +14 @@
 import java.util.Optional;
 import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
@@ -270 +272 @@
 
     // here we store our shortcuts
-    private static List<Shortcut> shortcuts = new CopyOnWriteArrayList<>();
+    private static Collection<Shortcut> shortcuts = new CopyOnWriteArrayList<Shortcut>() {
+        @Override
+        public boolean add(Shortcut shortcut) {
+            // expensive consistency check only in debug mode
+            if (Main.isDebugEnabled()
+                    && stream().map(Shortcut::getShortText).anyMatch(shortcut.getShortText()::equals)) {
+                Main.warn(new AssertionError(shortcut.getShortText() + " already added"));
+            }
+            return super.add(shortcut);
+        }
+    };
 
     // and here our modifier groups
@@ -289 +301 @@
 
     private static Optional<Shortcut> findShortcutByKeyOrShortText(int requestedKey, int modifier, String shortText) {
-        if (modifier == getGroupModifier(NONE))
-            return Optional.empty();
+        final Predicate<Shortcut> sameKey = sc -> modifier != getGroupModifier(NONE) && sc.isSame(requestedKey, modifier);
+        final Predicate<Shortcut> sameShortText = sc -> sc.getShortText().equals(shortText);
         return shortcuts.stream()
-                .filter(sc -> sc.isSame(requestedKey, modifier) || (shortText != null && shortText.equals(sc.getShortText())))
+                .filter(sameKey.or(sameShortText))
                 .findAny();
-
     }
 
@@ -401 +412 @@
     // shutdown handling
     public static boolean savePrefs() {
-        boolean changed = false;
-        for (Shortcut sc : shortcuts) {
-            changed = changed | sc.save();
-        }
-        return changed;
+        return shortcuts.stream()
+                .map(Shortcut::save)
+                .reduce(false, Boolean::logicalOr); // has changed
     }
 
@@ -510 +519 @@
             shortText, conflict.getShortText(), newsc.getKeyText()));
         newsc.saveDefault();
-        shortcuts.replaceAll(sc -> shortText.equals(sc.getShortText()) ? newsc : sc);
+        shortcuts.add(newsc);
         return newsc;
     }