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

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/gui/download/BookmarkList.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/download/BookmarkList.java

@@ -12 +12 @@
 import java.util.List;
 import java.util.Locale;
+import java.util.Objects;
 
 import javax.swing.DefaultListModel;
@@ -79 +80 @@
         @Override
         public int hashCode() {
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + ((area == null) ? 0 : area.hashCode());
-            result = prime * result + ((name == null) ? 0 : name.hashCode());
-            return result;
+            return Objects.hash(name, area);
         }
 
         @Override
         public boolean equals(Object obj) {
-            if (this == obj)
-                return true;
-            if (obj == null)
-                return false;
-            if (getClass() != obj.getClass())
-                return false;
-            Bookmark other = (Bookmark) obj;
-            if (area == null) {
-                if (other.area != null)
-                    return false;
-            } else if (!area.equals(other.area))
-                return false;
-            if (name == null) {
-                if (other.name != null)
-                    return false;
-            } else if (!name.equals(other.name))
-                return false;
-            return true;
+            if (this == obj) return true;
+            if (obj == null || getClass() != obj.getClass()) return false;
+            Bookmark bookmark = (Bookmark) obj;
+            return Objects.equals(name, bookmark.name) &&
+                    Objects.equals(area, bookmark.area);
         }