Changeset 31 in josm for src/org/openstreetmap/josm/gui

Timestamp:

2005-12-06T23:23:20+01:00 (19 years ago)

Author:

imi

Message:

• fixed broken stuff from last checkin
• complete undo and redo
• futher simplification in DeleteAction

Location:

src/org/openstreetmap/josm/gui

Files:

• PreferenceDialog.java (modified) (2 diffs)
• layer/OsmDataLayer.java (modified) (6 diffs)

src/org/openstreetmap/josm/gui/PreferenceDialog.java

@@ -243 +243 @@
                 map.add(Box.createVerticalGlue(), GBC.eol().fill(GBC.VERTICAL));
 
-                
+
                 tabPane.setTabLayoutPolicy(JTabbedPane.SCROLL_TAB_LAYOUT);
         
@@ -261 +261 @@
                 pack();
                 Dimension s = Main.main.getSize();
-                setLocation(s.width/2-getWidth()/2, s.height/2-getHeight()/2);
+                setLocation(Main.main.getX()+s.width/2-getWidth()/2, Main.main.getY()+s.height/2-getHeight()/2);
         }
 

src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -2 +2 @@
 
 import java.awt.Graphics;
-import java.io.FileWriter;
-import java.io.StringWriter;
 import java.util.LinkedList;
+import java.util.Stack;
 
 import javax.swing.Icon;
@@ -16 +15 @@
 import org.openstreetmap.josm.data.osm.Track;
 import org.openstreetmap.josm.data.osm.visitor.BoundingVisitor;
-import org.openstreetmap.josm.data.osm.visitor.CsvVisitor;
 import org.openstreetmap.josm.data.osm.visitor.SimplePaintVisitor;
 import org.openstreetmap.josm.data.projection.Projection;
@@ -41 +39 @@
          */
         private LinkedList<Command> commands = new LinkedList<Command>();
-        private LinkedList<String> debugDsBefore = new LinkedList<String>();
+        /**
+         * The stack for redoing commands
+         */
+        private Stack<Command> redoCommands = new Stack<Command>();
 
         /**
@@ -71 +72 @@
                 SimplePaintVisitor visitor = new SimplePaintVisitor(g, mv, null);
 
+                for (LineSegment ls : data.lineSegments)
+                        visitor.visit(ls);
                 for (Track t : data.tracks)
                         visitor.visit(t);
-                for (LineSegment ls : data.lineSegments)
-                        visitor.visit(ls);
                 for (Node n : data.nodes)
                         visitor.visit(n);
@@ -117 +118 @@
 
         /**
+         * @return the last command added or <code>null</code> if no command in queue.
+         */
+        public Command lastCommand() {
+                return commands.isEmpty() ? null : commands.getLast();
+        }
+        
+        /**
          * Execute the command and add it to the intern command queue. Also mark all
          * primitives in the command as modified.
          */
         public void add(Command c) {
-                StringWriter sw = new StringWriter();
-                CsvVisitor v = new CsvVisitor(sw);
-                for (Node n : Main.main.ds.nodes) {
-                        v.visit(n);
-                        sw.append('\n');
-                }
-                for (LineSegment ls : Main.main.ds.lineSegments) {
-                        v.visit(ls);
-                        sw.append('\n');
-                }
-                for (Track t : Main.main.ds.tracks) {
-                        v.visit(t);
-                        sw.append('\n');
-                }
-                debugDsBefore.add(sw.getBuffer().toString());
-                
                 c.executeCommand();
                 commands.add(c);
+                redoCommands.clear();
+                // TODO: Replace with listener scheme
+                Main.main.undoAction.setEnabled(true);
+                Main.main.redoAction.setEnabled(false);
         }
 
@@ -149 +145 @@
                 Command c = commands.removeLast();
                 c.undoCommand();
-                
-                //DEBUG
-                StringWriter sw = new StringWriter();
-                CsvVisitor v = new CsvVisitor(sw);
-                for (Node n : Main.main.ds.nodes) {
-                        v.visit(n);
-                        sw.append('\n');
-                }
-                for (LineSegment ls : Main.main.ds.lineSegments) {
-                        v.visit(ls);
-                        sw.append('\n');
-                }
-                for (Track t : Main.main.ds.tracks) {
-                        v.visit(t);
-                        sw.append('\n');
-                }
-                String s = Main.main.getMapFrame().mapView.editLayer().debugDsBefore.removeLast();
-                if (!s.equals(sw.getBuffer().toString())) {
-                        try {
-                                FileWriter fw = new FileWriter("/home/imi/richtig");
-                                fw.append(sw.getBuffer().toString());
-                                fw.close();
-                                fw = new FileWriter("/home/imi/falsch");
-                                fw.append(s);
-                                fw.close();
-                        } catch (Exception x) {
-                                x.printStackTrace();
-                        }
-                }
+                redoCommands.push(c);
+                //TODO: Replace with listener scheme
+                Main.main.undoAction.setEnabled(!commands.isEmpty());
+                Main.main.redoAction.setEnabled(true);
+        }
+        /**
+         * Redoes the last undoed command.
+         */
+        public void redo() {
+                if (redoCommands.isEmpty())
+                        return;
+                Command c = redoCommands.pop();
+                c.executeCommand();
+                commands.add(c);
+                //TODO: Replace with listener scheme
+                Main.main.undoAction.setEnabled(true);
+                Main.main.redoAction.setEnabled(!redoCommands.isEmpty());
         }
 }