Changeset 4916 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

11.02.2012 16:28:18 (3 months ago)

Author:

stoecker

Message:

fix #7375 - resetting shortcuts not possible

File:

• trunk/src/org/openstreetmap/josm/tools/Shortcut.java (modified) (6 diffs)

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

@@ -138 +138 @@
      */
     public void setAssignedUser(boolean assignedUser) {
-        this.reset = (!this.assignedUser && assignedUser);
+        this.reset = (this.assignedUser || reset) && !assignedUser;
         if (assignedUser) {
             assignedDefault = false;
+        } else if (reset) {
+            assignedKey = requestedKey;
+            assignedModifier = findModifier(requestedGroup, null);
         }
         this.assignedUser = assignedUser;
@@ -172 +175 @@
     }
 
-    private void saveDefault() {
+    private void saveDefault(int modifier) {
         Main.pref.getCollection("shortcut.entry."+shortText, Arrays.asList(new String[]{longText,
-        String.valueOf(requestedKey), String.valueOf(requestedGroup), String.valueOf(assignedKey),
-        String.valueOf(assignedModifier), String.valueOf(true), String.valueOf(false)}));
+        String.valueOf(requestedKey), String.valueOf(requestedGroup), String.valueOf(requestedKey),
+        String.valueOf(modifier), String.valueOf(true), String.valueOf(false)}));
     }
 
     // get a string that can be put into the preferences
     private boolean save() {
-        return Main.pref.putCollection("shortcut.entry."+shortText, Arrays.asList(new String[]{longText,
-        String.valueOf(requestedKey), String.valueOf(requestedGroup), String.valueOf(assignedKey),
-        String.valueOf(assignedModifier), String.valueOf(assignedDefault), String.valueOf(assignedUser)}));
+        if (getAutomatic() || getReset() || !getAssignedUser()) {
+            return Main.pref.putCollection("shortcut.entry."+shortText, null);
+        } else {
+            return Main.pref.putCollection("shortcut.entry."+shortText, Arrays.asList(new String[]{longText,
+            String.valueOf(requestedKey), String.valueOf(requestedGroup), String.valueOf(assignedKey),
+            String.valueOf(assignedModifier), String.valueOf(assignedDefault), String.valueOf(assignedUser)}));
+        }
     }
 
@@ -347 +354 @@
         boolean changed = false;
         for (Shortcut sc : shortcuts.values()) {
-            if (!sc.getAutomatic() && !sc.getReset() && sc.getAssignedUser()) {
-                changed = changed | sc.save();
-            }
+            changed = changed | sc.save();
         }
         return changed;
@@ -427 +432 @@
     }
 
+    private static int findModifier(int group, Integer modifier) {
+        Integer defaultModifier = getGroupModifier(group + GROUPS_DEFAULT);
+        if(modifier != null) {
+            if(modifier == SHIFT_DEFAULT) {
+                defaultModifier |= KeyEvent.SHIFT_DOWN_MASK;
+            } else {
+                defaultModifier = modifier;
+            }
+        }
+        else if (defaultModifier == null) { // garbage in, no shortcut out
+            defaultModifier = getGroupModifier(GROUP_NONE + GROUPS_DEFAULT);
+        }
+        return defaultModifier;
+    }
+
     // and now the workhorse. same parameters as above, just one more: if originalShortcut is not null and
     // is different from the shortcut that will be assigned, a popup warning will be displayed to the user.
@@ -435 +455 @@
             Shortcut originalShortcut) {
         doInit();
+        Integer defaultModifier = findModifier(requestedGroup, modifier);
         if (shortcuts.containsKey(shortText)) { // a re-register? maybe a sc already read from the preferences?
             Shortcut sc = shortcuts.get(shortText);
             sc.setLongText(longText); // or set by the platformHook, in this case the original longText doesn't match the real action
+            sc.saveDefault(defaultModifier);
             return sc;
-        }
-        Integer defaultModifier = getGroupModifier(requestedGroup + GROUPS_DEFAULT);
-        if(modifier != null) {
-            if(modifier == SHIFT_DEFAULT) {
-                defaultModifier |= KeyEvent.SHIFT_DOWN_MASK;
-            } else {
-                defaultModifier = modifier;
-            }
-        }
-        else if (defaultModifier == null) { // garbage in, no shortcut out
-            defaultModifier = getGroupModifier(GROUP_NONE + GROUPS_DEFAULT);
         }
         Shortcut conflictsWith = null;
@@ -483 +494 @@
         }
 
-        potentialShortcut.saveDefault();
+        potentialShortcut.saveDefault(defaultModifier);
         shortcuts.put(shortText, potentialShortcut);
         return potentialShortcut;