Changeset 16488 in josm for trunk/src/org/openstreetmap/josm/data/osm/search/SearchCompiler.java

Timestamp:

2020-05-23T21:44:48+02:00 (4 years ago)

Author:

simon04

Message:

fix #19281, see #19174 - Use Objects.hash where it is not used (patch by hiddewie, modified)

File:

• trunk/src/org/openstreetmap/josm/data/osm/search/SearchCompiler.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/data/osm/search/SearchCompiler.java

@@ -422 +422 @@
         @Override
         public int hashCode() {
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + ((lhs == null) ? 0 : lhs.hashCode());
-            result = prime * result + ((rhs == null) ? 0 : rhs.hashCode());
-            return result;
+            return Objects.hash(lhs, lhs);
         }
 
@@ -530 +526 @@
         @Override
         public int hashCode() {
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + (defaultValue ? 1231 : 1237);
-            result = prime * result + ((key == null) ? 0 : key.hashCode());
-            return result;
+            return Objects.hash(defaultValue, key);
         }
 
@@ -853 +845 @@
         @Override
         public int hashCode() {
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + compareMode;
-            result = prime * result + ((key == null) ? 0 : key.hashCode());
-            result = prime * result + ((referenceNumber == null) ? 0 : referenceNumber.hashCode());
-            result = prime * result + ((referenceValue == null) ? 0 : referenceValue.hashCode());
-            return result;
+            return Objects.hash(compareMode, key, referenceNumber, referenceValue);
         }
 
@@ -1010 +996 @@
         @Override
         public int hashCode() {
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + ((key == null) ? 0 : key.hashCode());
-            result = prime * result + ((keyPattern == null) ? 0 : keyPattern.hashCode());
-            result = prime * result + ((mode == null) ? 0 : mode.hashCode());
-            result = prime * result + ((value == null) ? 0 : value.hashCode());
-            result = prime * result + ((valuePattern == null) ? 0 : valuePattern.hashCode());
-            return result;
+            return Objects.hash(key, keyPattern, mode, value, valuePattern);
         }
 
@@ -1117 +1096 @@
         @Override
         public int hashCode() {
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + (caseSensitive ? 1231 : 1237);
-            result = prime * result + ((search == null) ? 0 : search.hashCode());
-            result = prime * result + ((searchRegex == null) ? 0 : searchRegex.hashCode());
-            return result;
+            return Objects.hash(caseSensitive, search, searchRegex);
         }
 
@@ -1336 +1310 @@
         @Override
         public int hashCode() {
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + (modulo ? 1231 : 1237);
-            result = prime * result + nth;
-            return result;
+            return Objects.hash(modulo, nth);
         }
 
@@ -1392 +1362 @@
         @Override
         public int hashCode() {
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + (int) (max ^ (max >>> 32));
-            result = prime * result + (int) (min ^ (min >>> 32));
-            return result;
+            return Objects.hash(max, min);
         }