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

IDEA-119804 second click on item in watches panel should toggle edit mode - avoid NPE

Browse Source
This commit is contained in:
Egor.Ushakov
2014-03-27 14:53:24 +04:00
parent 0ded360349
commit 979822c576
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/debugger/impl/src/com/intellij/debugger/ui/impl/MainWatchPanel.java
+7 -4
View File
@@ -80,10 +80,13 @@ public class MainWatchPanel extends WatchPanel implements DataProvider {
((event.getModifiers() & (InputEvent.SHIFT_MASK | InputEvent.ALT_MASK | InputEvent.CTRL_MASK | InputEvent.META_MASK)) !=0) ) {
return false;
}
boolean sameRow = false;
Rectangle bounds = watchTree.getRowBounds(watchTree.getLeadSelectionRow());
bounds.width = watchTree.getWidth();
if (!bounds.contains(event.getPoint())) {
return false;
if (bounds != null) {
bounds.width = watchTree.getWidth();
if (bounds.contains(event.getPoint())) {
sameRow = true;
}
}
final AnAction editWatchAction = ActionManager.getInstance().getAction(DebuggerActions.EDIT_WATCH);
Presentation presentation = editWatchAction.getTemplatePresentation().clone();
@@ -94,7 +97,7 @@ public class MainWatchPanel extends WatchPanel implements DataProvider {
editWatchAction.actionPerformed(actionEvent);
}
};
if (editAlarm.isEmpty() && quitePeriod.isEmpty()) {
if (sameRow && editAlarm.isEmpty() && quitePeriod.isEmpty()) {
editAlarm.addRequest(runnable, UIUtil.getMultiClickInterval());
} else {
editAlarm.cancelAllRequests();