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

Compare with the correct revision (=next revision in table) if only one revision is selected in file history (IDEA-78954)

Browse Source
This commit is contained in:
Bas Leijdekkers
2012-01-19 12:25:22 +01:00
parent 529c012dbb
commit 8676c8b67b
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-api/src/com/intellij/ui/table/TableView.java
+5 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2011 JetBrains s.r.o.
* Copyright 2000-2012 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -173,6 +173,10 @@ public class TableView<Item> extends BaseTableView implements ItemsProvider, Sel
return getListTableModel().getItems();
}
public Item getRow(int row) {
return getItems().get(convertRowIndexToModel(row));
}
public void setMinRowHeight(int i) {
setRowHeight(Math.max(i, getRowHeight()));
}
platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java
+4 -5
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2011 JetBrains s.r.o.
* Copyright 2000-2012 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -855,14 +855,13 @@ public class FileHistoryPanelImpl extends PanelWithActionsAndCloseButton {
showDifferences(myVcs.getProject(), sel.get(0), sel.get(sel.size() - 1));
}
else if (selectionSize == 1) {
final TableView flatView = myDualView.getFlatView();
final TableViewModel model = flatView.getTableViewModel();
final TableView<TreeNodeOnVcsRevision> flatView = myDualView.getFlatView();
final int selectedRow = flatView.getSelectedRow();
if (selectedRow == (model.getRowCount() - 1)) {
if (selectedRow == (flatView.getRowCount() - 1)) {
// no previous
showDifferences(myVcs.getProject(), VcsFileRevision.NULL, getFirstSelectedRevision());
} else {
showDifferences(myVcs.getProject(), (VcsFileRevision)model.getRowValue(selectedRow + 1), getFirstSelectedRevision());
showDifferences(myVcs.getProject(), flatView.getRow(selectedRow + 1), getFirstSelectedRevision());
}
}
}