Changeset 9371 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2016-01-09T23:20:37+01:00 (8 years ago)

Author:

simon04

Message:

Java 7: use Objects.equals and Objects.hash

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• CombineWayAction.java (modified) (2 diffs)
• ExtensionFileFilter.java (modified) (2 diffs)
• JoinAreasAction.java (modified) (3 diffs)
• search/SearchAction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java

@@ -16 +16 @@
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.Stack;
@@ -343 +344 @@
         @Override
         public int hashCode() {
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + ((a == null) ? 0 : a.hashCode());
-            result = prime * result + ((b == null) ? 0 : b.hashCode());
-            return result;
+            return Objects.hash(a, b);
         }
 
         @Override
         public boolean equals(Object obj) {
-            if (this == obj)
-                return true;
-            if (obj == null)
-                return false;
-            if (getClass() != obj.getClass())
-                return false;
-            NodePair other = (NodePair) obj;
-            if (a == null) {
-                if (other.a != null)
-                    return false;
-            } else if (!a.equals(other.a))
-                return false;
-            if (b == null) {
-                if (other.b != null)
-                    return false;
-            } else if (!b.equals(other.b))
-                return false;
-            return true;
+            if (this == obj) return true;
+            if (obj == null || getClass() != obj.getClass()) return false;
+            NodePair nodePair = (NodePair) obj;
+            return Objects.equals(a, nodePair.a) &&
+                    Objects.equals(b, nodePair.b);
         }
     }

trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java

@@ -11 +11 @@
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Objects;
 import java.util.ServiceConfigurationError;
 
@@ -350 +351 @@
     @Override
     public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((defaultExtension == null) ? 0 : defaultExtension.hashCode());
-        result = prime * result + ((description == null) ? 0 : description.hashCode());
-        result = prime * result + ((extensions == null) ? 0 : extensions.hashCode());
-        return result;
+        return Objects.hash(extensions, description, defaultExtension);
     }
 
     @Override
     public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null)
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        ExtensionFileFilter other = (ExtensionFileFilter) obj;
-        if (defaultExtension == null) {
-            if (other.defaultExtension != null)
-                return false;
-        } else if (!defaultExtension.equals(other.defaultExtension))
-            return false;
-        if (description == null) {
-            if (other.description != null)
-                return false;
-        } else if (!description.equals(other.description))
-            return false;
-        if (extensions == null) {
-            if (other.extensions != null)
-                return false;
-        } else if (!extensions.equals(other.extensions))
-            return false;
-        return true;
+        if (this == obj) return true;
+        if (obj == null || getClass() != obj.getClass()) return false;
+        ExtensionFileFilter that = (ExtensionFileFilter) obj;
+        return Objects.equals(extensions, that.extensions) &&
+                Objects.equals(description, that.description) &&
+                Objects.equals(defaultExtension, that.defaultExtension);
     }
 }

trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java

@@ -17 +17 @@
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.TreeMap;
@@ -92 +93 @@
         @Override
         public int hashCode() {
-            return rel.hashCode();
+            return Objects.hash(rel, role);
         }
 
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof RelationRole)) return false;
-            RelationRole otherMember = (RelationRole) other;
-            return otherMember.role.equals(role) && otherMember.rel.equals(rel);
+            if (this == other) return true;
+            if (other == null || getClass() != other.getClass()) return false;
+            RelationRole that = (RelationRole) other;
+            return Objects.equals(rel, that.rel) &&
+                    Objects.equals(role, that.role);
         }
     }
@@ -120 +123 @@
         @Override
         public int hashCode() {
-            return way.hashCode();
+            return Objects.hash(way, insideToTheRight);
         }
 
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof WayInPolygon)) return false;
-            WayInPolygon otherMember = (WayInPolygon) other;
-            return otherMember.way.equals(this.way) && otherMember.insideToTheRight == this.insideToTheRight;
+            if (this == other) return true;
+            if (other == null || getClass() != other.getClass()) return false;
+            WayInPolygon that = (WayInPolygon) other;
+            return insideToTheRight == that.insideToTheRight &&
+                    Objects.equals(way, that.way);
         }
     }

trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java

@@ -24 +24 @@
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 
@@ -677 +678 @@
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof SearchSetting))
-                return false;
-            SearchSetting o = (SearchSetting) other;
-            return o.caseSensitive == this.caseSensitive
-                    && o.regexSearch == this.regexSearch
-                    && o.mapCSSSearch == this.mapCSSSearch
-                    && o.allElements == this.allElements
-                    && o.mode.equals(this.mode)
-                    && o.text.equals(this.text);
+            if (this == other) return true;
+            if (other == null || getClass() != other.getClass()) return false;
+            SearchSetting that = (SearchSetting) other;
+            return caseSensitive == that.caseSensitive &&
+                    regexSearch == that.regexSearch &&
+                    mapCSSSearch == that.mapCSSSearch &&
+                    allElements == that.allElements &&
+                    Objects.equals(text, that.text) &&
+                    mode == that.mode;
         }
 
         @Override
         public int hashCode() {
-            return text.hashCode();
+            return Objects.hash(text, mode, caseSensitive, regexSearch, mapCSSSearch, allElements);
         }