Changeset 9371 in josm for trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java

Timestamp:

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

Author:

simon04

Message:

Java 7: use Objects.equals and Objects.hash

File:

• trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (modified) (2 diffs)

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);
         }