Changeset 16488 in josm for trunk/src/org/openstreetmap/josm/data/preferences/AbstractProperty.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/preferences/AbstractProperty.java (modified) (3 diffs)

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

@@ -9 +9 @@
 import org.openstreetmap.josm.tools.bugreport.BugReport;
 
+import java.util.Objects;
+
 /**
  * Captures the common functionality of preference properties
@@ -29 +31 @@
         @Override
         public int hashCode() {
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + getOuterType().hashCode();
-            result = prime * result + ((listener == null) ? 0 : listener.hashCode());
-            return result;
+            return Objects.hash(getOuterType(), listener);
         }
 
@@ -318 +316 @@
     @Override
     public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((key == null) ? 0 : key.hashCode());
-        result = prime * result + ((preferences == null) ? 0 : preferences.hashCode());
-        return result;
+        return Objects.hash(key, preferences);
     }