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

Timestamp:

2016-12-14T04:19:09+01:00 (7 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/ListListSetting.java (modified) (3 diffs)

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

@@ -5 +5 @@
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.List;
-
-import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -39 +36 @@
         }
         return new ListListSetting(null);
-    }
-
-    @Override
-    public boolean equalVal(List<List<String>> otherVal) {
-        if (value == null)
-            return otherVal == null;
-        if (otherVal == null)
-            return false;
-        if (value.size() != otherVal.size())
-            return false;
-        Iterator<List<String>> itA = value.iterator();
-        Iterator<List<String>> itB = otherVal.iterator();
-        while (itA.hasNext()) {
-            if (!Utils.equalCollection(itA.next(), itB.next()))
-                return false;
-        }
-        return true;
     }
 
@@ -92 +72 @@
         return new ListListSetting(null);
     }
-
-    @Override
-    public boolean equals(Object other) {
-        if (!(other instanceof ListListSetting))
-            return false;
-        return equalVal(((ListListSetting) other).getValue());
-    }
 }