Context Navigation

mappaint

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)

Location:

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement

Files:

-              r13662
+              r16488
     @Override
     public int hashCode() {
+        final int prime = 31;
+        int result = super.hashCode();
+        result = prime * result + ((iconImage == null) ? 0 : iconImage.hashCode());
+        result = prime * result + ((iconImageAngle == null) ? 0 : iconImageAngle.hashCode());
+        result = prime * result + ((iconPosition == null) ? 0 : iconPosition.hashCode());
+        return result;
+        return Objects.hash(super.hashCode(), iconImage, iconImageAngle, iconPosition);
+    }

-              r15586
+              r16488
 import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
+import java.util.Objects;
 import org.openstreetmap.josm.gui.MapViewState;
 …
     @Override
     public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        long temp;
+        temp = Double.doubleToLongBits(offsetX);
+        result = prime * result + (int) (temp ^ (temp >>> 32));
+        temp = Double.doubleToLongBits(offsetY);
+        result = prime * result + (int) (temp ^ (temp >>> 32));
+        return result;
+        return Objects.hash(offsetX, offsetY);
+    }

-              r14273
+              r16488
     @Override
     public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        long temp;
+        temp = Double.doubleToLongBits(yOffset);
+        result = prime * result + (int) (temp ^ (temp >>> 32));
+        return result;
+        return Double.hashCode(yOffset);
+    }

Note: See TracChangeset for help on using the changeset viewer.