Changeset 11394 in josm for trunk/src/org/openstreetmap/josm/data/preferences/MapListSetting.java

Timestamp:

2016-12-14T04:19:09+01:00 (9 years ago)

Author:

Don-vip

Message:

simplify preference settings equals handling (already performed by AbstractList.equals / AbstractMap.equals) - fixes squid:S1206 and findbugs HE_EQUALS_NO_HASHCODE warnings

File:

• trunk/src/org/openstreetmap/josm/data/preferences/MapListSetting.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/preferences/MapListSetting.java

@@ -4 +4 @@
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Objects;
 
 /**
@@ -24 +21 @@
         super(value);
         consistencyTest();
-    }
-
-    @Override
-    public boolean equalVal(List<Map<String, String>> otherVal) {
-        if (value == null)
-            return otherVal == null;
-        if (otherVal == null)
-            return false;
-        if (value.size() != otherVal.size())
-            return false;
-        Iterator<Map<String, String>> itA = value.iterator();
-        Iterator<Map<String, String>> itB = otherVal.iterator();
-        while (itA.hasNext()) {
-            if (!equalMap(itA.next(), itB.next()))
-                return false;
-        }
-        return true;
-    }
-
-    private static boolean equalMap(Map<String, String> a, Map<String, String> b) {
-        if (a == null)
-            return b == null;
-        if (b == null)
-            return false;
-        if (a.size() != b.size())
-            return false;
-        for (Entry<String, String> e : a.entrySet()) {
-            if (!Objects.equals(e.getValue(), b.get(e.getKey())))
-                return false;
-        }
-        return true;
     }
 
@@ -91 +57 @@
         return new MapListSetting(null);
     }
-
-    @Override
-    public boolean equals(Object other) {
-        if (!(other instanceof MapListSetting))
-            return false;
-        return equalVal(((MapListSetting) other).getValue());
-    }
 }