Changeset 4892 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

02.02.2012 19:37:34 (4 months ago)

Author:

stoecker

Message:

remove deprecation

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• CloseChangesetAction.java (modified) (1 diff)
• CombineWayAction.java (modified) (1 diff)
• UpdateModifiedAction.java (modified) (1 diff)
• UpdateSelectionAction.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/CloseChangesetAction.java

@@ -37 +37 @@
             Shortcut.registerShortcut("system:closechangeset",
                 tr("File: {0}", tr("Closes open changesets")),
-                KeyEvent.VK_Q, Shortcut.GROUP_HOTKEY + Shortcut.GROUPS_ALT2),
+                KeyEvent.VK_Q, Shortcut.GROUPS_ALT2+Shortcut.GROUP_HOTKEY),
             true
         );

trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java

@@ -106 +106 @@
         }
         return ret;
-    }
-
-    @Deprecated
-    public static Way combineWays(Collection<Way> ways) {
-        Pair<Way, Command> combineResult;
-        try {
-            combineResult = combineWaysWorker(ways);
-        } catch (UserCancelException ex) {
-            return null;
-        }
-        Main.main.undoRedo.add(combineResult.b);
-        return combineResult.a;
     }
 

trunk/src/org/openstreetmap/josm/actions/UpdateModifiedAction.java

@@ -27 +27 @@
                 Shortcut.registerShortcut("file:updatemodified",
                         tr("Update modified"), KeyEvent.VK_M,
-                        Shortcut.GROUP_HOTKEY + Shortcut.GROUPS_ALT2),
+                        Shortcut.GROUPS_ALT2+Shortcut.GROUP_HOTKEY),
                         true);
         putValue("help", ht("/Action/UpdateModified"));

trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java

@@ -88 +88 @@
                 Shortcut.registerShortcut("file:updateselection",
                         tr("Update selection"), KeyEvent.VK_U,
-                        Shortcut.GROUP_HOTKEY + Shortcut.GROUPS_ALT2),
+                        Shortcut.GROUPS_ALT2+Shortcut.GROUP_HOTKEY),
                 true);
         putValue("help", ht("/Action/UpdateSelection"));