Changeset 304 in josm for src/org/openstreetmap/josm/data

Timestamp:

2007-08-10T21:12:53+02:00 (18 years ago)

Author:

imi

Message:

• fixed a bug that nodes were not created when no data layer was loaded
• deprecated Main.map.mapView.addLayerChangeListener.

File:

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

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

@@ -1 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+//License: GPL. Copyright 2007 by Immanuel Scholz and others
 package org.openstreetmap.josm.data;
 
+import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.Stack;
@@ -7 +8 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.gui.layer.Layer.LayerChangeListener;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer.CommandQueueListener;
 
-public class UndoRedoHandler {
+public class UndoRedoHandler implements LayerChangeListener {
 
         /**
@@ -22 +25 @@
 
         public final LinkedList<CommandQueueListener> listenerCommands = new LinkedList<CommandQueueListener>();
+
+
+        public UndoRedoHandler() {
+                Layer.listeners.add(this);
+        }
 
 
@@ -37 +45 @@
                 fireCommandsChanged();
         }
-        
+
         /**
          * Undoes the last added command.
@@ -81 +89 @@
                 commands.clear();
                 fireCommandsChanged();
-    }
+        }
+
+        public void layerRemoved(Layer oldLayer) {
+                boolean changed = false;
+                for (Iterator<Command> it = commands.iterator(); it.hasNext();) {
+                        if (it.next().invalidBecauselayerRemoved(oldLayer)) {
+                                it.remove();
+                                changed = true;
+                        }
+                }
+                for (Iterator<Command> it = redoCommands.iterator(); it.hasNext();) {
+                        if (it.next().invalidBecauselayerRemoved(oldLayer)) {
+                                it.remove();
+                                changed = true;
+                        }
+                }
+                if (changed)
+                        fireCommandsChanged();
+        }
+
+        public void layerAdded(Layer newLayer) {}
+        public void activeLayerChange(Layer oldLayer, Layer newLayer) {}
 }