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

IDEA-87369 Right-click on a breakpoint: "edit" action is disabled if the cursor is not on the corresponding line

Browse Source
This commit is contained in:
andrey.zaytsev
2012-06-13 23:57:54 +04:00
parent b364bf9b32
commit 14b8e71d2e
5 changed files with 108 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointWithHighlighter.java
+59 -62
View File
@@ -25,6 +25,7 @@ import com.intellij.debugger.engine.events.DebuggerCommandImpl;
import com.intellij.debugger.engine.requests.RequestManagerImpl;
import com.intellij.debugger.impl.DebuggerContextImpl;
import com.intellij.debugger.settings.DebuggerSettings;
import com.intellij.debugger.ui.JavaDebuggerSupport;
import com.intellij.idea.ActionsBundle;
import com.intellij.openapi.actionSystem.ActionGroup;
import com.intellij.openapi.actionSystem.AnAction;
@@ -49,6 +50,7 @@ import com.intellij.psi.PsiManager;
import com.intellij.psi.jsp.JspFile;
import com.intellij.ui.classFilter.ClassFilter;
import com.intellij.util.StringBuilderSpinAllocator;
import com.intellij.xdebugger.impl.DebuggerSupport;
import com.intellij.xdebugger.impl.actions.EditBreakpointAction;
import com.intellij.xdebugger.impl.actions.ViewBreakpointsAction;
import com.intellij.xdebugger.impl.actions.XDebuggerActions;
@@ -594,67 +596,6 @@ public abstract class BreakpointWithHighlighter extends Breakpoint {
}
}
@NotNull
private ActionGroup createMenuActions() {
final BreakpointManager breakpointManager = DebuggerManagerEx.getInstanceEx(myProject).getBreakpointManager();
/**
* Used from Popup Menu
*/
class RemoveAction extends AnAction {
@Nullable private Breakpoint myBreakpoint;
public RemoveAction(Breakpoint breakpoint) {
super(DebuggerBundle.message("action.remove.text"));
myBreakpoint = breakpoint;
}
@Override
public void actionPerformed(AnActionEvent e) {
if (myBreakpoint != null) {
breakpointManager.removeBreakpoint(myBreakpoint);
myBreakpoint = null;
}
}
}
/**
* Used from Popup Menu
*/
class SetEnabledAction extends AnAction {
private final boolean myNewValue;
private final Breakpoint myBreakpoint;
public SetEnabledAction(Breakpoint breakpoint, boolean newValue) {
super(newValue ? DebuggerBundle.message("action.enable.text") : DebuggerBundle.message("action.disable.text"));
myBreakpoint = breakpoint;
myNewValue = newValue;
}
@Override
public void actionPerformed(AnActionEvent e) {
myBreakpoint.ENABLED = myNewValue;
breakpointManager.fireBreakpointChanged(myBreakpoint);
myBreakpoint.updateUI();
}
}
AnAction viewBreakpointsAction =
new ViewBreakpointsAction(ActionsBundle.actionText(XDebuggerActions.VIEW_BREAKPOINTS), this);
DefaultActionGroup group = new DefaultActionGroup();
RangeHighlighter highlighter = getHighlighter();
if (highlighter != null) {
group.add(new EditBreakpointAction());
group.addSeparator();
}
group.add(new SetEnabledAction(this, !ENABLED));
group.add(new RemoveAction(this));
group.addSeparator();
group.add(viewBreakpointsAction);
return group;
}
private class MyGutterIconRenderer extends GutterIconRenderer {
private final Icon myIcon;
private final String myDescription;
@@ -699,7 +640,63 @@ public abstract class BreakpointWithHighlighter extends Breakpoint {
@Override
public ActionGroup getPopupMenuActions() {
return createMenuActions();
final BreakpointManager breakpointManager = DebuggerManagerEx.getInstanceEx(myProject).getBreakpointManager();
/**
* Used from Popup Menu
*/
class RemoveAction extends AnAction {
@Nullable private Breakpoint myBreakpoint;
public RemoveAction(Breakpoint breakpoint) {
super(DebuggerBundle.message("action.remove.text"));
myBreakpoint = breakpoint;
}
@Override
public void actionPerformed(AnActionEvent e) {
if (myBreakpoint != null) {
breakpointManager.removeBreakpoint(myBreakpoint);
myBreakpoint = null;
}
}
}
/**
* Used from Popup Menu
*/
class SetEnabledAction extends AnAction {
private final boolean myNewValue;
private final Breakpoint myBreakpoint;
public SetEnabledAction(Breakpoint breakpoint, boolean newValue) {
super(newValue ? DebuggerBundle.message("action.enable.text") : DebuggerBundle.message("action.disable.text"));
myBreakpoint = breakpoint;
myNewValue = newValue;
}
@Override
public void actionPerformed(AnActionEvent e) {
myBreakpoint.ENABLED = myNewValue;
breakpointManager.fireBreakpointChanged(myBreakpoint);
myBreakpoint.updateUI();
}
}
AnAction viewBreakpointsAction =
new ViewBreakpointsAction(ActionsBundle.actionText(XDebuggerActions.VIEW_BREAKPOINTS), BreakpointWithHighlighter.this);
DefaultActionGroup group = new DefaultActionGroup();
RangeHighlighter highlighter = getHighlighter();
if (highlighter != null) {
group.add(new EditBreakpointAction.ContextAction(this, BreakpointWithHighlighter.this, DebuggerSupport.getDebuggerSupport(JavaDebuggerSupport.class)));
group.addSeparator();
}
group.add(new SetEnabledAction(BreakpointWithHighlighter.this, !ENABLED));
group.add(new RemoveAction(BreakpointWithHighlighter.this));
group.addSeparator();
group.add(viewBreakpointsAction);
return group;
}
@Override