Changeset 301 in josm for src/org/openstreetmap/josm/gui/dialogs

Timestamp:

2007-08-08T14:56:38+02:00 (19 years ago)

Author:

imi

Message:

• fixed undo/redo to be global
• fixed adding of objects work with undo/redo (#212)

Location:

src/org/openstreetmap/josm/gui/dialogs

Files:

• CommandStackDialog.java (modified) (3 diffs)
• ConflictDialog.java (modified) (1 diff)
• PropertiesDialog.java (modified) (3 diffs)

src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java

@@ -19 +19 @@
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.gui.MapFrame;
-import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
-import org.openstreetmap.josm.gui.layer.Layer;
-import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer.CommandQueueListener;
 
@@ -31 +28 @@
         public CommandStackDialog(final MapFrame mapFrame) {
                 super(tr("Command Stack"), "commandstack", tr("Open a list of all commands (undo buffer)."), KeyEvent.VK_O, 100);
-                mapFrame.mapView.addLayerChangeListener(new LayerChangeListener(){
-                        public void activeLayerChange(Layer oldLayer, Layer newLayer) {}
-                        public void layerAdded(Layer newLayer) {
-                                if (newLayer instanceof OsmDataLayer)
-                                        Main.main.editLayer().listenerCommands.add(CommandStackDialog.this);
-                        }
-                        public void layerRemoved(Layer oldLayer) {
-                                if (oldLayer instanceof OsmDataLayer)
-                                        Main.main.editLayer().listenerCommands.remove(CommandStackDialog.this);
-                        }
-                });
-                if (mapFrame.mapView.editLayer != null)
-                        mapFrame.mapView.editLayer.listenerCommands.add(this);
+                Main.main.undoRedo.listenerCommands.add(this);
                         
                 tree.setRootVisible(false);
@@ -75 +60 @@
                 if (Main.map == null || Main.map.mapView == null || Main.map.mapView.editLayer == null)
                         return;
-                Collection<Command> commands = Main.main.editLayer().commands;
+                Collection<Command> commands = Main.main.undoRedo.commands;
                 DefaultMutableTreeNode root = new DefaultMutableTreeNode();
                 for (Command c : commands)

src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

@@ -120 +120 @@
                 if (answer != JOptionPane.OK_OPTION)
                         return;
-                Main.main.editLayer().add(new ConflictResolveCommand(resolver.conflicts, sel));
+                Main.main.undoRedo.add(new ConflictResolveCommand(resolver.conflicts, sel));
                 Main.map.mapView.repaint();
         }

src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java

@@ -157 +157 @@
                 }
                 if (key.equals(newkey) || value == null)
-                        Main.main.editLayer().add(new ChangePropertyCommand(sel, newkey, value));
+                        Main.main.undoRedo.add(new ChangePropertyCommand(sel, newkey, value));
                 else {
-                        Main.main.editLayer().add(new SequenceCommand(trn("Change properties of {0} object", "Change properties of {0} objects", sel.size(), sel.size()),
+                        Main.main.undoRedo.add(new SequenceCommand(trn("Change properties of {0} object", "Change properties of {0} objects", sel.size(), sel.size()),
                                         new ChangePropertyCommand(sel, key, null),
                                         new ChangePropertyCommand(sel, newkey, value)));
@@ -239 +239 @@
                 if (value.equals(""))
                         return;
-                Main.main.editLayer().add(new ChangePropertyCommand(sel, key, value));
+                Main.main.undoRedo.add(new ChangePropertyCommand(sel, key, value));
                 selectionChanged(sel); // update table
                 Main.parent.repaint(); // repaint all - drawing could have been changed
@@ -251 +251 @@
                 String key = data.getValueAt(row, 0).toString();
                 Collection<OsmPrimitive> sel = Main.ds.getSelected();
-                Main.main.editLayer().add(new ChangePropertyCommand(sel, key, null));
+                Main.main.undoRedo.add(new ChangePropertyCommand(sel, key, null));
                 selectionChanged(sel); // update table
         }