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

EA-80753 - assert: AnAction.setShortcutSet - extra fixes

Browse Source
This commit is contained in:
Egor.Ushakov
2016-03-18 19:41:11 +03:00
parent 1e29c0e6ee
commit b45268ae10
3 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/debugger/impl/src/com/intellij/debugger/actions/DebuggerAction.java
+8 -9
View File
@@ -30,12 +30,16 @@ import com.intellij.debugger.ui.impl.watch.DebuggerTree;
import com.intellij.debugger.ui.impl.watch.DebuggerTreeNodeImpl;
import com.intellij.ide.DataManager;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.actionSystem.*;
import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.CommonDataKeys;
import com.intellij.openapi.actionSystem.DataContext;
import com.intellij.openapi.project.Project;
import com.intellij.ui.DoubleClickListener;
import com.intellij.xdebugger.XDebugProcess;
import com.intellij.xdebugger.XDebugSession;
import com.intellij.xdebugger.impl.frame.XDebugView;
import com.intellij.xdebugger.impl.ui.DebuggerUIUtil;
import com.intellij.xdebugger.impl.ui.tree.XDebuggerTree;
import com.intellij.xdebugger.impl.ui.tree.nodes.XValueNodeImpl;
import org.jetbrains.annotations.NotNull;
@@ -133,15 +137,10 @@ public abstract class DebuggerAction extends AnAction {
};
listener.installOn(tree);
final AnAction action = ActionManager.getInstance().getAction(actionName);
action.registerCustomShortcutSet(CommonShortcuts.getEditSource(), tree);
Disposable disposable = () -> listener.uninstall(tree);
DebuggerUIUtil.registerActionOnComponent(actionName, tree, disposable);
return new Disposable() {
public void dispose() {
listener.uninstall(tree);
action.unregisterCustomShortcutSet(tree);
}
};
return disposable;
}
public static boolean isFirstStart(final AnActionEvent event) {
java/debugger/impl/src/com/intellij/debugger/ui/impl/DebuggerTreePanel.java
+6 -8
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2015 JetBrains s.r.o.
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -24,19 +24,19 @@ import com.intellij.debugger.impl.DebuggerSession;
import com.intellij.debugger.impl.DebuggerStateManager;
import com.intellij.debugger.ui.impl.watch.DebuggerTree;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.actionSystem.*;
import com.intellij.openapi.keymap.KeymapManager;
import com.intellij.openapi.actionSystem.ActionPopupMenu;
import com.intellij.openapi.actionSystem.DataKey;
import com.intellij.openapi.actionSystem.DataProvider;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Disposer;
import com.intellij.openapi.wm.ex.IdeFocusTraversalPolicy;
import com.intellij.ui.PopupHandler;
import com.intellij.util.SingleAlarm;
import com.intellij.xdebugger.impl.actions.XDebuggerActions;
import com.intellij.xdebugger.impl.ui.DebuggerUIUtil;
import com.sun.jdi.VMDisconnectedException;
import javax.swing.*;
import java.awt.*;
import java.awt.event.KeyEvent;
public abstract class DebuggerTreePanel extends UpdatableDebuggerView implements DataProvider, Disposable {
public static final DataKey<DebuggerTreePanel> DATA_KEY = DataKey.create("DebuggerPanel");
@@ -87,9 +87,7 @@ public abstract class DebuggerTreePanel extends UpdatableDebuggerView implements
}
});
final Shortcut[] shortcuts = KeymapManager.getInstance().getActiveKeymap().getShortcuts("ToggleBookmark");
final CustomShortcutSet shortcutSet = shortcuts.length > 0? new CustomShortcutSet(shortcuts) : new CustomShortcutSet(KeyStroke.getKeyStroke(KeyEvent.VK_F11, 0));
overrideShortcut(myTree, XDebuggerActions.MARK_OBJECT, shortcutSet);
DebuggerUIUtil.registerActionOnComponent(XDebuggerActions.MARK_OBJECT, myTree, this);
}
protected abstract DebuggerTree createTreeView();
resources/src/idea/JavaActions.xml
+1 -1
View File
@@ -183,7 +183,7 @@
<action id="Debugger.CustomizeThreadsView" class="com.intellij.debugger.actions.CustomizeThreadsViewAction">
<add-to-group group-id="XDebugger.Frames.Tree.Popup" anchor="last"/>
</action>
<action id="Debugger.EditFrameSource" class="com.intellij.debugger.actions.EditFrameSourceAction"/>
<action id="Debugger.EditFrameSource" class="com.intellij.debugger.actions.EditFrameSourceAction" use-shortcut-of="EditSource"/>
<action id="Debugger.EditNodeSource" class="com.intellij.debugger.actions.EditSourceAction"/>
<action id="Debugger.EditTypeSource" class="com.intellij.debugger.actions.JumpToObjectAction"/>
<reference ref="Debugger.PopFrame"/>