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

+multiple selection and operations performing

Browse Source
This commit is contained in:
Konstantin Bulenkov
2012-02-02 16:59:40 +01:00
parent d64fc3c19e
commit 861bb94831
5 changed files with 61 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffElement.java
+5 -5
View File
@@ -49,20 +49,20 @@ public class DirDiffElement {
myTargetLength = target == null || target.isContainer() ? -1 : target.getSize();
myName = name;
if (type == DType.ERROR) {
myDefaultOperation = DirDiffOperation.NONE;
myDefaultOperation = NONE;
}
else if (isSource()) {
myDefaultOperation = COPY_TO;
}
else if (isTarget()) {
myDefaultOperation = DirDiffOperation.COPY_FROM;
myDefaultOperation = COPY_FROM;
}
else if (type == DType.EQUAL) {
myDefaultOperation = DirDiffOperation.EQUAL;
myDefaultOperation = EQUAL;
}
else if (type == DType.CHANGED) {
assert source != null;
myDefaultOperation = DirDiffOperation.MERGE;
myDefaultOperation = MERGE;
}
}
@@ -180,7 +180,7 @@ public class DirDiffElement {
} else if (myType == DType.TARGET) {
myOperation = op == COPY_FROM ? DELETE : op == DELETE ? NONE : COPY_FROM;
} else if (myType == DType.CHANGED) {
myOperation = op == MERGE ? COPY_FROM : op == COPY_FROM ? COPY_TO : op == COPY_TO ? NONE : MERGE;
myOperation = op == MERGE ? COPY_FROM : op == COPY_FROM ? COPY_TO : MERGE;
}
}
platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffOperation.java
+2
View File
@@ -47,6 +47,8 @@ public enum DirDiffOperation {
return FileStatus.COLOR_ADDED;
case MERGE:
return FileStatus.COLOR_MODIFIED;
case DELETE:
return FileStatus.DELETED.getColor();
case EQUAL:
case NONE:
}
platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffPanel.form
+24 -17
View File
@@ -36,23 +36,6 @@
<properties/>
<border type="none"/>
<children>
<scrollpane id="90582" class="com.intellij.ui.components.JBScrollPane">
<constraints>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<border type="none"/>
<children>
<component id="1fb9d" class="com.intellij.ui.table.JBTable" binding="myTable">
<constraints/>
<properties>
<intercellSpacing width="0" height="0"/>
<showHorizontalLines value="false"/>
<showVerticalLines value="false"/>
</properties>
</component>
</children>
</scrollpane>
<grid id="bc3dc" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
@@ -144,6 +127,30 @@
</grid>
</children>
</grid>
<grid id="33" binding="myFilesPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<border type="none"/>
<children>
<scrollpane id="90582" class="com.intellij.ui.components.JBScrollPane">
<constraints border-constraint="Center"/>
<properties/>
<border type="none"/>
<children>
<component id="1fb9d" class="com.intellij.ui.table.JBTable" binding="myTable">
<constraints/>
<properties>
<intercellSpacing width="0" height="0"/>
<showHorizontalLines value="false"/>
<showVerticalLines value="false"/>
</properties>
</component>
</children>
</scrollpane>
</children>
</grid>
</children>
</grid>
</children>
platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffPanel.java
+29 -18
View File
@@ -68,6 +68,7 @@ public class DirDiffPanel implements Disposable {
private JPanel myRootPanel;
private JPanel myFilterPanel;
private JBLabel myFilterLabel;
private JPanel myFilesPanel;
private FilterComponent myFilter;
private final DirDiffTableModel myModel;
public JLabel myErrorLabel;
@@ -95,7 +96,7 @@ public class DirDiffPanel implements Disposable {
final DirDiffTableCellRenderer renderer = new DirDiffTableCellRenderer(myTable);
myTable.setDefaultRenderer(Object.class, renderer);
myTable.getSelectionModel().setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
myTable.getSelectionModel().setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
final Project project = myModel.getProject();
myTable.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
@Override
@@ -106,10 +107,12 @@ public class DirDiffPanel implements Disposable {
final DirDiffElement first = myModel.getElementAt(firstIndex);
if (last == null || first == null) return;
if (last.isSeparator()) {
myTable.getSelectionModel().setLeadSelectionIndex(lastIndex + ((lastIndex < firstIndex) ? 1 : -1));
final int ind = lastIndex + ((lastIndex < firstIndex) ? 1 : -1);
myTable.getSelectionModel().addSelectionInterval(ind, ind);
}
else if (first.isSeparator()) {
myTable.getSelectionModel().setLeadSelectionIndex(firstIndex + ((firstIndex < lastIndex) ? 1 : -1));
final int ind = firstIndex + ((firstIndex < lastIndex) ? 1 : -1);
myTable.getSelectionModel().addSelectionInterval(ind, ind);
}
else {
update(false);
@@ -121,7 +124,7 @@ public class DirDiffPanel implements Disposable {
new AnAction("Change diff operation") {
@Override
public void actionPerformed(AnActionEvent e) {
changeOperationForSelectedRow();
changeOperationForSelection();
}
}.registerCustomShortcutSet(CustomShortcutSet.fromString("SPACE"), myTable);
myTable.addMouseListener(new MouseAdapter() {
@@ -132,7 +135,7 @@ public class DirDiffPanel implements Disposable {
final int col = myTable.columnAtPoint(e.getPoint());
if (row != -1 && col == ((myTable.getColumnCount() - 1) / 2)) {
changeOperationForSelectedRow();
changeOperationForSelection();
}
}
}
@@ -142,9 +145,11 @@ public class DirDiffPanel implements Disposable {
@Override
public void keyPressed(KeyEvent e) {
final int keyCode = e.getKeyCode();
final int rows = myTable.getRowCount();
int row = myTable.getSelectedRow();
if (keyCode == KeyEvent.VK_DOWN && row != rows - 1) {
final int rowCount = myTable.getRowCount();
int row = myTable.getSelectionModel().getLeadSelectionIndex();
final int[] rows = myTable.getSelectedRows();
if (rows.length == 0) return;
if (keyCode == KeyEvent.VK_DOWN && row < rowCount - 1) {
row++;
final DirDiffElement element = myModel.getElementAt(row);
if (element == null) return;
@@ -152,7 +157,7 @@ public class DirDiffPanel implements Disposable {
row++;
}
}
else if (keyCode == KeyEvent.VK_UP && row != 0) {
else if (keyCode == KeyEvent.VK_UP && row > 0) {
row--;
final DirDiffElement element = myModel.getElementAt(row);
if (element == null) return;
@@ -167,7 +172,7 @@ public class DirDiffPanel implements Disposable {
if (element == null) return;
if (!element.isSeparator()) {
e.consume();
myTable.changeSelection(row, (myModel.getColumnCount() - 1) / 2, false, false);
myTable.changeSelection(row, (myModel.getColumnCount() - 1) / 2, false, e.isShiftDown());
}
}
});
@@ -190,9 +195,14 @@ public class DirDiffPanel implements Disposable {
final ActionToolbar toolbar = ActionManager.getInstance().createActionToolbar("DirDiff", actions, true);
registerCustomShortcuts(actions, myTable);
myToolBarPanel.add(toolbar.getComponent(), BorderLayout.CENTER);
final JBLabel label = new JBLabel("Use Space button or mouse click to change operation for the selected elements. Enter to perform.", SwingConstants.CENTER);
label.setForeground(UIUtil.getInactiveTextColor());
UIUtil.applyStyle(UIUtil.ComponentStyle.MINI, label);
myFilesPanel.add(label, BorderLayout.SOUTH);
final JBLoadingPanel loadingPanel = new JBLoadingPanel(new BorderLayout(), wnd.getDisposable());
loadingPanel.addListener(new JBLoadingPanelListener.Adapter() {
boolean showHelp = true;
@Override
public void onLoadingFinish() {
if (showHelp && myModel.isOperationsEnabled() && myModel.getRowCount() > 0) {
@@ -200,7 +210,7 @@ public class DirDiffPanel implements Disposable {
if (count < 3) {
JBPopupFactory.getInstance().createBalloonBuilder(new JLabel(" Use Space button to change operation"))
.setFadeoutTime(5000)
.setContentInsets(new Insets(15,15,15,15))
.setContentInsets(new Insets(15, 15, 15, 15))
.createBalloon().show(new RelativePoint(myTable, new Point(myTable.getWidth() / 2, 0)), Balloon.Position.above);
PropertiesComponent.getInstance().setValue("dir.diff.space.button.info", String.valueOf(count + 1));
}
@@ -308,13 +318,14 @@ public class DirDiffPanel implements Disposable {
}
}
private void changeOperationForSelectedRow() {
final int row = myTable.getSelectedRow();
if (row != -1) {
final DirDiffElement element = myModel.getElementAt(row);
if (element != null) {
element.setNextOperation();
myModel.fireTableRowsUpdated(row, row);
private void changeOperationForSelection() {
for (int row : myTable.getSelectedRows()) {
if (row != -1) {
final DirDiffElement element = myModel.getElementAt(row);
if (element != null) {
element.setNextOperation();
myModel.fireTableRowsUpdated(row, row);
}
}
}
}
platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffTableModel.java
+1
View File
@@ -109,6 +109,7 @@ public class DirDiffTableModel extends AbstractTableModel implements DirDiffMode
case EQUAL:
if (!mySettings.showEqual) i.remove();
break;
case ERROR:
}
}