Changeset 9371 in josm for trunk/src/org/openstreetmap/josm/gui/progress

Timestamp:

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

Author:

simon04

Message:

Java 7: use Objects.equals and Objects.hash

File:

• trunk/src/org/openstreetmap/josm/gui/progress/ProgressTaskId.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/progress/ProgressTaskId.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.progress;
+
+import java.util.Objects;
 
 public class ProgressTaskId {
@@ -16 +18 @@
     @Override
     public int hashCode() {
-        return id.hashCode();
+        return Objects.hash(id);
     }
 
     @Override
     public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null)
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        ProgressTaskId other = (ProgressTaskId) obj;
-        return other.id.equals(id);
+        if (this == obj) return true;
+        if (obj == null || getClass() != obj.getClass()) return false;
+        ProgressTaskId that = (ProgressTaskId) obj;
+        return Objects.equals(id, that.id);
     }
 }