Changeset 4892 in josm for trunk/src/org


Ignore:
Timestamp:
2012-02-02T19:37:34+01:00 (8 years ago)
Author:
stoecker
Message:

remove deprecation

Location:
trunk/src/org/openstreetmap/josm/actions
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/actions/CloseChangesetAction.java

    r4851 r4892  
    3737            Shortcut.registerShortcut("system:closechangeset",
    3838                tr("File: {0}", tr("Closes open changesets")),
    39                 KeyEvent.VK_Q, Shortcut.GROUP_HOTKEY + Shortcut.GROUPS_ALT2),
     39                KeyEvent.VK_Q, Shortcut.GROUPS_ALT2+Shortcut.GROUP_HOTKEY),
    4040            true
    4141        );
  • trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java

    r4310 r4892  
    106106        }
    107107        return ret;
    108     }
    109 
    110     @Deprecated
    111     public static Way combineWays(Collection<Way> ways) {
    112         Pair<Way, Command> combineResult;
    113         try {
    114             combineResult = combineWaysWorker(ways);
    115         } catch (UserCancelException ex) {
    116             return null;
    117         }
    118         Main.main.undoRedo.add(combineResult.b);
    119         return combineResult.a;
    120108    }
    121109
  • trunk/src/org/openstreetmap/josm/actions/UpdateModifiedAction.java

    r4851 r4892  
    2727                Shortcut.registerShortcut("file:updatemodified",
    2828                        tr("Update modified"), KeyEvent.VK_M,
    29                         Shortcut.GROUP_HOTKEY + Shortcut.GROUPS_ALT2),
     29                        Shortcut.GROUPS_ALT2+Shortcut.GROUP_HOTKEY),
    3030                        true);
    3131        putValue("help", ht("/Action/UpdateModified"));
  • trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java

    r4851 r4892  
    8888                Shortcut.registerShortcut("file:updateselection",
    8989                        tr("Update selection"), KeyEvent.VK_U,
    90                         Shortcut.GROUP_HOTKEY + Shortcut.GROUPS_ALT2),
     90                        Shortcut.GROUPS_ALT2+Shortcut.GROUP_HOTKEY),
    9191                true);
    9292        putValue("help", ht("/Action/UpdateSelection"));
Note: See TracChangeset for help on using the changeset viewer.