Changeset 16824 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2020-08-02T20:30:02+02:00 (4 years ago)

Author:

simon04

Message:

Remove Collection.contains check for Collection.remove

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• osm/DefaultNameFormatter.java (modified) (1 diff)
• validation/tests/Addresses.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/DefaultNameFormatter.java

@@ -81 +81 @@
     public static void unregisterFormatHook(NameFormatterHook hook) {
         if (hook == null) return;
-        if (formatHooks.contains(hook)) {
-            formatHooks.remove(hook);
-        }
+        formatHooks.remove(hook);
     }
 

trunk/src/org/openstreetmap/josm/data/validation/tests/Addresses.java

@@ -161 +161 @@
                             if (!ignoredAddresses.contains(simplifiedAddress)) {
                                 ignoredAddresses.add(simplifiedAddress);
-                            } else if (knownAddresses.containsKey(simplifiedAddress)) {
+                            } else {
                                 knownAddresses.remove(simplifiedAddress);
                             }