Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
rhbz836051 arrange key shortcut constructor arguments for readability
Browse files Browse the repository at this point in the history
  • Loading branch information
@davidmason
davidmason committed Jul 5, 2012
1 parent 1240f4b commit 7f6a8e2
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 29 deletions.
30 changes: 16 additions & 14 deletions ...ta-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenter.java
View file
Expand Up @@ -242,7 +242,8 @@ public void onKeyShortcut(KeyShortcutEvent event)

// Register shortcut ALT+(PageUp) to move previous state entry - if modal
// navigation is enabled
keyShortcutPresenter.register(new KeyShortcut(KeyShortcut.ALT_KEY, KeyCodes.KEY_PAGEUP, ShortcutContext.Edit, messages.moveToPreviousStateRow(), new KeyShortcutEventHandler()
keyShortcutPresenter.register(new KeyShortcut(KeyShortcut.ALT_KEY, KeyCodes.KEY_PAGEUP,
ShortcutContext.Edit, messages.moveToPreviousStateRow(), new KeyShortcutEventHandler()
{
@Override
public void onKeyShortcut(KeyShortcutEvent event)
Expand All @@ -255,14 +256,15 @@ public void onKeyShortcut(KeyShortcutEvent event)
}));

// Register shortcut CTRL+S to save as fuzzy
keyShortcutPresenter.register(new KeyShortcut(KeyShortcut.CTRL_KEY, KeyShortcut.KEY_S, ShortcutContext.Edit, messages.saveAsFuzzy(), new KeyShortcutEventHandler()
keyShortcutPresenter.register(new KeyShortcut(KeyShortcut.CTRL_KEY, KeyShortcut.KEY_S,
ShortcutContext.Edit, messages.saveAsFuzzy(), KeyEvent.KEY_DOWN, true, true, new KeyShortcutEventHandler()
{
@Override
public void onKeyShortcut(KeyShortcutEvent event)
{
saveAsFuzzy();
}
}, KeyEvent.KEY_DOWN, true, true));
}));

KeyShortcutEventHandler saveAsApprovedKeyShortcutHandler = new KeyShortcutEventHandler()
{
Expand All @@ -274,22 +276,22 @@ public void onKeyShortcut(KeyShortcutEvent event)
};

ctrlEnterSavesApprovedShortcut = new KeyShortcut(KeyShortcut.CTRL_KEY, KeyCodes.KEY_ENTER,
ShortcutContext.Edit, messages.saveAsApproved(), saveAsApprovedKeyShortcutHandler,
KeyEvent.KEY_DOWN, true, true);
ShortcutContext.Edit, messages.saveAsApproved(), KeyEvent.KEY_DOWN, true, true,
saveAsApprovedKeyShortcutHandler);

enterSavesApprovedShortcut = new KeyShortcut(KeyShortcut.NO_MODIFIER, KeyCodes.KEY_ENTER,
ShortcutContext.Edit, messages.saveAsApproved(), saveAsApprovedKeyShortcutHandler,
KeyEvent.KEY_DOWN, true, true);
ShortcutContext.Edit, messages.saveAsApproved(), KeyEvent.KEY_DOWN, true, true,
saveAsApprovedKeyShortcutHandler);

enterTriggersAutoSizeShortcut = new KeyShortcut(KeyShortcut.NO_MODIFIER, KeyCodes.KEY_ENTER,
ShortcutContext.Edit, KeyShortcut.DO_NOT_DISPLAY_DESCRIPTION, new KeyShortcutEventHandler()
ShortcutContext.Edit, KeyShortcut.DO_NOT_DISPLAY_DESCRIPTION, KeyEvent.KEY_DOWN, false, false, new KeyShortcutEventHandler()
{
@Override
public void onKeyShortcut(KeyShortcutEvent event)
{
@Override
public void onKeyShortcut(KeyShortcutEvent event)
{
getCurrentEditor().autoSizePlusOne();
}
}, KeyEvent.KEY_DOWN, false, false);
getCurrentEditor().autoSizePlusOne();
}
});

if (configHolder.isEnterSavesApproved())
{
Expand Down
14 changes: 8 additions & 6 deletions zanata-war/src/main/java/org/zanata/webtrans/client/keys/KeyShortcut.java
View file
Expand Up @@ -112,12 +112,14 @@ public enum KeyEvent {
* @param description shown to the user in the key shortcut summary pane.
* Use {@link #DO_NOT_DISPLAY_DESCRIPTION} to prevent shortcut being
* displayed in the summary pane.
* @param keyAction determines which type of key event this shortcut will
* respond to.
* @param stopPropagation
* @param preventDefault
* @param keyEvent determines which type of key event will trigger this shortcut.
* @param stopPropagation {@see NativeEvent#stopPropagation()}
* @param preventDefault {@see NativeEvent#preventDefault()}
* @param handler activated for a registered {@link KeyShortcut} when context is active
* and a user inputs the correct key combination
*/
public KeyShortcut(int modifiers, int keyCode, ShortcutContext context, String description, KeyShortcutEventHandler handler, KeyEvent keyEvent, boolean stopPropagation, boolean preventDefault)
public KeyShortcut(int modifiers, int keyCode, ShortcutContext context, String description,
KeyEvent keyEvent, boolean stopPropagation, boolean preventDefault, KeyShortcutEventHandler handler)
{
this.modifiers = modifiers;
this.keyCode = keyCode;
Expand All @@ -136,7 +138,7 @@ public KeyShortcut(int modifiers, int keyCode, ShortcutContext context, String d
*/
public KeyShortcut(int modifiers, int keyCode, ShortcutContext context, String description, KeyShortcutEventHandler handler)
{
this(modifiers, keyCode, context, description, handler, KeyEvent.KEY_DOWN, false, false);
this(modifiers, keyCode, context, description, KeyEvent.KEY_DOWN, false, false, handler);
}

public int getModifiers()
Expand Down
8 changes: 5 additions & 3 deletions zanata-war/src/main/java/org/zanata/webtrans/client/presenter/KeyShortcutPresenter.java
View file
Expand Up @@ -114,7 +114,8 @@ public void onPreviewNativeEvent(NativePreviewEvent event)
}
});

register(new KeyShortcut(KeyShortcut.NO_MODIFIER, KeyCodes.KEY_ESCAPE, ShortcutContext.Application, messages.closeShortcutView(), new KeyShortcutEventHandler()
register(new KeyShortcut(KeyShortcut.NO_MODIFIER, KeyCodes.KEY_ESCAPE, ShortcutContext.Application,
messages.closeShortcutView(), KeyEvent.KEY_UP, true, true, new KeyShortcutEventHandler()
{
@Override
public void onKeyShortcut(KeyShortcutEvent event)
Expand All @@ -124,11 +125,12 @@ public void onKeyShortcut(KeyShortcutEvent event)
display.hide(true);
}
}
}, KeyEvent.KEY_UP, true, true));
}));

// could try to use ?, although this is not as simple as passing character
// '?'
register(new KeyShortcut(KeyShortcut.ALT_KEY, 'Y', ShortcutContext.Application, messages.showAvailableKeyShortcuts(), new KeyShortcutEventHandler()
register(new KeyShortcut(KeyShortcut.ALT_KEY, 'Y', ShortcutContext.Application,
messages.showAvailableKeyShortcuts(), new KeyShortcutEventHandler()
{
@Override
public void onKeyShortcut(KeyShortcutEvent event)
Expand Down
12 changes: 6 additions & 6 deletions zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
View file
Expand Up @@ -280,15 +280,15 @@ public void onKeyShortcut(KeyShortcutEvent event)
};

// Register shortcut ALT+(UP/J) for previous row navigation
keyShortcutPresenter.register(new KeyShortcut(KeyShortcut.ALT_KEY, KeyCodes.KEY_UP, ShortcutContext.Navigation, messages.navigateToNextRow(), gotoPreRowHandler, KeyEvent.KEY_DOWN, true, true));
keyShortcutPresenter.register(new KeyShortcut(KeyShortcut.ALT_KEY, KeyShortcut.KEY_J, ShortcutContext.Navigation, messages.navigateToNextRow(), gotoPreRowHandler, KeyEvent.KEY_DOWN, true, true));
keyShortcutPresenter.register(new KeyShortcut(KeyShortcut.ALT_KEY, KeyCodes.KEY_UP, ShortcutContext.Navigation, messages.navigateToNextRow(), KeyEvent.KEY_DOWN, true, true, gotoPreRowHandler));
keyShortcutPresenter.register(new KeyShortcut(KeyShortcut.ALT_KEY, KeyShortcut.KEY_J, ShortcutContext.Navigation, messages.navigateToNextRow(), KeyEvent.KEY_DOWN, true, true, gotoPreRowHandler));

// Register shortcut ALT+(Down/K) for next row navigation
keyShortcutPresenter.register(new KeyShortcut(KeyShortcut.ALT_KEY, KeyCodes.KEY_DOWN, ShortcutContext.Navigation, messages.navigateToPreviousRow(), gotoNextRowHandler, KeyEvent.KEY_DOWN, true, true));
keyShortcutPresenter.register(new KeyShortcut(KeyShortcut.ALT_KEY, KeyShortcut.KEY_K, ShortcutContext.Navigation, messages.navigateToPreviousRow(), gotoNextRowHandler, KeyEvent.KEY_DOWN, true, true));
keyShortcutPresenter.register(new KeyShortcut(KeyShortcut.ALT_KEY, KeyCodes.KEY_DOWN, ShortcutContext.Navigation, messages.navigateToPreviousRow(), KeyEvent.KEY_DOWN, true, true, gotoNextRowHandler));
keyShortcutPresenter.register(new KeyShortcut(KeyShortcut.ALT_KEY, KeyShortcut.KEY_K, ShortcutContext.Navigation, messages.navigateToPreviousRow(), KeyEvent.KEY_DOWN, true, true, gotoNextRowHandler));

// Register shortcut Enter to open editor in selected row - if no other input field is in focus
keyShortcutPresenter.register(new KeyShortcut(KeyShortcut.NO_MODIFIER, KeyCodes.KEY_ENTER, ShortcutContext.Navigation, messages.openEditorInSelectedRow(), new KeyShortcutEventHandler()
keyShortcutPresenter.register(new KeyShortcut(KeyShortcut.NO_MODIFIER, KeyCodes.KEY_ENTER, ShortcutContext.Navigation, messages.openEditorInSelectedRow(), KeyEvent.KEY_UP, true, true, new KeyShortcutEventHandler()
{
@Override
public void onKeyShortcut(KeyShortcutEvent event)
Expand All @@ -298,7 +298,7 @@ public void onKeyShortcut(KeyShortcutEvent event)
translationEditorPresenter.openEditorOnSelectedRow();
}
}
}, KeyEvent.KEY_UP, true, true));
}));
}

private boolean isOtherInputFieldFocused()
Expand Down

0 comments on commit 7f6a8e2

Please sign in to comment.