Changeset 301 in josm for src/org/openstreetmap/josm/actions

Timestamp:

2007-08-08T14:56:38+02:00 (18 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/actions

Files:

• AlignInCircleAction.java (modified) (1 diff)
• AlignInLineAction.java (modified) (1 diff)
• CombineWayAction.java (modified) (1 diff)
• RedoAction.java (modified) (1 diff)
• ReorderAction.java (modified) (1 diff)
• ReverseSegmentAction.java (modified) (1 diff)
• SplitWayAction.java (modified) (1 diff)
• UndoAction.java (modified) (1 diff)
• mapmode/AddNodeAction.java (modified) (1 diff)
• mapmode/AddSegmentAction.java (modified) (1 diff)
• mapmode/AddWayAction.java (modified) (4 diffs)
• mapmode/DeleteAction.java (modified) (3 diffs)
• mapmode/MoveAction.java (modified) (1 diff)

src/org/openstreetmap/josm/actions/AlignInCircleAction.java

@@ -68 +68 @@
                 }
 
-                Main.main.editLayer().add(new SequenceCommand(tr("Align Nodes in Circle"), cmds));
+                Main.main.undoRedo.add(new SequenceCommand(tr("Align Nodes in Circle"), cmds));
                 Main.map.repaint();
         }

src/org/openstreetmap/josm/actions/AlignInLineAction.java

@@ -110 +110 @@
 
                 // Do it!
-                Main.main.editLayer().add(new SequenceCommand(tr("Align Nodes in Line"), cmds));
+                Main.main.undoRedo.add(new SequenceCommand(tr("Align Nodes in Line"), cmds));
                 Main.map.repaint();
         }

src/org/openstreetmap/josm/actions/CombineWayAction.java

@@ -99 +99 @@
                 cmds.add(new DeleteCommand(selectedWays));
                 cmds.add(new ChangeCommand(oldWay, newWay));
-                Main.main.editLayer().add(new SequenceCommand(tr("Combine {0} ways", selectedWays.size()), cmds));
+                Main.main.undoRedo.add(new SequenceCommand(tr("Combine {0} ways", selectedWays.size()), cmds));
                 Main.ds.setSelected(oldWay);
         }

src/org/openstreetmap/josm/actions/RedoAction.java

@@ -30 +30 @@
                         return;
                 Main.map.repaint();
-                Main.main.editLayer().redo();
+                Main.main.undoRedo.redo();
         }
 }

src/org/openstreetmap/josm/actions/ReorderAction.java

@@ -59 +59 @@
 
                                 if( c != null )
-                                        Main.main.editLayer().add( c );
+                                        Main.main.undoRedo.add(c);
                         }
                 }

src/org/openstreetmap/josm/actions/ReverseSegmentAction.java

@@ -54 +54 @@
                 c.add(new ChangeCommand(s, snew));
         }
-        Main.main.editLayer().add(new SequenceCommand(tr("Reverse Segments"), c));
+        Main.main.undoRedo.add(new SequenceCommand(tr("Reverse Segments"), c));
         Main.map.repaint();
     }

src/org/openstreetmap/josm/actions/SplitWayAction.java

@@ -455 +455 @@
                 NameVisitor v = new NameVisitor();
                 v.visit(selectedWay);
-                Main.main.editLayer().add(new SequenceCommand(tr("Split way {0} into {1} parts",v.name, segmentSets.size()), commandList));
+                Main.main.undoRedo.add(new SequenceCommand(tr("Split way {0} into {1} parts",v.name, segmentSets.size()), commandList));
                 Main.ds.setSelected(newSelection);
         }

src/org/openstreetmap/josm/actions/UndoAction.java

@@ -30 +30 @@
                         return;
                 Main.map.repaint();
-                Main.main.editLayer().undo();
+                Main.main.undoRedo.undo();
         }
 }

src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java

@@ -170 +170 @@
                 }               
         
-                Main.main.editLayer().add(c);
+                Main.main.undoRedo.add(c);
                 Main.ds.setSelected(n);
                 Main.map.mapView.repaint();

src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java

@@ -146 +146 @@
 
                         Segment ls = new Segment(start, end);
-                        Main.main.editLayer().add(new AddCommand(ls));
+                        Main.main.undoRedo.add(new AddCommand(ls));
                         Collection<OsmPrimitive> sel = Main.ds.getSelected();
                         sel.add(ls);

src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java

@@ -107 +107 @@
                         copy.segments.remove(s);
                         if (copy.segments.isEmpty()) {
-                                Main.main.editLayer().add(new DeleteCommand(Arrays.asList(new OsmPrimitive[]{way})));
+                                Main.main.undoRedo.add(new DeleteCommand(Arrays.asList(new OsmPrimitive[]{way})));
                                 way = null;
                         } else
-                                Main.main.editLayer().add(new ChangeCommand(way, copy));
+                                Main.main.undoRedo.add(new ChangeCommand(way, copy));
                 } else {
                         if (way == null) {
                                 way = new Way();
                                 way.segments.add(s);
-                                Main.main.editLayer().add(new AddCommand(way));
+                                Main.main.undoRedo.add(new AddCommand(way));
                         } else {
                                 Way copy = new Way(way);
@@ -123 +123 @@
                                                 break;
                                 copy.segments.add(i, s);
-                                Main.main.editLayer().add(new ChangeCommand(way, copy));
+                                Main.main.undoRedo.add(new ChangeCommand(way, copy));
                         }
                 }
@@ -198 +198 @@
                                 w.segments.clear();
                         w.segments.addAll(sortedSegments);
-                        Main.main.editLayer().add(new ChangeCommand(wayToAdd, w));
+                        Main.main.undoRedo.add(new ChangeCommand(wayToAdd, w));
                         return wayToAdd;
                 }
@@ -207 +207 @@
                 Way w = new Way();
                 w.segments.addAll(sortedSegments);
-                Main.main.editLayer().add(new AddCommand(w));
+                Main.main.undoRedo.add(new AddCommand(w));
                 return w;
         }

src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java

@@ -126 +126 @@
                 v.data.addAll(selection);
                 if (!v.data.isEmpty())
-                        Main.main.editLayer().add(new DeleteCommand(v.data));
+                        Main.main.undoRedo.add(new DeleteCommand(v.data));
         }
 
@@ -164 +164 @@
                 }
                 if (!del.isEmpty())
-                        Main.main.editLayer().add(new DeleteCommand(del));
+                        Main.main.undoRedo.add(new DeleteCommand(del));
         }
 
@@ -213 +213 @@
                 cmds.add(new ChangeCommand(seg1, s));
                 cmds.add(new DeleteCommand(Arrays.asList(new OsmPrimitive[]{n, seg2})));
-                Main.main.editLayer().add(new SequenceCommand(tr("Delete Node"), cmds));
+                Main.main.undoRedo.add(new SequenceCommand(tr("Delete Node"), cmds));
                 return null;
     }

src/org/openstreetmap/josm/actions/mapmode/MoveAction.java

@@ -106 +106 @@
                 }
 
-                Command c = !Main.main.editLayer().commands.isEmpty() ? Main.main.editLayer().commands.getLast() : null;
+                Command c = !Main.main.undoRedo.commands.isEmpty() ? Main.main.undoRedo.commands.getLast() : null;
                 if (c instanceof MoveCommand && affectedNodes.equals(((MoveCommand)c).objects))
                         ((MoveCommand)c).moveAgain(dx,dy);
                 else
-                        Main.main.editLayer().add(new MoveCommand(selection, dx, dy));
+                        Main.main.undoRedo.add(new MoveCommand(selection, dx, dy));
 
                 Main.map.mapView.repaint();