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

Timestamp:

2008-10-23T14:02:38+02:00 (16 years ago)

Author:

stoecker

Message:

cleanup shortcut modification a bit

File:

• trunk/src/org/openstreetmap/josm/tools/ShortCut.java (modified) (3 diffs)

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

@@ -29 +29 @@
  */
 public class ShortCut {
-        public static final int SHIFT = KeyEvent.SHIFT_DOWN_MASK;
-        public static final int CTRL = KeyEvent.CTRL_DOWN_MASK;
-        public static final int SHIFT_CTRL = KeyEvent.SHIFT_DOWN_MASK|KeyEvent.CTRL_DOWN_MASK;
+//      public static final int SHIFT = KeyEvent.SHIFT_DOWN_MASK;
+//      public static final int CTRL = KeyEvent.CTRL_DOWN_MASK;
+//      public static final int SHIFT_CTRL = KeyEvent.SHIFT_DOWN_MASK|KeyEvent.CTRL_DOWN_MASK;
+        public static final int SHIFT_DEFAULT = 1;
         private String shortText;        // the unique ID of the shortcut
         private String longText;         // a human readable description that will be shown in the preferences
@@ -309 +310 @@
                 int i = 0;
                 for (ShortCut sc : ShortCuts.values()) {
+// TODO: Remove sc.getAssignedUser() when we fixed all internal conflicts
                         if (!sc.getAutomatic() && !sc.getReset() && sc.getAssignedUser()) {
                                 Main.pref.put("shortcut.shortcut."+i, sc.asPrefString());
@@ -386 +388 @@
                 Integer defaultModifier = Groups.get(requestedGroup + GROUPS_DEFAULT);
                 if(modifier != null) {
-                        defaultModifier = modifier;
+                        if(modifier == SHIFT_DEFAULT)
+                                defaultModifier |= KeyEvent.SHIFT_MASK;
+                        else
+                                defaultModifier = modifier;
                 }
                 else if (defaultModifier == null) { // garbage in, no shortcurt out