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

xbreakpoints-ui. npe fixed. Actions in gutter popup-menu rearranged. hide on key outside. show more options when suspend checkbox is off.

Browse Source
This commit is contained in:
andrey zaytsev
2011-06-20 15:14:58 +04:00
parent c15faf83b6
commit db78bf179b
7 changed files with 108 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorGutterComponentImpl.java
+1 -1
View File
@@ -1277,7 +1277,7 @@ class EditorGutterComponentImpl extends EditorGutterComponentEx implements Mouse
public Point getPoint(GutterIconRenderer renderer) {
for (int line : myLineToGutterRenderers.keys()) {
for (GutterIconRenderer gutterIconRenderer : myLineToGutterRenderers.get(line)) {
if (gutterIconRenderer == renderer) {
if (gutterIconRenderer.equals(renderer)) {
int x = getLineMarkerAreaOffset() + 1;
final int y = myEditor.logicalPositionToXY(new LogicalPosition(line, 0)).y;
return new Point(x, y);
platform/platform-resources-en/src/messages/XDebuggerBundle.properties
+2
View File
@@ -9,6 +9,8 @@ xdebugger.remove.line.breakpoint.action.text=Remove
xdebugger.disable.breakpoint.action.text=Disable
xdebugger.enable.breakpoint.action.text=Enable
xdebugger.view.breakpoint.properties.action=Properties
xdebugger.view.breakpoint.reveal.action=Show Breakpoints Dialog
xdebugger.view.breakpoint.edit.action=Edit
xbreakpoint.tooltip.suspend.policy.thread=Suspend: thread
xbreakpoint.tooltip.suspend.policy.none=Suspend: none
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/EditBreakpointAction.java
+4 -2
View File
@@ -53,8 +53,10 @@ public class EditBreakpointAction extends AnAction {
if (editor != null) {
final EditorGutterComponentEx gutterComponent = ((EditorEx)editor).getGutterComponentEx();
Point point = gutterComponent.getPoint(myBreakpointGutterRenderer);
final Icon icon = myBreakpointGutterRenderer.getIcon();
DebuggerUIUtil.showBreakpointEditorBalloon(project, new Point(point.x + icon.getIconWidth()/2 + gutterComponent.getIconsAreaWidth(), point.y + icon.getIconHeight()/2), gutterComponent, false, myBreakpoint);
if (point != null) {
final Icon icon = myBreakpointGutterRenderer.getIcon();
DebuggerUIUtil.showBreakpointEditorBalloon(project, new Point(point.x + icon.getIconWidth()/2 + gutterComponent.getIconsAreaWidth(), point.y + icon.getIconHeight()/2), gutterComponent, false, myBreakpoint);
}
}
}
}
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XBreakpointBase.java
+7 -1
View File
@@ -39,6 +39,7 @@ import com.intellij.xdebugger.breakpoints.XBreakpointType;
import com.intellij.xdebugger.impl.XDebugSessionImpl;
import com.intellij.xdebugger.impl.XDebuggerUtilImpl;
import com.intellij.xdebugger.impl.actions.EditBreakpointAction;
import com.intellij.xdebugger.impl.actions.ViewBreakpointsAction;
import com.intellij.xdebugger.ui.DebuggerIcons;
import org.jdom.Element;
import org.jetbrains.annotations.NonNls;
@@ -360,6 +361,11 @@ public class XBreakpointBase<Self extends XBreakpoint<P>, P extends XBreakpointP
public ActionGroup getPopupMenuActions() {
DefaultActionGroup group = new DefaultActionGroup();
final XDebuggerManager debuggerManager = XDebuggerManager.getInstance(getProject());
group.add(new EditBreakpointAction(XDebuggerBundle.message("xdebugger.view.breakpoint.edit.action"), XBreakpointBase.this, this));
group.add(new Separator());
if (!debuggerManager.getBreakpointManager().isDefaultBreakpoint(XBreakpointBase.this)) {
group.add(new RemoveBreakpointGutterIconAction(XBreakpointBase.this));
}
@@ -369,7 +375,7 @@ public class XBreakpointBase<Self extends XBreakpoint<P>, P extends XBreakpointP
}
group.add(new Separator());
group.add(new EditBreakpointAction(XDebuggerBundle.message("xdebugger.view.breakpoint.properties.action"), XBreakpointBase.this, this));
group.add(new ViewBreakpointsAction(XDebuggerBundle.message("xdebugger.view.breakpoint.reveal.action"), XBreakpointBase.this));
return group;
}
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/XLightBreakpointPropertiesPanel.java
+17 -7
View File
@@ -40,9 +40,10 @@ import java.util.List;
* Time: 15:46
* To change this template use File | Settings | File Templates.
*/
public class XLightBreakpointPropertiesPanel<B extends XBreakpoint<?>> {
public class XLightBreakpointPropertiesPanel<B extends XBreakpoint<?>> implements XSuspendPolicyPanel.Delegate {
private LinkLabel myShowMoreOptionsLink;
private boolean myShowMoreOptions;
private void createUIComponents() {
myShowMoreOptionsLink = new LinkLabel("More Options", null, new LinkListener() {
@@ -55,6 +56,15 @@ public class XLightBreakpointPropertiesPanel<B extends XBreakpoint<?>> {
});
}
@Override
public void showMoreOptionsIfNeeded() {
if (myShowMoreOptions) {
if (myDelegate != null) {
myDelegate.showMoreOptions();
}
}
}
public interface Delegate {
void showMoreOptions();
}
@@ -90,6 +100,8 @@ public class XLightBreakpointPropertiesPanel<B extends XBreakpoint<?>> {
XBreakpointType<B, ?> breakpointType = XBreakpointUtil.getType(breakpoint);
mySuspendPolicyPanel.init(project, breakpointManager, breakpoint);
mySuspendPolicyPanel.setDelegate(this);
mySubPanels.add(mySuspendPolicyPanel);
myMasterBreakpointPanel.init(project, breakpointManager, breakpoint);
mySubPanels.add(myMasterBreakpointPanel);
@@ -106,14 +118,14 @@ public class XLightBreakpointPropertiesPanel<B extends XBreakpoint<?>> {
myConditionPanel.setVisible(false);
}
boolean showMoreOptions = false;
myShowMoreOptions = false;
for (XBreakpointPropertiesSubPanel<B> panel : mySubPanels) {
if (panel.lightVariant(showAllOptions)) {
showMoreOptions = true;
myShowMoreOptions = true;
}
}
myShowMoreOptionsLink.setVisible(showMoreOptions);
myShowMoreOptionsLink.setVisible(myShowMoreOptions);
myCustomPanels = new ArrayList<XBreakpointCustomPropertiesPanel<B>>();
XBreakpointCustomPropertiesPanel<B> customPropertiesPanel = breakpointType.createCustomPropertiesPanel();
@@ -121,8 +133,6 @@ public class XLightBreakpointPropertiesPanel<B extends XBreakpoint<?>> {
myCustomPropertiesPanelWrapper.add(customPropertiesPanel.getComponent(), BorderLayout.CENTER);
myCustomPanels.add(customPropertiesPanel);
}
loadProperties();
}
public void saveProperties() {
@@ -145,7 +155,7 @@ public class XLightBreakpointPropertiesPanel<B extends XBreakpoint<?>> {
}
}
private void loadProperties() {
public void loadProperties() {
for (XBreakpointPropertiesSubPanel<B> panel : mySubPanels) {
panel.loadProperties();
}
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/XSuspendPolicyPanel.java
+32 -1
View File
@@ -24,6 +24,8 @@ import org.jetbrains.annotations.NotNull;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.HashMap;
import java.util.Map;
@@ -44,6 +46,12 @@ public class XSuspendPolicyPanel<B extends XBreakpoint<?>> extends XBreakpointPr
private JPanel myContentPane;
private Map<SuspendPolicy, JRadioButton> mySuspendRadioButtons;
public interface Delegate {
void showMoreOptionsIfNeeded();
}
private Delegate myDelegate;
public void init(Project project, final XBreakpointManager breakpointManager, @NotNull B breakpoint) {
super.init(project, breakpointManager, breakpoint);
mySuspendRadioButtons = new HashMap<SuspendPolicy, JRadioButton>();
@@ -52,6 +60,15 @@ public class XSuspendPolicyPanel<B extends XBreakpoint<?>> extends XBreakpointPr
mySuspendRadioButtons.put(SuspendPolicy.NONE, mySuspendNoneRadioButton);
@NonNls String card = myBreakpointType.isSuspendThreadSupported() ? "radioButtons" : "checkbox";
((CardLayout)mySuspendPolicyPanel.getLayout()).show(mySuspendPolicyPanel, card);
mySuspendCheckBox.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent actionEvent) {
if (myDelegate != null && !mySuspendCheckBox.isSelected()) {
myDelegate.showMoreOptionsIfNeeded();
}
}
});
}
@Override
@@ -64,7 +81,13 @@ public class XSuspendPolicyPanel<B extends XBreakpoint<?>> extends XBreakpointPr
void loadProperties() {
SuspendPolicy suspendPolicy = myBreakpoint.getSuspendPolicy();
mySuspendRadioButtons.get(suspendPolicy).setSelected(true);
mySuspendCheckBox.setSelected(suspendPolicy != SuspendPolicy.NONE);
final boolean selected = suspendPolicy != SuspendPolicy.NONE;
mySuspendCheckBox.setSelected(selected);
if (!selected) {
if (myDelegate != null) {
myDelegate.showMoreOptionsIfNeeded();
}
}
}
private SuspendPolicy getConfiguredSuspendPolicy() {
@@ -85,4 +108,12 @@ public class XSuspendPolicyPanel<B extends XBreakpoint<?>> extends XBreakpointPr
void saveProperties() {
myBreakpoint.setSuspendPolicy(getConfiguredSuspendPolicy());
}
public Delegate getDelegate() {
return myDelegate;
}
public void setDelegate(Delegate delegate) {
myDelegate = delegate;
}
}
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/DebuggerUIUtil.java
+45 -9
View File
@@ -23,11 +23,14 @@ import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.popup.*;
import com.intellij.openapi.util.Computable;
import com.intellij.openapi.util.DimensionService;
import com.intellij.openapi.wm.IdeFocusManager;
import com.intellij.openapi.wm.WindowManager;
import com.intellij.ui.ScrollPaneFactory;
import com.intellij.ui.awt.RelativePoint;
import com.intellij.xdebugger.XDebuggerManager;
import com.intellij.xdebugger.breakpoints.XBreakpoint;
import com.intellij.xdebugger.breakpoints.XBreakpointListener;
import com.intellij.xdebugger.breakpoints.XBreakpointManager;
import com.intellij.xdebugger.frame.XFullValueEvaluator;
import com.intellij.xdebugger.impl.breakpoints.ui.XLightBreakpointPropertiesPanel;
import org.jetbrains.annotations.NonNls;
@@ -136,22 +139,45 @@ public class DebuggerUIUtil {
}
public static void showBreakpointEditorBalloon(final Project project,
@Nullable final Point point, final JComponent gutterComponent,
@Nullable final Point point, final JComponent component,
final boolean showAllOptions,
final XBreakpoint breakpoint) {
final XBreakpointManager breakpointManager = XDebuggerManager.getInstance(project).getBreakpointManager();
final XLightBreakpointPropertiesPanel propertiesPanel =
new XLightBreakpointPropertiesPanel(project, XDebuggerManager.getInstance(project).getBreakpointManager(),
new XLightBreakpointPropertiesPanel(project, breakpointManager,
breakpoint, showAllOptions);
final Balloon balloon = JBPopupFactory.getInstance().createBalloonBuilder(propertiesPanel.getMainPanel()).
final JComponent mainPanel = propertiesPanel.getMainPanel();
final Balloon balloon = JBPopupFactory.getInstance().createBalloonBuilder(mainPanel).
setHideOnAction(false).
setHideOnClickOutside(false).
setHideOnClickOutside(true).
setHideOnKeyOutside(false).
setCloseButtonEnabled(true).
setDialogMode(true).
setFillColor(propertiesPanel.getMainPanel().getBackground()).
setFillColor(mainPanel.getBackground()).
setTitle(breakpoint.getType().getDisplayText(breakpoint)).
setHideOnFrameResize(false).createBalloon();
setHideOnFrameResize(false).
setAnimationCycle(200).createBalloon();
final XBreakpointListener<XBreakpoint<?>> breakpointListener = new XBreakpointListener<XBreakpoint<?>>() {
@Override
public void breakpointAdded(@NotNull XBreakpoint<?> breakpoint1) {
}
@Override
public void breakpointRemoved(@NotNull XBreakpoint<?> breakpoint1) {
if (breakpoint1.equals(breakpoint)) {
balloon.hide();
}
}
@Override
public void breakpointChanged(@NotNull XBreakpoint<?> breakpoint1) {
if (breakpoint1.equals(breakpoint)) {
balloon.hide();
}
}
};
breakpointManager.addBreakpointListener(breakpointListener);
balloon.addListener(new JBPopupListener() {
@Override
public void beforeShown(LightweightWindowEvent event) {
@@ -160,21 +186,31 @@ public class DebuggerUIUtil {
@Override
public void onClosed(LightweightWindowEvent event) {
propertiesPanel.saveProperties();
breakpointManager.removeBreakpointListener(breakpointListener);
}
});
propertiesPanel.setDelegate(new XLightBreakpointPropertiesPanel.Delegate() {
@Override
public void showMoreOptions() {
balloon.hide();
showBreakpointEditorBalloon(project, point, gutterComponent, true, breakpoint);
showBreakpointEditorBalloon(project, point, component, true, breakpoint);
}
});
propertiesPanel.loadProperties();
if (point == null) {
balloon.showInCenterOf(gutterComponent);
balloon.showInCenterOf(component);
} else {
balloon.show(new RelativePoint(gutterComponent, point), Balloon.Position.atRight);
balloon.show(new RelativePoint(component, point), Balloon.Position.atRight);
}
ApplicationManager.getApplication().invokeLater(new Runnable() {
@Override
public void run() {
IdeFocusManager.findInstance().requestFocus(mainPanel, true);
}
});
}
private static class FullValueEvaluationCallbackImpl implements XFullValueEvaluator.XFullValueEvaluationCallback {