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

[vcs-log] restore selection after log refresh and reset myMoreRequested flag on model change IDEA-125279

Browse Source
This commit is contained in:
Julia Beliaeva
2015-01-14 19:48:51 +03:00
parent 9afae07f45
commit bdacb837a0
2 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/VcsLogUiImpl.java
+8 -14
View File
@@ -76,20 +76,21 @@ public class VcsLogUiImpl implements VcsLogUi, Disposable {
public void setVisiblePack(@NotNull VisiblePack pack) {
ApplicationManager.getApplication().assertIsDispatchThread();
PermanentGraph<Integer> previousPermGraph = myVisiblePack.getPermanentGraph();
TIntHashSet previouslySelected = getSelectedCommits();
PermanentGraph<Integer> previousPermGraph = myVisiblePack.getPermanentGraph();
myVisiblePack = pack;
boolean permGraphChanged = previousPermGraph != myVisiblePack.getPermanentGraph();
GraphTableModel currentModel = getModel();
if (currentModel == null) {
GraphTableModel newModel = new GraphTableModel(myVisiblePack, myLogDataHolder, this);
setModel(newModel, myVisiblePack.getVisibleGraph(), previouslySelected);
VcsLogGraphTable table = getTable();
table.setModel(new GraphTableModel(myVisiblePack, myLogDataHolder, this));
table.setPaintBusy(false);
}
else {
currentModel.setVisiblePack(myVisiblePack);
restoreSelection(currentModel, myVisiblePack.getVisibleGraph(), previouslySelected, getTable());
}
myMainFrame.updateDataPack(myVisiblePack);
setLongEdgeVisibility(myUiProperties.areLongEdgesVisible());
@@ -102,15 +103,6 @@ public class VcsLogUiImpl implements VcsLogUi, Disposable {
return myMainFrame;
}
private void setModel(@NotNull GraphTableModel newModel,
@NotNull VisibleGraph<Integer> newVisibleGraph,
@NotNull TIntHashSet previouslySelectedCommits) {
final VcsLogGraphTable table = getTable();
table.setModel(newModel);
restoreSelection(newModel, newVisibleGraph, previouslySelectedCommits, table);
table.setPaintBusy(false);
}
private static void restoreSelection(@NotNull GraphTableModel newModel,
@NotNull VisibleGraph<Integer> newVisibleGraph,
@NotNull TIntHashSet previouslySelectedCommits,
@@ -243,7 +235,9 @@ public class VcsLogUiImpl implements VcsLogUi, Disposable {
}
}
private <T> void jumpTo(@NotNull final T commitId, @NotNull final PairFunction<GraphTableModel, T, Integer> rowGetter, @NotNull final SettableFuture<Boolean> future) {
private <T> void jumpTo(@NotNull final T commitId,
@NotNull final PairFunction<GraphTableModel, T, Integer> rowGetter,
@NotNull final SettableFuture<Boolean> future) {
if (future.isCancelled()) return;
GraphTableModel model = getModel();
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/tables/GraphTableModel.java
+1
View File
@@ -246,6 +246,7 @@ public class GraphTableModel extends AbstractTableModel {
public void setVisiblePack(@NotNull VisiblePack visiblePack) {
myDataPack = visiblePack;
myMoreRequested = false;
fireTableDataChanged();
}
}