Changeset 7587 in josm

Timestamp:

2014-09-29T23:41:46+02:00 (10 years ago)

Author:

Don-vip

Message:

fix #10557 - node icon not updated properly after undoing/redoing addition of a way

Location:

trunk/src/org/openstreetmap/josm

Files:

• command/AddCommand.java (modified) (3 diffs)
• data/osm/Way.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/command/AddCommand.java

@@ -12 +12 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
+import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.DefaultNameFormatter;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
@@ -48 +49 @@
     }
 
+    protected static final void checkNodeStyles(OsmPrimitive osm) {
+        if (osm instanceof Way) {
+            // Fix #10557 - node icon not updated after undoing/redoing addition of a way
+            ((Way)osm).clearCachedNodeStyles();
+        }
+    }
+
     @Override
     public boolean executeCommand() {
         getLayer().data.addPrimitive(osm);
         osm.setModified(true);
+        checkNodeStyles(osm);
         return true;
     }
@@ -58 +67 @@
     public void undoCommand() {
         getLayer().data.removePrimitive(osm);
+        checkNodeStyles(osm);
     }
 

trunk/src/org/openstreetmap/josm/data/osm/Way.java

@@ -739 +739 @@
     protected void keysChangedImpl(Map<String, String> originalKeys) {
         super.keysChangedImpl(originalKeys);
+        clearCachedNodeStyles();
+    }
+
+    public final void clearCachedNodeStyles() {
         for (final Node n : nodes) {
             n.clearCachedStyle();
         }
     }
-
 }