Changeset 213 in josm


Ignore:
Timestamp:
2007-04-04T17:50:44+02:00 (13 years ago)
Author:
imi
Message:
  • added a Combine way tool
  • fixed the confusing menu structure (new Tools - menu)
Files:
2 added
2 edited

Legend:

Unmodified
Added
Removed
  • src/org/openstreetmap/josm/command/DeleteCommand.java

    r113 r213  
    2323         * The primitive that get deleted.
    2424         */
    25         private final Collection<OsmPrimitive> data;
     25        private final Collection<? extends OsmPrimitive> data;
    2626
    27         public DeleteCommand(Collection<OsmPrimitive> data) {
     27        public DeleteCommand(Collection<? extends OsmPrimitive> data) {
    2828                this.data = data;
    2929        }
  • src/org/openstreetmap/josm/gui/MainMenu.java

    r191 r213  
    1111import org.openstreetmap.josm.actions.AlignInCircleAction;
    1212import org.openstreetmap.josm.actions.AlignInLineAction;
     13import org.openstreetmap.josm.actions.CombineWayAction;
    1314import org.openstreetmap.josm.actions.DownloadAction;
    1415import org.openstreetmap.josm.actions.DownloadIncompleteAction;
     
    5152        public final Action reverseSegment = new ReverseSegmentAction();
    5253        public final Action splitWay = new SplitWayAction();
     54        public final Action combineWay = new CombineWayAction();
    5355        public final Action alignInCircle = new AlignInCircleAction();
    5456        public final Action alignInLine = new AlignInLineAction();
     
    6264        public final HelpAction help = new HelpAction();
    6365        public final Action about = new AboutAction();
     66        public final DownloadIncompleteAction downloadIncomplete = new DownloadIncompleteAction();
    6467
    6568        public final JMenu layerMenu = new JMenu(tr("Layer"));
     
    6871        public final JMenu fileMenu = new JMenu(tr("Files"));
    6972        public final JMenu connectionMenu = new JMenu(tr("Connection"));
    70         private DownloadIncompleteAction downloadIncomplete = new DownloadIncompleteAction();
    71 
     73        public final JMenu toolsMenu = new JMenu(tr("Tools"));
    7274
    7375
     
    9294                editMenu.add(search);
    9395                editMenu.addSeparator();
    94                 editMenu.add(reverseSegment);
    95                 editMenu.add(splitWay);
    96                 editMenu.add(alignInCircle);
    97                 editMenu.add(alignInLine);
    98                 editMenu.add(reorder);
    99                 editMenu.addSeparator();
    10096                editMenu.add(preferences);
    10197                add(editMenu);
     98
     99                toolsMenu.setMnemonic('T');
     100                toolsMenu.add(alignInCircle);
     101                toolsMenu.add(alignInLine);
     102                toolsMenu.addSeparator();
     103                toolsMenu.add(reverseSegment);
     104                toolsMenu.add(reorder);
     105                toolsMenu.addSeparator();
     106                toolsMenu.add(splitWay);
     107                toolsMenu.add(combineWay);
     108                add(toolsMenu);
    102109
    103110                connectionMenu.setMnemonic('C');
Note: See TracChangeset for help on using the changeset viewer.