Changeset 33133 in osm for applications

Timestamp:

2017-01-30T23:41:59+01:00 (8 years ago)

Author:

donvip

Message:

fix #josm11923, fix #josm12132, fix #josm14315 - AlignWays: way highlights are not cleaned up (patch by IdealChain)

Location:

applications/editors/josm/plugins/alignways

Files:

• build.xml (modified) (1 diff)
• src/com/tilusnet/josm/plugins/alignways/AlignWaysSegment.java (modified) (2 diffs)

applications/editors/josm/plugins/alignways/build.xml

@@ -14 +14 @@
     <property name="plugin.icon" value="images/alignways.png"/>
     <property name="plugin.link" value="https://wiki.openstreetmap.org/wiki/JOSM/Plugins/AlignWayS"/>
+    <property name="plugin.canloadatruntime" value="true"/>
 
     <!-- ** include targets that all plugins have in common ** -->

applications/editors/josm/plugins/alignways/src/com/tilusnet/josm/plugins/alignways/AlignWaysSegment.java

@@ -13 +13 @@
 import java.util.Collection;
 import java.util.HashSet;
+import java.util.Objects;
 
 import org.openstreetmap.josm.Main;
@@ -114 +115 @@
      @Override
      public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((segment == null) ? 0 : segment.hashCode());
-        result = prime * result
-                + ((segmentColor == null) ? 0 : segmentColor.hashCode());
-        return result;
+        if (segment == null) {
+            return System.identityHashCode(this);
+        }
+
+        // hashCode and equals should be consistent during the lifetime of this segment,
+        // otherwise the temporary mapview overlay will not be properly removed on destroy()
+        return segment.hashCode();
      }
 
-     @Override
-     public boolean equals(Object obj) {
-         if (this == obj)
-             return true;
-         if (obj == null)
-             return false;
-         if (!(obj instanceof AlignWaysSegment))
-             return false;
-         AlignWaysSegment other = (AlignWaysSegment) obj;
-         if (segment == null) {
-             if (other.segment != null)
-                 return false;
-         } else if (!segment.equals(other.segment))
-             return false;
-         /* Segment colour is ignored in comparison
-        if (segmentColor == null) {
-            if (other.segmentColor != null)
-                return false;
-        } else if (!segmentColor.equals(other.segmentColor))
-            return false;
-          */
-         return true;
-     }
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof AlignWaysSegment)) return false;
+        AlignWaysSegment that = (AlignWaysSegment) o;
+        return Objects.equals(segment, that.segment);
+    }
+
 }