import javax.swing.*;
-public class KeyboardModifierGestureShortuct extends Shortcut {
+public class KeyboardModifierGestureShortcut extends Shortcut {
private final KeyStroke myStroke;
private final KeyboardGestureAction.ModifierType myType;
throw new IllegalArgumentException(type.toString());
}
- protected KeyboardModifierGestureShortuct(final KeyStroke stroke, KeyboardGestureAction.ModifierType type) {
+ protected KeyboardModifierGestureShortcut(final KeyStroke stroke, KeyboardGestureAction.ModifierType type) {
myStroke = stroke;
myType = type;
}
}
public boolean startsWith(final Shortcut sc) {
- if (!(sc instanceof KeyboardModifierGestureShortuct)) return false;
+ if (!(sc instanceof KeyboardModifierGestureShortcut)) return false;
- final KeyboardModifierGestureShortuct other = (KeyboardModifierGestureShortuct)sc;
+ final KeyboardModifierGestureShortcut other = (KeyboardModifierGestureShortcut)sc;
if (myType.equals(other.myType)) {
if (myStroke.getModifiers() != other.myStroke.getModifiers()) return false;
return other.myStroke.getKeyCode() != -1 || other.myStroke.getKeyCode() == myStroke.getKeyCode();
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
- final KeyboardModifierGestureShortuct that = (KeyboardModifierGestureShortuct)o;
+ final KeyboardModifierGestureShortcut that = (KeyboardModifierGestureShortcut)o;
if (myStroke != null ? !myStroke.equals(that.myStroke) : that.myStroke != null) return false;
if (myType != that.myType) return false;
return result;
}
- public static class DblClick extends KeyboardModifierGestureShortuct {
+ public static class DblClick extends KeyboardModifierGestureShortcut {
public DblClick(final KeyStroke stroke) {
super(stroke, KeyboardGestureAction.ModifierType.dblClick);
}
}
- public static class Hold extends KeyboardModifierGestureShortuct {
+ public static class Hold extends KeyboardModifierGestureShortcut {
public Hold(final KeyStroke stroke) {
super(stroke, KeyboardGestureAction.ModifierType.hold);
}
* Don't use this field directly! Use it only through <code>getKeystroke2ListOfIds</code>.
*/
private Map<KeyStroke, List<String>> myKeystroke2ListOfIds = null;
- private Map<KeyboardModifierGestureShortuct, List<String>> myGesture2ListOfIds = null;
+ private Map<KeyboardModifierGestureShortcut, List<String>> myGesture2ListOfIds = null;
// TODO[vova,anton] it should be final member
/**
return myKeystroke2ListOfIds;
}
- private Map<KeyboardModifierGestureShortuct, List<String>> getGesture2ListOfIds() {
+ private Map<KeyboardModifierGestureShortcut, List<String>> getGesture2ListOfIds() {
if (myGesture2ListOfIds == null) {
- myGesture2ListOfIds = new THashMap<KeyboardModifierGestureShortuct, List<String>>();
- fillShortcut2ListOfIds(myGesture2ListOfIds, KeyboardModifierGestureShortuct.class);
+ myGesture2ListOfIds = new THashMap<KeyboardModifierGestureShortcut, List<String>>();
+ fillShortcut2ListOfIds(myGesture2ListOfIds, KeyboardModifierGestureShortcut.class);
}
return myGesture2ListOfIds;
}
return myParent.getActionIds(firstKeyStroke);
}
- protected String[] getParentActionIds(KeyboardModifierGestureShortuct gesture) {
+ protected String[] getParentActionIds(KeyboardModifierGestureShortcut gesture) {
return myParent.getActionIds(gesture);
}
- private String[] getActionIds(KeyboardModifierGestureShortuct shortuct) {
+ private String[] getActionIds(KeyboardModifierGestureShortcut shortcut) {
// first, get keystrokes from own map
- final Map<KeyboardModifierGestureShortuct, List<String>> map = getGesture2ListOfIds();
+ final Map<KeyboardModifierGestureShortcut, List<String>> map = getGesture2ListOfIds();
List<String> list = new ArrayList<String>();
- for (Map.Entry<KeyboardModifierGestureShortuct, List<String>> entry : map.entrySet()) {
- if (shortuct.startsWith(entry.getKey())) {
+ for (Map.Entry<KeyboardModifierGestureShortcut, List<String>> entry : map.entrySet()) {
+ if (shortcut.startsWith(entry.getKey())) {
list.addAll(entry.getValue());
}
}
if (myParent != null) {
- String[] ids = getParentActionIds(shortuct);
+ String[] ids = getParentActionIds(shortcut);
if (ids.length > 0) {
for (String id : ids) {
// add actions from parent keymap only if they are absent in this keymap
else if (shortcut instanceof MouseShortcut) {
return getActionIds((MouseShortcut)shortcut);
}
- else if (shortcut instanceof KeyboardModifierGestureShortuct) {
- return getActionIds((KeyboardModifierGestureShortuct)shortcut);
+ else if (shortcut instanceof KeyboardModifierGestureShortcut) {
+ return getActionIds((KeyboardModifierGestureShortcut)shortcut);
}
else {
return ArrayUtil.EMPTY_STRING_ARRAY;
throw new InvalidDataException("Wrong modifier=" + modifierText + " action id=" + id + " keymap=" + myName);
}
- Shortcut shortcut = KeyboardModifierGestureShortuct.newInstance(modifier, stroke);
+ Shortcut shortcut = KeyboardModifierGestureShortcut.newInstance(modifier, stroke);
final ArrayList<Shortcut> shortcuts = id2shortcuts.get(id);
shortcuts.add(shortcut);
}
element.setAttribute(KEYSTROKE_ATTRIBUTE, getMouseShortcutString(mouseShortcut));
actionElement.addContent(element);
}
- else if (shortcut instanceof KeyboardModifierGestureShortuct) {
- final KeyboardModifierGestureShortuct gesture = (KeyboardModifierGestureShortuct)shortcut;
+ else if (shortcut instanceof KeyboardModifierGestureShortcut) {
+ final KeyboardModifierGestureShortcut gesture = (KeyboardModifierGestureShortcut)shortcut;
final Element element = new Element(KEYBOARD_GESTURE_SHORTCUT);
element.setAttribute(KEYBOARD_GESTURE_SHORTCUT, getKeyShortcutString(gesture.getStroke()));
element.setAttribute(KEYBOARD_GESTURE_MODIFIER, gesture.getType().name());