Changeset 9371 in josm for trunk/src/org/openstreetmap/josm/data/imagery

Timestamp:

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

Author:

simon04

Message:

Java 7: use Objects.equals and Objects.hash

Location:

trunk/src/org/openstreetmap/josm/data/imagery

Files:

• ImageryInfo.java (modified) (3 diffs)
• Shape.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java

@@ -134 +134 @@
         @Override
         public int hashCode() {
-            final int prime = 31;
-            int result = super.hashCode();
-            result = prime * result + ((shapes == null) ? 0 : shapes.hashCode());
-            return result;
+            return Objects.hash(super.hashCode(), shapes);
         }
 
         @Override
-        public boolean equals(Object obj) {
-            if (this == obj)
-                return true;
-            if (!super.equals(obj))
-                return false;
-            if (getClass() != obj.getClass())
-                return false;
-            ImageryBounds other = (ImageryBounds) obj;
-            if (shapes == null) {
-                if (other.shapes != null)
-                    return false;
-            } else if (!shapes.equals(other.shapes))
-                return false;
-            return true;
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            if (!super.equals(o)) return false;
+            ImageryBounds that = (ImageryBounds) o;
+            return Objects.equals(shapes, that.shapes);
         }
     }
@@ -457 +446 @@
 
     @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-
-        ImageryInfo that = (ImageryInfo) o;
-
-        if (imageryType != that.imageryType) return false;
-        if (url != null ? !url.equals(that.url) : that.url != null) return false;
-        if (name != null ? !name.equals(that.name) : that.name != null) return false;
-
-        return true;
+    public int hashCode() {
+        return Objects.hash(url, imageryType);
     }
 
@@ -509 +489 @@
 
     @Override
-    public int hashCode() {
-        int result = url != null ? url.hashCode() : 0;
-        result = 31 * result + (imageryType != null ? imageryType.hashCode() : 0);
-        return result;
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        ImageryInfo that = (ImageryInfo) o;
+        return imageryType == that.imageryType && Objects.equals(url, that.url);
     }
 

trunk/src/org/openstreetmap/josm/data/imagery/Shape.java

@@ -93 +93 @@
     @Override
     public int hashCode() {
-        int hash = 5;
-        hash = 47 * hash + Objects.hashCode(this.coords);
-        return hash;
+        return Objects.hash(coords);
     }
 
     @Override
     public boolean equals(Object obj) {
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final Shape other = (Shape) obj;
-        if (!Objects.equals(this.coords, other.coords)) {
-            return false;
-        }
-        return true;
+        if (this == obj) return true;
+        if (obj == null || getClass() != obj.getClass()) return false;
+        Shape shape = (Shape) obj;
+        return Objects.equals(coords, shape.coords);
     }
 }