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

Timestamp:

2012-02-13T22:15:10+01:00 (13 years ago)

Author:

stoecker

Message:

small cleanups

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/UpdateDataAction.java (modified) (1 diff)
• actions/UpdateModifiedAction.java (modified) (1 diff)
• actions/UpdateSelectionAction.java (modified) (1 diff)
• tools/Shortcut.java (modified) (3 diffs)

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

@@ -25 +25 @@
                 tr("Updates the objects in the active data layer from the server."),
                 Shortcut.registerShortcut("file:updatedata",
-                        tr("Update data"),
+                        tr("File: {0}", tr("Update data")),
                         KeyEvent.VK_U, Shortcut.GROUP_HOTKEY),
                 true);

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

@@ -26 +26 @@
                 tr("Updates the currently modified objects from the server (re-downloads data)"),
                 Shortcut.registerShortcut("file:updatemodified",
-                        tr("Update modified"), KeyEvent.VK_M,
+                        tr("File: {0}", tr("Update modified")), KeyEvent.VK_M,
                         Shortcut.GROUPS_ALT2+Shortcut.GROUP_HOTKEY),
                         true);

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

@@ -87 +87 @@
                 tr("Updates the currently selected objects from the server (re-downloads data)"),
                 Shortcut.registerShortcut("file:updateselection",
-                        tr("Update selection"), KeyEvent.VK_U,
+                        tr("File: {0}", tr("Update selection")), KeyEvent.VK_U,
                         Shortcut.GROUPS_ALT2+Shortcut.GROUP_HOTKEY),
                 true);

trunk/src/org/openstreetmap/josm/tools/Shortcut.java

@@ -450 +450 @@
 
     private static int findModifier(int group, Integer modifier) {
-        Integer defaultModifier = getGroupModifier(group + GROUPS_DEFAULT);
+        Integer defaultModifier = getGroupModifier(group);
         if(modifier != null) {
             if(modifier == SHIFT_DEFAULT) {
@@ -484 +484 @@
             conflictsWith = potentialShortcut;
             defaultModifier = getGroupModifier(requestedGroup + GROUPS_ALT1);
-            if (defaultModifier == null) { // garbage in, no shortcurt out
+            if (defaultModifier == null) { // garbage in, no shortcut out
                 defaultModifier = getGroupModifier(GROUP_NONE + GROUPS_DEFAULT);
             }
@@ -490 +490 @@
             if (potentialShortcut != null) {
                 defaultModifier = getGroupModifier(requestedGroup + GROUPS_ALT2);
-                if (defaultModifier == null) { // garbage in, no shortcurt out
+                if (defaultModifier == null) { // garbage in, no shortcut out
                     defaultModifier = getGroupModifier(GROUP_NONE + GROUPS_DEFAULT);
                 }