Changeset 1894 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2009-08-03T15:00:34+02:00 (16 years ago)

Author:

Gubaer

Message:

fixed #3158: modify status is not removed for partial uploads

File:

• trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java

@@ -99 +99 @@
     }
 
-    public void layerRemoved(Layer oldLayer) {
+    public void clean(Layer layer) {
+        if (layer == null)
+            return;
         boolean changed = false;
         for (Iterator<Command> it = commands.iterator(); it.hasNext();) {
-            if (it.next().invalidBecauselayerRemoved(oldLayer)) {
+            if (it.next().invalidBecauselayerRemoved(layer)) {
                 it.remove();
                 changed = true;
@@ -108 +110 @@
         }
         for (Iterator<Command> it = redoCommands.iterator(); it.hasNext();) {
-            if (it.next().invalidBecauselayerRemoved(oldLayer)) {
+            if (it.next().invalidBecauselayerRemoved(layer)) {
                 it.remove();
                 changed = true;
@@ -118 +120 @@
     }
 
+    public void layerRemoved(Layer oldLayer) {
+        clean(oldLayer);
+    }
+
     public void layerAdded(Layer newLayer) {}
     public void activeLayerChange(Layer oldLayer, Layer newLayer) {}