Changeset 12095 in josm for trunk/src/org

Timestamp:

2017-05-10T22:24:16+02:00 (8 years ago)

Author:

michael2402

Message:

Extract color key searching (migration code) to new method.

This is cleaner and fixes a compile error in eclipse mars.

File:

• trunk/src/org/openstreetmap/josm/data/Preferences.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -1535 +1535 @@
         settingsMap.keySet().stream()
                 .filter(key -> key.startsWith(COLOR_PREFIX))
-                .flatMap(key -> {
-                    final String newKey = ColorProperty.getColorKey(key.substring(COLOR_PREFIX.length()));
-                    return key.equals(newKey) || settingsMap.containsKey(newKey)
-                            ? Stream.empty()
-                            : Stream.of(new AbstractMap.SimpleImmutableEntry<>(key, newKey));
-                })
+                .flatMap(this::searchOldColorKey)
                 .collect(Collectors.toList()) // to avoid ConcurrentModificationException
                 .forEach(entry -> {
@@ -1549 +1544 @@
                     put(oldKey, null);
                 });
+    }
+
+    private Stream<AbstractMap.SimpleImmutableEntry<String, String>> searchOldColorKey(String key) {
+        final String newKey = ColorProperty.getColorKey(key.substring(COLOR_PREFIX.length()));
+        return key.equals(newKey) || settingsMap.containsKey(newKey)
+                ? Stream.empty()
+                : Stream.of(new AbstractMap.SimpleImmutableEntry<>(key, newKey));
     }