Changeset 11674 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/AreaElement.java

Timestamp:

2017-03-05T00:23:56+01:00 (7 years ago)

Author:

michael2402

Message:

Add Javadoc to icon drawing functions. Fix AreaElement#equals/hashCode.

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/AreaElement.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/AreaElement.java

@@ -62 +62 @@
     private final MapImage iconImage;
 
+    /**
+     * The rotation of the {@link #iconImageAngle}
+     */
     private final RotationAngle iconImageAngle;
 
@@ -175 +178 @@
                 Objects.equals(text, that.text) &&
                 Objects.equals(extent, that.extent) &&
-                Objects.equals(extentThreshold, that.extentThreshold);
+                Objects.equals(extentThreshold, that.extentThreshold) &&
+                Objects.equals(iconImage, that.iconImage) &&
+                Objects.equals(iconImageAngle, that.iconImageAngle);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(super.hashCode(), color, fillImage, text, extent, extentThreshold);
+        return Objects.hash(super.hashCode(), color, fillImage, text, extent, extentThreshold, iconImage, iconImageAngle);
     }
 
@@ -186 +191 @@
     public String toString() {
         return "AreaElemStyle{" + super.toString() + "color=" + Utils.toString(color) +
-                " fillImage=[" + fillImage + "]}";
+                " fillImage=[" + fillImage + "] iconImage=[" + iconImage + "] iconImageAngle=[" + iconImageAngle + "]}";
     }
 }