MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Use "KeymapUtil.getActiveKeymapShortcuts()" utility method

Browse Source
This commit is contained in:
Konstantin Kolosovsky
2017-04-25 16:19:57 +03:00
parent b9096dc991
commit 0de3d06cf4
26 changed files with 88 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/SurroundElementWithAction.java
+3 -4
View File
@@ -16,8 +16,6 @@
package com.intellij.openapi.roots.ui.configuration.artifacts.actions;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.CustomShortcutSet;
import com.intellij.openapi.keymap.KeymapManager;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.ui.configuration.artifacts.ArtifactEditorEx;
import com.intellij.openapi.roots.ui.configuration.artifacts.LayoutTreeComponent;
@@ -38,14 +36,15 @@ import org.jetbrains.annotations.NotNull;
import javax.swing.*;
import java.util.List;
import static com.intellij.openapi.keymap.KeymapUtil.getActiveKeymapShortcuts;
/**
* @author nik
*/
public class SurroundElementWithAction extends LayoutTreeActionBase {
public SurroundElementWithAction(ArtifactEditorEx artifactEditor) {
super("Surround With...", artifactEditor);
final CustomShortcutSet shortcutSet = new CustomShortcutSet(KeymapManager.getInstance().getActiveKeymap().getShortcuts("SurroundWith"));
registerCustomShortcutSet(shortcutSet, artifactEditor.getLayoutTreeComponent().getLayoutTree());
registerCustomShortcutSet(getActiveKeymapShortcuts("SurroundWith"), artifactEditor.getLayoutTreeComponent().getLayoutTree());
}
@Override
java/java-impl/src/com/intellij/codeInsight/generation/JavaOverrideImplementMemberChooser.java
+3 -4
View File
@@ -21,7 +21,6 @@ import com.intellij.ide.util.MemberChooser;
import com.intellij.ide.util.PropertiesComponent;
import com.intellij.openapi.actionSystem.*;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.keymap.KeymapManager;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.DialogWrapper;
import com.intellij.openapi.util.NotNullLazyValue;
@@ -29,7 +28,6 @@ import com.intellij.pom.java.LanguageLevel;
import com.intellij.psi.PsiElement;
import com.intellij.psi.infos.CandidateInfo;
import com.intellij.psi.util.PsiUtil;
import com.intellij.util.Function;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
@@ -42,6 +40,8 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.LinkedHashSet;
import static com.intellij.openapi.keymap.KeymapUtil.getActiveKeymapShortcuts;
/**
* @author Dmitry Batkovich
*/
@@ -221,8 +221,7 @@ public class JavaOverrideImplementMemberChooser extends MemberChooser<PsiMethodM
private MyMergeAction() {
super("Show methods to implement", "Show methods to implement", AllIcons.General.Show_to_implement);
registerCustomShortcutSet(new CustomShortcutSet(KeyStroke.getKeyStroke(KeyEvent.VK_I, InputEvent.ALT_MASK)), myTree);
final Shortcut[] shortcuts = KeymapManager.getInstance().getActiveKeymap().getShortcuts("OverrideMethods");
registerCustomShortcutSet(new CustomShortcutSet(shortcuts), myTree);
registerCustomShortcutSet(getActiveKeymapShortcuts("OverrideMethods"), myTree);
}
@Override
platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionHintComponent.java
+3 -2
View File
@@ -37,7 +37,6 @@ import com.intellij.openapi.editor.actions.EditorActionUtil;
import com.intellij.openapi.editor.colors.EditorColors;
import com.intellij.openapi.editor.colors.EditorColorsManager;
import com.intellij.openapi.editor.ex.util.EditorUtil;
import com.intellij.openapi.keymap.KeymapManager;
import com.intellij.openapi.keymap.KeymapUtil;
import com.intellij.openapi.options.ShowSettingsUtil;
import com.intellij.openapi.project.Project;
@@ -76,6 +75,8 @@ import java.awt.event.MouseListener;
import java.util.Collections;
import java.util.List;
import static com.intellij.openapi.keymap.KeymapUtil.getActiveKeymapShortcuts;
/**
* @author max
* @author Mike
@@ -439,7 +440,7 @@ public class IntentionHintComponent implements Disposable, ScrollAwareHint {
}
myPopup = JBPopupFactory.getInstance().createListPopup(step);
if (myPopup instanceof WizardPopup) {
Shortcut[] shortcuts = KeymapManager.getInstance().getActiveKeymap().getShortcuts(IdeActions.ACTION_SHOW_INTENTION_ACTIONS);
Shortcut[] shortcuts = getActiveKeymapShortcuts(IdeActions.ACTION_SHOW_INTENTION_ACTIONS).getShortcuts();
for (Shortcut shortcut : shortcuts) {
if (shortcut instanceof KeyboardShortcut) {
KeyboardShortcut keyboardShortcut = (KeyboardShortcut)shortcut;
platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java
+3 -1
View File
@@ -92,6 +92,8 @@ import java.util.*;
import java.util.List;
import java.util.concurrent.*;
import static com.intellij.openapi.keymap.KeymapUtil.getActiveKeymapShortcuts;
public class ConsoleViewImpl extends JPanel implements ConsoleView, ObservableConsoleView, DataProvider, OccurenceNavigator {
@NonNls private static final String CONSOLE_VIEW_POPUP_MENU = "ConsoleView.PopupMenu";
private static final Logger LOG = Logger.getInstance("#com.intellij.execution.impl.ConsoleViewImpl");
@@ -880,7 +882,7 @@ public class ConsoleViewImpl extends JPanel implements ConsoleView, ObservableCo
}
private void registerConsoleEditorActions() {
Shortcut[] shortcuts = KeymapManager.getInstance().getActiveKeymap().getShortcuts(IdeActions.ACTION_GOTO_DECLARATION);
Shortcut[] shortcuts = getActiveKeymapShortcuts(IdeActions.ACTION_GOTO_DECLARATION).getShortcuts();
CustomShortcutSet shortcutSet = new CustomShortcutSet(ArrayUtil.mergeArrays(shortcuts, CommonShortcuts.ENTER.getShortcuts()));
new HyperlinkNavigationAction().registerCustomShortcutSet(shortcutSet, myEditor.getContentComponent());
platform/lang-impl/src/com/intellij/find/impl/FindPopupPanel.java
+3 -2
View File
@@ -31,7 +31,6 @@ import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ModalityState;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.help.HelpManager;
import com.intellij.openapi.keymap.KeymapManager;
import com.intellij.openapi.keymap.KeymapUtil;
import com.intellij.openapi.progress.ProgressIndicator;
import com.intellij.openapi.progress.util.ProgressIndicatorBase;
@@ -95,6 +94,8 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
import static com.intellij.openapi.keymap.KeymapUtil.getActiveKeymapShortcuts;
public class FindPopupPanel extends JBPanel implements FindUI, DataProvider {
private static final Logger LOG = Logger.getInstance(FindPopupPanel.class);
@@ -1124,7 +1125,7 @@ public class FindPopupPanel extends JBPanel implements FindUI, DataProvider {
@NotNull JComponent component,
@NotNull Runnable postProcessor) {
AnAction action = ActionManager.getInstance().getAction(actionId);
Shortcut[] shortcuts = KeymapManager.getInstance().getActiveKeymap().getShortcuts(actionId);
Shortcut[] shortcuts = getActiveKeymapShortcuts(actionId).getShortcuts();
if (action == null || shortcuts.length == 0) return false;
AnAction wrapper = new AnAction() {
@Override
platform/lang-impl/src/com/intellij/ide/actions/GotoActionAction.java
+3 -1
View File
@@ -61,6 +61,8 @@ import java.awt.*;
import java.awt.event.*;
import java.util.Set;
import static com.intellij.openapi.keymap.KeymapUtil.getActiveKeymapShortcuts;
public class GotoActionAction extends GotoActionBase implements DumbAware {
@Override
@@ -235,7 +237,7 @@ public class GotoActionAction extends GotoActionBase implements DumbAware {
}
});
CustomShortcutSet shortcutSet = new CustomShortcutSet(KeymapManager.getInstance().getActiveKeymap().getShortcuts(IdeActions.ACTION_SHOW_INTENTION_ACTIONS));
ShortcutSet shortcutSet = getActiveKeymapShortcuts(IdeActions.ACTION_SHOW_INTENTION_ACTIONS);
new DumbAwareAction() {
@Override
platform/lang-impl/src/com/intellij/ide/actions/SearchEverywhereAction.java
+2 -2
View File
@@ -69,7 +69,6 @@ import com.intellij.openapi.fileEditor.FileEditor;
import com.intellij.openapi.fileEditor.FileEditorManager;
import com.intellij.openapi.fileEditor.OpenFileDescriptor;
import com.intellij.openapi.fileEditor.impl.EditorHistoryManager;
import com.intellij.openapi.keymap.KeymapManager;
import com.intellij.openapi.keymap.KeymapUtil;
import com.intellij.openapi.keymap.MacKeymapUtil;
import com.intellij.openapi.keymap.impl.ModifierKeyDoubleClickHandler;
@@ -132,6 +131,7 @@ import java.util.List;
import java.util.Vector;
import java.util.concurrent.atomic.AtomicBoolean;
import static com.intellij.openapi.keymap.KeymapUtil.getActiveKeymapShortcuts;
import static com.intellij.openapi.wm.IdeFocusManager.getGlobalInstance;
/**
@@ -349,7 +349,7 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
private static String getShortcut() {
String shortcutText;
final Shortcut[] shortcuts = KeymapManager.getInstance().getActiveKeymap().getShortcuts(IdeActions.ACTION_SEARCH_EVERYWHERE);
final Shortcut[] shortcuts = getActiveKeymapShortcuts(IdeActions.ACTION_SEARCH_EVERYWHERE).getShortcuts();
if (shortcuts.length == 0) {
shortcutText = "Double " + (SystemInfo.isMac ? MacKeymapUtil.SHIFT : "Shift");
} else {
platform/lang-impl/src/com/intellij/ide/util/FileStructurePopup.java
+3 -2
View File
@@ -48,7 +48,6 @@ import com.intellij.openapi.fileEditor.FileEditor;
import com.intellij.openapi.fileEditor.TextEditor;
import com.intellij.openapi.fileEditor.ex.IdeDocumentHistory;
import com.intellij.openapi.ide.CopyPasteManager;
import com.intellij.openapi.keymap.KeymapManager;
import com.intellij.openapi.keymap.KeymapUtil;
import com.intellij.openapi.project.DumbAwareAction;
import com.intellij.openapi.project.Project;
@@ -95,6 +94,8 @@ import java.awt.event.*;
import java.util.*;
import java.util.List;
import static com.intellij.openapi.keymap.KeymapUtil.getActiveKeymapShortcuts;
/**
* @author Konstantin Bulenkov
*/
@@ -870,7 +871,7 @@ public class FileStructurePopup implements Disposable, TreeActionsOwner {
static Shortcut[] extractShortcutFor(@NotNull TreeAction action) {
if (action instanceof ActionShortcutProvider) {
String actionId = ((ActionShortcutProvider)action).getActionIdForShortcut();
return KeymapManager.getInstance().getActiveKeymap().getShortcuts(actionId);
return getActiveKeymapShortcuts(actionId).getShortcuts();
}
return action instanceof FileStructureFilter ?
((FileStructureFilter)action).getShortcut() : ((FileStructureNodeProvider)action).getShortcut();
platform/lang-impl/src/com/intellij/ide/util/MemberChooser.java
+4 -7
View File
@@ -23,7 +23,6 @@ import com.intellij.openapi.actionSystem.*;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.TransactionGuard;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.keymap.KeymapManager;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.DialogWrapper;
import com.intellij.openapi.ui.VerticalFlowLayout;
@@ -56,6 +55,8 @@ import java.awt.event.*;
import java.util.*;
import java.util.List;
import static com.intellij.openapi.keymap.KeymapUtil.getActiveKeymapShortcuts;
public class MemberChooser<T extends ClassMember> extends DialogWrapper implements TypeSafeDataProvider {
private static final Logger LOG = Logger.getInstance("#com.intellij.ide.util.MemberChooser");
protected Tree myTree;
@@ -348,15 +349,11 @@ public class MemberChooser<T extends ClassMember> extends DialogWrapper implemen
group.addSeparator();
ExpandAllAction expandAllAction = new ExpandAllAction();
expandAllAction.registerCustomShortcutSet(
new CustomShortcutSet(KeymapManager.getInstance().getActiveKeymap().getShortcuts(IdeActions.ACTION_EXPAND_ALL)),
myTree);
expandAllAction.registerCustomShortcutSet(getActiveKeymapShortcuts(IdeActions.ACTION_EXPAND_ALL), myTree);
group.add(expandAllAction);
CollapseAllAction collapseAllAction = new CollapseAllAction();
collapseAllAction.registerCustomShortcutSet(
new CustomShortcutSet(KeymapManager.getInstance().getActiveKeymap().getShortcuts(IdeActions.ACTION_COLLAPSE_ALL)),
myTree);
collapseAllAction.registerCustomShortcutSet(getActiveKeymapShortcuts(IdeActions.ACTION_COLLAPSE_ALL), myTree);
group.add(collapseAllAction);
panel.add(ActionManager.getInstance().createActionToolbar(ActionPlaces.UNKNOWN, group, true).getComponent(),
platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java
+4 -3
View File
@@ -38,7 +38,6 @@ import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.ex.util.EditorUtil;
import com.intellij.openapi.fileTypes.UnknownFileType;
import com.intellij.openapi.fileTypes.ex.FileTypeManagerEx;
import com.intellij.openapi.keymap.KeymapManager;
import com.intellij.openapi.keymap.KeymapUtil;
import com.intellij.openapi.progress.ProcessCanceledException;
import com.intellij.openapi.progress.ProgressIndicator;
@@ -101,6 +100,8 @@ import java.awt.event.*;
import java.util.*;
import java.util.List;
import static com.intellij.openapi.keymap.KeymapUtil.getActiveKeymapShortcuts;
public abstract class ChooseByNameBase {
public static final String TEMPORARILY_FOCUSABLE_COMPONENT_KEY = "ChooseByNameBase.TemporarilyFocusableComponent";
@@ -706,7 +707,7 @@ public abstract class ChooseByNameBase {
@NotNull
private static Set<KeyStroke> getShortcuts(@NotNull String actionId) {
Set<KeyStroke> result = new HashSet<>();
for (Shortcut shortcut : KeymapManager.getInstance().getActiveKeymap().getShortcuts(actionId)) {
for (Shortcut shortcut : getActiveKeymapShortcuts(actionId).getShortcuts()) {
if (shortcut instanceof KeyboardShortcut) {
KeyboardShortcut keyboardShortcut = (KeyboardShortcut)shortcut;
result.add(keyboardShortcut.getFirstKeyStroke());
@@ -1197,7 +1198,7 @@ public abstract class ChooseByNameBase {
@Nullable
private KeyStroke getShortcut(String actionCodeCompletion) {
final Shortcut[] shortcuts = KeymapManager.getInstance().getActiveKeymap().getShortcuts(actionCodeCompletion);
final Shortcut[] shortcuts = getActiveKeymapShortcuts(actionCodeCompletion).getShortcuts();
for (final Shortcut shortcut : shortcuts) {
if (shortcut instanceof KeyboardShortcut) {
return ((KeyboardShortcut)shortcut).getFirstKeyStroke();
platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoActionModel.java
+2 -2
View File
@@ -28,7 +28,6 @@ import com.intellij.openapi.actionSystem.ex.ActionUtil;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ModalityState;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.keymap.KeymapManager;
import com.intellij.openapi.keymap.KeymapUtil;
import com.intellij.openapi.options.Configurable;
import com.intellij.openapi.options.SearchableConfigurable;
@@ -63,6 +62,7 @@ import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import static com.intellij.openapi.keymap.KeymapUtil.getActiveKeymapShortcuts;
import static com.intellij.ui.SimpleTextAttributes.STYLE_PLAIN;
import static com.intellij.ui.SimpleTextAttributes.STYLE_SEARCH_MATCH;
@@ -596,7 +596,7 @@ public class GotoActionModel implements ChooseByNameModel, Comparator<Object>, D
appendWithColoredMatches(nameComponent, getName(presentation.getText(), groupName, toggle), pattern, fg, isSelected);
panel.setToolTipText(presentation.getDescription());
Shortcut[] shortcuts = KeymapManager.getInstance().getActiveKeymap().getShortcuts(ActionManager.getInstance().getId(anAction));
Shortcut[] shortcuts = getActiveKeymapShortcuts(ActionManager.getInstance().getId(anAction)).getShortcuts();
String shortcutText = KeymapUtil.getPreferredShortcutText(
shortcuts);
if (StringUtil.isNotEmpty(shortcutText)) {
platform/lang-impl/src/com/intellij/ui/debugger/extensions/ActionTracer.java
+3 -2
View File
@@ -19,7 +19,6 @@ import com.intellij.icons.AllIcons;
import com.intellij.openapi.actionSystem.*;
import com.intellij.openapi.actionSystem.ex.AnActionListener;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.keymap.KeymapManager;
import com.intellij.ui.components.JBScrollPane;
import com.intellij.ui.debugger.UiDebuggerExtension;
@@ -28,6 +27,8 @@ import javax.swing.text.BadLocationException;
import javax.swing.text.Document;
import java.awt.*;
import static com.intellij.openapi.keymap.KeymapUtil.getActiveKeymapShortcuts;
/**
* Created by IntelliJ IDEA.
* User: kirillk
@@ -82,7 +83,7 @@ public class ActionTracer implements UiDebuggerExtension, AnActionListener {
out.append("id=").append(id);
if (id != null) {
out.append("; shortcuts:");
final Shortcut[] shortcuts = KeymapManager.getInstance().getActiveKeymap().getShortcuts(id);
final Shortcut[] shortcuts = getActiveKeymapShortcuts(id).getShortcuts();
for (int i = 0; i < shortcuts.length; i++) {
Shortcut shortcut = shortcuts[i];
out.append(shortcut);
platform/platform-impl/src/com/intellij/codeInsight/hint/LineTooltipRenderer.java
+3 -5
View File
@@ -19,10 +19,8 @@ import com.intellij.ide.BrowserUtil;
import com.intellij.ide.IdeTooltipManager;
import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.CustomShortcutSet;
import com.intellij.openapi.actionSystem.IdeActions;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.keymap.KeymapManager;
import com.intellij.openapi.util.Ref;
import com.intellij.ui.HintHint;
import com.intellij.ui.LightweightHint;
@@ -44,6 +42,8 @@ import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.net.URL;
import static com.intellij.openapi.keymap.KeymapUtil.getActiveKeymapShortcuts;
/**
* @author cdr
*/
@@ -122,9 +122,7 @@ public class LineTooltipRenderer extends ComparableObject.Impl implements Toolti
actionRef.set(new AnAction() {
// an action to expand description when tooltip was shown after mouse move; need to unregister from editor component
{
registerCustomShortcutSet(
new CustomShortcutSet(KeymapManager.getInstance().getActiveKeymap().getShortcuts(IdeActions.ACTION_SHOW_ERROR_DESCRIPTION)),
contentComponent);
registerCustomShortcutSet(getActiveKeymapShortcuts(IdeActions.ACTION_SHOW_ERROR_DESCRIPTION), contentComponent);
}
@Override
platform/platform-impl/src/com/intellij/ide/actions/Switcher.java
+2 -2
View File
@@ -32,7 +32,6 @@ import com.intellij.openapi.fileEditor.impl.EditorHistoryManager;
import com.intellij.openapi.fileEditor.impl.EditorTabbedContainer;
import com.intellij.openapi.fileEditor.impl.EditorWindow;
import com.intellij.openapi.fileEditor.impl.FileEditorManagerImpl;
import com.intellij.openapi.keymap.KeymapManager;
import com.intellij.openapi.keymap.KeymapUtil;
import com.intellij.openapi.project.DumbAware;
import com.intellij.openapi.project.DumbAwareAction;
@@ -79,6 +78,7 @@ import java.io.File;
import java.util.*;
import java.util.List;
import static com.intellij.openapi.keymap.KeymapUtil.getActiveKeymapShortcuts;
import static java.awt.event.InputEvent.CTRL_DOWN_MASK;
import static java.awt.event.KeyEvent.*;
import static javax.swing.KeyStroke.getKeyStroke;
@@ -105,7 +105,7 @@ public class Switcher extends AnAction implements DumbAware {
@NotNull private static final CustomShortcutSet TW_SHORTCUT;
static {
Shortcut recentFiles = ArrayUtil.getFirstElement(KeymapManager.getInstance().getActiveKeymap().getShortcuts("RecentFiles"));
Shortcut recentFiles = ArrayUtil.getFirstElement(getActiveKeymapShortcuts("RecentFiles").getShortcuts());
List<Shortcut> shortcuts = ContainerUtil.newArrayList();
for (char ch = '0'; ch <= '9'; ch++) {
shortcuts.add(CustomShortcutSet.fromString("control " + ch).getShortcuts()[0]);
platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionMenuItem.java
+3 -2
View File
@@ -24,7 +24,6 @@ import com.intellij.openapi.actionSystem.ex.ActionUtil;
import com.intellij.openapi.actionSystem.impl.actionholder.ActionRef;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.TransactionGuard;
import com.intellij.openapi.keymap.KeymapManager;
import com.intellij.openapi.keymap.KeymapUtil;
import com.intellij.openapi.util.ActionCallback;
import com.intellij.openapi.util.Disposer;
@@ -55,6 +54,8 @@ import java.beans.PropertyChangeListener;
import java.util.HashSet;
import java.util.Set;
import static com.intellij.openapi.keymap.KeymapUtil.getActiveKeymapShortcuts;
public class ActionMenuItem extends JBCheckBoxMenuItem {
private static final Icon ourCheckedIcon = JBUI.scale(new SizedIcon(PlatformIcons.CHECK_ICON, 18, 18));
private static final Icon ourUncheckedIcon = EmptyIcon.ICON_18;
@@ -157,7 +158,7 @@ public class ActionMenuItem extends JBCheckBoxMenuItem {
updateIcon(action);
String id = ActionManager.getInstance().getId(action);
if (id != null) {
setAcceleratorFromShortcuts(KeymapManager.getInstance().getActiveKeymap().getShortcuts(id));
setAcceleratorFromShortcuts(getActiveKeymapShortcuts(id).getShortcuts());
}
else {
final ShortcutSet shortcutSet = action.getShortcutSet();
platform/platform-impl/src/com/intellij/openapi/diff/impl/external/FrameDiffTool.java
Vendored
+5 -8
View File
@@ -18,12 +18,10 @@ package com.intellij.openapi.diff.impl.external;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.CustomShortcutSet;
import com.intellij.openapi.diff.*;
import com.intellij.openapi.diff.impl.ComparisonPolicy;
import com.intellij.openapi.diff.impl.DiffPanelImpl;
import com.intellij.openapi.diff.impl.DiffUtil;
import com.intellij.openapi.keymap.KeymapManager;
import com.intellij.openapi.ui.DialogBuilder;
import com.intellij.openapi.ui.FrameWrapper;
import com.intellij.openapi.ui.Messages;
@@ -39,6 +37,8 @@ import java.io.IOException;
import java.util.Arrays;
import java.util.Collection;
import static com.intellij.openapi.keymap.KeymapUtil.getActiveKeymapShortcuts;
public class FrameDiffTool implements DiffTool {
public void show(DiffRequest request) {
Collection hints = request.getHints();
@@ -68,8 +68,7 @@ public class FrameDiffTool implements DiffTool {
public void actionPerformed(final AnActionEvent e) {
builder.getDialogWrapper().close(0);
}
}.registerCustomShortcutSet(new CustomShortcutSet(KeymapManager.getInstance().getActiveKeymap().getShortcuts("CloseContent")),
diffPanel.getComponent());
}.registerCustomShortcutSet(getActiveKeymapShortcuts("CloseContent"), diffPanel.getComponent());
showDiffDialog(builder, hints);
}
else {
@@ -86,8 +85,7 @@ public class FrameDiffTool implements DiffTool {
public void actionPerformed(final AnActionEvent e) {
frameWrapper.getFrame().dispose();
}
}.registerCustomShortcutSet(new CustomShortcutSet(KeymapManager.getInstance().getActiveKeymap().getShortcuts("CloseContent")),
diffPanel.getComponent());
}.registerCustomShortcutSet(getActiveKeymapShortcuts("CloseContent"), diffPanel.getComponent());
frameWrapper.show();
}
@@ -115,8 +113,7 @@ public class FrameDiffTool implements DiffTool {
public void actionPerformed(final AnActionEvent e) {
frameWrapper.getFrame().dispose();
}
}.registerCustomShortcutSet(new CustomShortcutSet(KeymapManager.getInstance().getActiveKeymap().getShortcuts("CloseContent")),
diffPanel.getComponent());
}.registerCustomShortcutSet(getActiveKeymapShortcuts("CloseContent"), diffPanel.getComponent());
frameWrapper.show();
}*/
platform/platform-impl/src/com/intellij/openapi/diff/impl/external/MultiLevelDiffTool.java
Vendored
+7 -7
View File
@@ -18,13 +18,11 @@ package com.intellij.openapi.diff.impl.external;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.CustomShortcutSet;
import com.intellij.openapi.actionSystem.PlatformDataKeys;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.diff.*;
import com.intellij.openapi.diff.impl.CompositeDiffPanel;
import com.intellij.openapi.diff.impl.DiffUtil;
import com.intellij.openapi.keymap.KeymapManager;
import com.intellij.openapi.ui.DialogBuilder;
import com.intellij.openapi.ui.FrameWrapper;
import com.intellij.openapi.util.Comparing;
@@ -35,8 +33,12 @@ import com.intellij.util.config.AbstractProperty;
import org.jetbrains.annotations.NotNull;
import java.awt.*;
import java.util.*;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.TreeMap;
import static com.intellij.openapi.keymap.KeymapUtil.getActiveKeymapShortcuts;
/**
* Created with IntelliJ IDEA.
@@ -82,8 +84,7 @@ public class MultiLevelDiffTool implements DiffTool, DiscloseMultiRequest {
public void actionPerformed(final AnActionEvent e) {
builder.getDialogWrapper().close(0);
}
}.registerCustomShortcutSet(new CustomShortcutSet(KeymapManager.getInstance().getActiveKeymap().getShortcuts("CloseContent")),
diffPanel.getComponent());
}.registerCustomShortcutSet(getActiveKeymapShortcuts("CloseContent"), diffPanel.getComponent());
diffPanel.setDiffRequest(request);
FrameDiffTool.showDiffDialog(builder, hints);
} else {
@@ -101,8 +102,7 @@ public class MultiLevelDiffTool implements DiffTool, DiscloseMultiRequest {
public void actionPerformed(final AnActionEvent e) {
Disposer.dispose(frameWrapper);
}
}.registerCustomShortcutSet(new CustomShortcutSet(KeymapManager.getInstance().getActiveKeymap().getShortcuts("CloseContent")),
diffPanel.getComponent());
}.registerCustomShortcutSet(getActiveKeymapShortcuts("CloseContent"), diffPanel.getComponent());
frameWrapper.show();
}
platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorEmptyTextPainter.java
+3 -2
View File
@@ -19,7 +19,6 @@ import com.intellij.ide.actions.ActivateToolWindowAction;
import com.intellij.ide.ui.UISettings;
import com.intellij.openapi.actionSystem.IdeActions;
import com.intellij.openapi.actionSystem.Shortcut;
import com.intellij.openapi.keymap.KeymapManager;
import com.intellij.openapi.keymap.KeymapUtil;
import com.intellij.openapi.keymap.MacKeymapUtil;
import com.intellij.openapi.project.Project;
@@ -40,6 +39,8 @@ import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.awt.*;
import static com.intellij.openapi.keymap.KeymapUtil.getActiveKeymapShortcuts;
public class EditorEmptyTextPainter {
public void paintEmptyText(@NotNull final JComponent splitters, @NotNull Graphics g) {
UISettings.setupAntialiasing(g);
@@ -73,7 +74,7 @@ public class EditorEmptyTextPainter {
}
protected void appendSearchEverywhere(@NotNull UIUtil.TextPainter painter) {
Shortcut[] shortcuts = KeymapManager.getInstance().getActiveKeymap().getShortcuts(IdeActions.ACTION_SEARCH_EVERYWHERE);
Shortcut[] shortcuts = getActiveKeymapShortcuts(IdeActions.ACTION_SEARCH_EVERYWHERE).getShortcuts();
appendAction(painter, "Search Everywhere", shortcuts.length == 0 ?
"Double " + (SystemInfo.isMac ? MacKeymapUtil.SHIFT : "Shift") :
KeymapUtil.getShortcutsText(shortcuts));
platform/platform-impl/src/com/intellij/openapi/keymap/impl/ModifierKeyDoubleClickHandler.java
+3 -2
View File
@@ -24,7 +24,6 @@ import com.intellij.openapi.actionSystem.ex.AnActionListener;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.components.ApplicationComponent;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.keymap.KeymapManager;
import com.intellij.openapi.util.Clock;
import com.intellij.openapi.util.Couple;
import com.intellij.openapi.util.Disposer;
@@ -42,6 +41,8 @@ import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong;
import static com.intellij.openapi.keymap.KeymapUtil.getActiveKeymapShortcuts;
/**
* Support for keyboard shortcuts like Control-double-click or Control-double-click+A
*
@@ -267,7 +268,7 @@ public class ModifierKeyDoubleClickHandler implements Disposable, ApplicationCom
}
private boolean shouldSkipIfActionHasShortcut() {
return mySkipIfActionHasShortcut && KeymapManager.getInstance().getActiveKeymap().getShortcuts(myActionId).length > 0;
return mySkipIfActionHasShortcut && getActiveKeymapShortcuts(myActionId).getShortcuts().length > 0;
}
@Override
platform/platform-impl/src/com/intellij/openapi/ui/playback/commands/ActionCommand.java
+4 -3
View File
@@ -19,7 +19,6 @@ import com.intellij.openapi.actionSystem.*;
import com.intellij.openapi.actionSystem.ex.AnActionListener;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ModalityState;
import com.intellij.openapi.keymap.KeymapManager;
import com.intellij.openapi.ui.playback.PlaybackContext;
import com.intellij.openapi.util.ActionCallback;
import com.intellij.openapi.util.Ref;
@@ -31,6 +30,8 @@ import java.awt.event.InputEvent;
import java.awt.event.KeyEvent;
import java.awt.event.MouseEvent;
import static com.intellij.openapi.keymap.KeymapUtil.getActiveKeymapShortcuts;
public class ActionCommand extends TypeCommand {
public static final String PREFIX = CMD_PREFIX + "action";
@@ -50,7 +51,7 @@ public class ActionCommand extends TypeCommand {
if (!context.isUseDirectActionCall()) {
final Shortcut[] sc = KeymapManager.getInstance().getActiveKeymap().getShortcuts(actionName);
final Shortcut[] sc = getActiveKeymapShortcuts(actionName).getShortcuts();
KeyStroke stroke = null;
for (Shortcut each : sc) {
if (each instanceof KeyboardShortcut) {
@@ -116,7 +117,7 @@ public class ActionCommand extends TypeCommand {
}
public static InputEvent getInputEvent(String actionName) {
final Shortcut[] shortcuts = KeymapManager.getInstance().getActiveKeymap().getShortcuts(actionName);
final Shortcut[] shortcuts = getActiveKeymapShortcuts(actionName).getShortcuts();
KeyStroke keyStroke = null;
for (Shortcut each : shortcuts) {
if (each instanceof KeyboardShortcut) {
platform/platform-impl/src/com/intellij/terminal/JBTerminalSystemSettingsProviderBase.java
+3 -2
View File
@@ -26,7 +26,6 @@ import com.intellij.openapi.editor.colors.*;
import com.intellij.openapi.editor.colors.impl.FontPreferencesImpl;
import com.intellij.openapi.editor.ex.EditorSettingsExternalizable;
import com.intellij.openapi.editor.markup.TextAttributes;
import com.intellij.openapi.keymap.KeymapManager;
import com.intellij.openapi.options.FontSize;
import com.intellij.openapi.util.registry.Registry;
import com.intellij.util.containers.HashMap;
@@ -45,6 +44,8 @@ import java.awt.*;
import java.util.*;
import java.util.List;
import static com.intellij.openapi.keymap.KeymapUtil.getActiveKeymapShortcuts;
/**
* @author traff
*/
@@ -109,7 +110,7 @@ public class JBTerminalSystemSettingsProviderBase extends DefaultTabbedSettingsP
private KeyStroke[] getKeyStrokesByActionId(String actionId) {
java.util.List<KeyStroke> keyStrokes = new ArrayList<>();
Shortcut[] shortcuts = KeymapManager.getInstance().getActiveKeymap().getShortcuts(actionId);
Shortcut[] shortcuts = getActiveKeymapShortcuts(actionId).getShortcuts();
for (Shortcut sc : shortcuts) {
if (sc instanceof KeyboardShortcut) {
KeyStroke ks = ((KeyboardShortcut)sc).getFirstKeyStroke();
platform/platform-impl/src/com/intellij/ui/stripe/Updater.java
+6 -8
View File
@@ -17,9 +17,7 @@ package com.intellij.ui.stripe;
import com.intellij.codeInsight.daemon.DaemonCodeAnalyzerSettings;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.actionSystem.CustomShortcutSet;
import com.intellij.openapi.actionSystem.ShortcutSet;
import com.intellij.openapi.keymap.KeymapManager;
import com.intellij.openapi.util.registry.Registry;
import com.intellij.ui.components.JBScrollBar;
import com.intellij.util.ui.JBUI;
@@ -29,13 +27,13 @@ import com.intellij.util.ui.update.MergingUpdateQueue;
import com.intellij.util.ui.update.Update;
import org.jetbrains.annotations.NotNull;
import javax.swing.JScrollBar;
import javax.swing.JScrollPane;
import java.awt.Cursor;
import java.awt.Graphics2D;
import javax.swing.*;
import java.awt.*;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import static com.intellij.openapi.keymap.KeymapUtil.getActiveKeymapShortcuts;
/**
* @author Sergey.Malenkov
*/
@@ -119,7 +117,7 @@ public abstract class Updater<Painter extends ErrorStripePainter> implements Dis
}
protected ShortcutSet getNextErrorShortcut() {
return new CustomShortcutSet(KeymapManager.getInstance().getActiveKeymap().getShortcuts("GotoNextError"));
return getActiveKeymapShortcuts("GotoNextError");
}
public void selectNext(int index) {
@@ -127,7 +125,7 @@ public abstract class Updater<Painter extends ErrorStripePainter> implements Dis
}
protected ShortcutSet getPreviousErrorShortcut() {
return new CustomShortcutSet(KeymapManager.getInstance().getActiveKeymap().getShortcuts("GotoPreviousError"));
return getActiveKeymapShortcuts("GotoPreviousError");
}
public void selectPrevious(int index) {
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesTreeBrowser.java
+4 -7
View File
@@ -67,8 +67,9 @@ import java.awt.*;
import java.util.*;
import java.util.List;
import static com.intellij.openapi.vcs.changes.ChangesUtil.getNavigatableArray;
import static com.intellij.openapi.keymap.KeymapUtil.getActiveKeymapShortcuts;
import static com.intellij.openapi.vcs.changes.ChangesUtil.getAllFiles;
import static com.intellij.openapi.vcs.changes.ChangesUtil.getNavigatableArray;
import static com.intellij.util.WaitForProgressToShow.runOrInvokeLaterAboveProgress;
/**
@@ -407,12 +408,8 @@ public class CommittedChangesTreeBrowser extends JPanel implements TypeSafeDataP
toolbarGroup.add(new SelectGroupingAction(project, this));
final ExpandAllAction expandAllAction = new ExpandAllAction(myChangesTree);
final CollapseAllAction collapseAllAction = new CollapseAllAction(myChangesTree);
expandAllAction.registerCustomShortcutSet(
new CustomShortcutSet(KeymapManager.getInstance().getActiveKeymap().getShortcuts(IdeActions.ACTION_EXPAND_ALL)),
myChangesTree);
collapseAllAction.registerCustomShortcutSet(
new CustomShortcutSet(KeymapManager.getInstance().getActiveKeymap().getShortcuts(IdeActions.ACTION_COLLAPSE_ALL)),
myChangesTree);
expandAllAction.registerCustomShortcutSet(getActiveKeymapShortcuts(IdeActions.ACTION_EXPAND_ALL), myChangesTree);
collapseAllAction.registerCustomShortcutSet(getActiveKeymapShortcuts(IdeActions.ACTION_COLLAPSE_ALL), myChangesTree);
toolbarGroup.add(expandAllAction);
toolbarGroup.add(collapseAllAction);
toolbarGroup.add(ActionManager.getInstance().getAction(VcsActions.ACTION_COPY_REVISION_NUMBER));
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesTreeList.java
+4 -7
View File
@@ -23,7 +23,6 @@ import com.intellij.ide.util.treeView.TreeState;
import com.intellij.openapi.actionSystem.*;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.diff.DiffBundle;
import com.intellij.openapi.keymap.KeymapManager;
import com.intellij.openapi.project.DumbAware;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.EmptyRunnable;
@@ -63,6 +62,8 @@ import java.awt.event.*;
import java.util.*;
import java.util.List;
import static com.intellij.openapi.keymap.KeymapUtil.getActiveKeymapShortcuts;
/**
* @author max
*/
@@ -516,12 +517,8 @@ public abstract class ChangesTreeList<T> extends Tree implements TypeSafeDataPro
directoriesAction.registerCustomShortcutSet(
new CustomShortcutSet(KeyStroke.getKeyStroke(KeyEvent.VK_P, SystemInfo.isMac ? InputEvent.META_DOWN_MASK : InputEvent.CTRL_DOWN_MASK)),
this);
expandAllAction.registerCustomShortcutSet(
new CustomShortcutSet(KeymapManager.getInstance().getActiveKeymap().getShortcuts(IdeActions.ACTION_EXPAND_ALL)),
this);
collapseAllAction.registerCustomShortcutSet(
new CustomShortcutSet(KeymapManager.getInstance().getActiveKeymap().getShortcuts(IdeActions.ACTION_COLLAPSE_ALL)),
this);
expandAllAction.registerCustomShortcutSet(getActiveKeymapShortcuts(IdeActions.ACTION_EXPAND_ALL), this);
collapseAllAction.registerCustomShortcutSet(getActiveKeymapShortcuts(IdeActions.ACTION_COLLAPSE_ALL), this);
return actions;
}
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/PropertiesComponent.java
+2 -3
View File
@@ -17,7 +17,6 @@ package org.jetbrains.idea.svn.dialogs;
import com.intellij.icons.AllIcons;
import com.intellij.openapi.actionSystem.*;
import com.intellij.openapi.keymap.KeymapManager;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.MessageType;
import com.intellij.openapi.util.text.StringUtil;
@@ -53,6 +52,7 @@ import java.io.File;
import java.util.Map;
import java.util.TreeMap;
import static com.intellij.openapi.keymap.KeymapUtil.getActiveKeymapShortcuts;
import static com.intellij.openapi.vfs.VfsUtilCore.virtualToIoFile;
/**
@@ -112,8 +112,7 @@ public class PropertiesComponent extends JPanel {
myPopupActionGroup = createPopup();
PopupHandler.installPopupHandler(myTable, myPopupActionGroup, ActionPlaces.UNKNOWN, ActionManager.getInstance());
PopupHandler.installPopupHandler(scrollPane, myPopupActionGroup, ActionPlaces.UNKNOWN, ActionManager.getInstance());
final Shortcut[] shortcuts = KeymapManager.getInstance().getActiveKeymap().getShortcuts(IdeActions.ACTION_CLOSE_ACTIVE_TAB);
myCloseAction.registerCustomShortcutSet(new CustomShortcutSet(shortcuts), this);
myCloseAction.registerCustomShortcutSet(getActiveKeymapShortcuts(IdeActions.ACTION_CLOSE_ACTIVE_TAB), this);
myRefreshAction.registerCustomShortcutSet(CommonShortcuts.getRerun(), this);
}
python/src/com/jetbrains/python/structureView/PyInheritedMembersFilter.java
+3 -2
View File
@@ -22,9 +22,10 @@ import com.intellij.ide.util.treeView.smartTree.ActionPresentation;
import com.intellij.ide.util.treeView.smartTree.ActionPresentationData;
import com.intellij.ide.util.treeView.smartTree.TreeElement;
import com.intellij.openapi.actionSystem.Shortcut;
import com.intellij.openapi.keymap.KeymapManager;
import org.jetbrains.annotations.NotNull;
import static com.intellij.openapi.keymap.KeymapUtil.getActiveKeymapShortcuts;
/**
* @author vlan
*/
@@ -73,6 +74,6 @@ public class PyInheritedMembersFilter implements FileStructureFilter {
@NotNull
@Override
public Shortcut[] getShortcut() {
return KeymapManager.getInstance().getActiveKeymap().getShortcuts("FileStructurePopup");
return getActiveKeymapShortcuts("FileStructurePopup").getShortcuts();
}
}