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

usability: improved selection restoring (IDEA-31228)

Browse Source
This commit is contained in:
Eugene Zhuravlev
2010-02-02 16:22:53 +03:00
parent 6c0d22308a
commit 13b362074f
1 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointPanel.java
View File

@@ -27,6 +27,7 @@ import com.intellij.psi.PsiField;
import com.intellij.ui.IdeBorderFactory;
import com.intellij.ui.ScrollPaneFactory;
import com.intellij.ui.TableUtil;
import com.intellij.util.ui.tree.TreeUtil;
import com.intellij.xdebugger.impl.breakpoints.ui.AbstractBreakpointPanel;
import gnu.trove.TIntArrayList;
import org.jetbrains.annotations.NonNls;
@@ -34,6 +35,7 @@ import org.jetbrains.annotations.NonNls;
import javax.swing.*;
import javax.swing.event.*;
import javax.swing.tree.TreeModel;
import javax.swing.tree.TreePath;
import javax.swing.tree.TreeSelectionModel;
import java.awt.*;
import java.util.ArrayList;
@@ -378,27 +380,41 @@ public class BreakpointPanel extends AbstractBreakpointPanel<Breakpoint> {
public void removeSelectedBreakpoints() {
final Breakpoint[] selectedBreakpoints = getSelectedBreakpoints();
Breakpoint breakpointToSelect = null;
if (selectedBreakpoints.length > 0) {
if (isTreeShowing()) {
breakpointToSelect = myTree.getPreviousSibling(selectedBreakpoints[0]);
}
else {
final int index = myTable.getModel().getBreakpointIndex(selectedBreakpoints[0]) - 1;
if (index >= 0 && index < (myTable.getRowCount() - selectedBreakpoints.length)) {
breakpointToSelect = myTable.getModel().getBreakpoint(index);
}
}
if (selectedBreakpoints.length == 0) {
return;
}
final boolean inTreeMode = isTreeShowing();
final int minSelectionIndex;
if (inTreeMode) {
minSelectionIndex = Math.max(0, myTree.getSelectionModel().getMinSelectionRow());
}
else {
minSelectionIndex = Math.max(0, myTable.getSelectionModel().getMinSelectionIndex());
}
myTree.removeBreakpoints(selectedBreakpoints);
myTable.getModel().removeBreakpoints(selectedBreakpoints);
myCurrentViewableBreakpoint = null;
if (breakpointToSelect != null) {
selectBreakpoint(breakpointToSelect);
if (inTreeMode) {
if (myTree.getRowCount() > 0) {
int rowToSelect = minSelectionIndex >= myTree.getRowCount()? myTree.getRowCount() - 1 : minSelectionIndex;
final TreePath path = myTree.getPathForRow(rowToSelect);
if (path != null) {
TreeUtil.selectPath(myTree, path, true);
}
}
}
else {
updateCurrentBreakpointPropertiesPanel();
if (myTable.getRowCount() > 0) { // if in table mode and there are items to select
int indexToSelect = minSelectionIndex >= myTable.getRowCount()? myTable.getRowCount() - 1 : minSelectionIndex;
TableUtil.selectRows(myTable, new int[] {indexToSelect});
}
}
updateCurrentBreakpointPropertiesPanel();
}
public void insertBreakpointAt(Breakpoint breakpoint, int index) {