Changeset 213 in josm for src/org

Timestamp:

2007-04-04T17:50:44+02:00 (17 years ago)

Author:

imi

Message:

• added a Combine way tool
• fixed the confusing menu structure (new Tools - menu)

Location:

src/org/openstreetmap/josm

Files:

• actions/CombineWayAction.java (added)
• command/DeleteCommand.java (modified) (1 diff)
• gui/MainMenu.java (modified) (5 diffs)

src/org/openstreetmap/josm/command/DeleteCommand.java

@@ -23 +23 @@
          * The primitive that get deleted.
          */
-        private final Collection<OsmPrimitive> data;
+        private final Collection<? extends OsmPrimitive> data;
 
-        public DeleteCommand(Collection<OsmPrimitive> data) {
+        public DeleteCommand(Collection<? extends OsmPrimitive> data) {
                 this.data = data;
         }

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

@@ -11 +11 @@
 import org.openstreetmap.josm.actions.AlignInCircleAction;
 import org.openstreetmap.josm.actions.AlignInLineAction;
+import org.openstreetmap.josm.actions.CombineWayAction;
 import org.openstreetmap.josm.actions.DownloadAction;
 import org.openstreetmap.josm.actions.DownloadIncompleteAction;
@@ -51 +52 @@
         public final Action reverseSegment = new ReverseSegmentAction();
         public final Action splitWay = new SplitWayAction();
+        public final Action combineWay = new CombineWayAction();
         public final Action alignInCircle = new AlignInCircleAction();
         public final Action alignInLine = new AlignInLineAction();
@@ -62 +64 @@
         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"));
@@ -68 +71 @@
         public final JMenu fileMenu = new JMenu(tr("Files"));
         public final JMenu connectionMenu = new JMenu(tr("Connection"));
-        private DownloadIncompleteAction downloadIncomplete = new DownloadIncompleteAction();
-
+        public final JMenu toolsMenu = new JMenu(tr("Tools"));
 
 
@@ -92 +94 @@
                 editMenu.add(search);
                 editMenu.addSeparator();
-                editMenu.add(reverseSegment);
-                editMenu.add(splitWay);
-                editMenu.add(alignInCircle);
-                editMenu.add(alignInLine);
-                editMenu.add(reorder);
-                editMenu.addSeparator();
                 editMenu.add(preferences);
                 add(editMenu);
+
+                toolsMenu.setMnemonic('T');
+                toolsMenu.add(alignInCircle);
+                toolsMenu.add(alignInLine);
+                toolsMenu.addSeparator();
+                toolsMenu.add(reverseSegment);
+                toolsMenu.add(reorder);
+                toolsMenu.addSeparator();
+                toolsMenu.add(splitWay);
+                toolsMenu.add(combineWay);
+                add(toolsMenu);
 
                 connectionMenu.setMnemonic('C');