Changeset 186 in josm

Timestamp:

2007-01-04T22:59:52+01:00 (18 years ago)

Author:

imi

Message:

• added split way action (thanks Frederik)
• fixed bug where modified state was reset after each undo (now after ALL undo's)

Files:

• images/splitway.png (added)
• src/org/openstreetmap/josm/actions/SplitWayAction.java (added)
• src/org/openstreetmap/josm/gui/MainMenu.java (modified) (3 diffs)
• src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java (modified) (1 diff)

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

@@ -25 +25 @@
 import org.openstreetmap.josm.actions.SaveAsAction;
 import org.openstreetmap.josm.actions.SelectAllAction;
+import org.openstreetmap.josm.actions.SplitWayAction;
 import org.openstreetmap.josm.actions.UndoAction;
 import org.openstreetmap.josm.actions.UnselectAllAction;
@@ -47 +48 @@
         public final DownloadAction download = new DownloadAction();
         public final Action reverseSegment = new ReverseSegmentAction();
+        public final Action splitWay = new SplitWayAction();
         public final Action alignInCircle = new AlignInCircleAction();
         public final Action alignInLine = new AlignInLineAction();
@@ -87 +89 @@
                 editMenu.addSeparator();
                 editMenu.add(reverseSegment);
+                editMenu.add(splitWay);
                 editMenu.add(alignInCircle);
                 editMenu.add(alignInLine);

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

@@ -201 +201 @@
                 c.undoCommand();
                 redoCommands.push(c);
-                //TODO: Replace with listener scheme
-                setModified(uploadedModified);
+                setModified(uploadedModified || !commands.isEmpty());
                 Main.ds.clearSelection();
                 fireCommandsChanged();

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

@@ -76 +76 @@
                         setting.ok();
                 if (requiresRestart)
-                        JOptionPane.showMessageDialog(PreferenceDialog.this,tr("You have to restart JOSM for some settings to take effect."));
+                        JOptionPane.showMessageDialog(Main.parent,tr("You have to restart JOSM for some settings to take effect."));
                 Main.parent.repaint();
         }