Changeset 343 in josm for trunk/src/org/openstreetmap/josm/gui/MainMenu.java

Timestamp:

2007-10-07T13:20:27+02:00 (17 years ago)

Author:

gebner

Message:

Merge 0.5.

File:

• trunk/src/org/openstreetmap/josm/gui/MainMenu.java (modified) (6 diffs)

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

@@ -18 +18 @@
 import org.openstreetmap.josm.actions.CombineWayAction;
 import org.openstreetmap.josm.actions.DownloadAction;
-import org.openstreetmap.josm.actions.DownloadIncompleteAction;
 import org.openstreetmap.josm.actions.ExitAction;
 import org.openstreetmap.josm.actions.GpxExportAction;
@@ -26 +25 @@
 import org.openstreetmap.josm.actions.PreferencesAction;
 import org.openstreetmap.josm.actions.RedoAction;
-import org.openstreetmap.josm.actions.ReorderAction;
-import org.openstreetmap.josm.actions.ReverseSegmentAction;
+import org.openstreetmap.josm.actions.ReverseWayAction;
 import org.openstreetmap.josm.actions.SaveAction;
 import org.openstreetmap.josm.actions.SaveAsAction;
@@ -56 +54 @@
         public final OpenAction open = new OpenAction();
         public final DownloadAction download = new DownloadAction();
-        public final Action reverseSegment = new ReverseSegmentAction();
+        public final Action reverseWay = new ReverseWayAction();
         public final Action splitWay = new SplitWayAction();
         public final Action combineWay = new CombineWayAction();
         public final Action alignInCircle = new AlignInCircleAction();
         public final Action alignInLine = new AlignInLineAction();
-        public final Action reorder = new ReorderAction();
         public final Action upload = new UploadAction();
         public final Action save = new SaveAction(null);
@@ -70 +67 @@
         public final HelpAction help = new HelpAction();
         public final Action about = new AboutAction();
-        public final DownloadIncompleteAction downloadIncomplete = new DownloadIncompleteAction();
         
         public final JMenu layerMenu = new JMenu(tr("Layer"));
@@ -117 +113 @@
                 toolsMenu.add(alignInLine);
                 toolsMenu.addSeparator();
-                toolsMenu.add(reverseSegment);
-                toolsMenu.add(reorder);
+                toolsMenu.add(reverseWay);
                 toolsMenu.addSeparator();
                 toolsMenu.add(splitWay);
@@ -126 +121 @@
                 connectionMenu.setMnemonic('C');
                 connectionMenu.add(download);
-                connectionMenu.add(downloadIncomplete);
                 connectionMenu.add(upload);
                 add(connectionMenu);