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

[file-history] remove myInRefresh field

Browse Source 
Concurrent history refresh is prohibited by VcsCachingHistory anyway.
This commit is contained in:
Julia Beliaeva
2018-07-09 17:35:13 +03:00
parent 0897cf03c8
commit ed26102f1c
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java
+8 -9
View File
@@ -41,6 +41,7 @@ import com.intellij.openapi.vcs.changes.ContentRevision;
import com.intellij.openapi.vcs.changes.CurrentContentRevision;
import com.intellij.openapi.vcs.changes.issueLinks.IssueLinkRenderer;
import com.intellij.openapi.vcs.changes.issueLinks.TableLinkMouseListener;
import com.intellij.openapi.vcs.impl.VcsBackgroundableActions;
import com.intellij.openapi.vcs.vfs.VcsFileSystem;
import com.intellij.openapi.vcs.vfs.VcsVirtualFile;
import com.intellij.openapi.vcs.vfs.VcsVirtualFolder;
@@ -108,7 +109,6 @@ public class FileHistoryPanelImpl extends PanelWithActionsAndCloseButton impleme
@NotNull private VcsHistorySession myHistorySession;
private VcsFileRevision myBottomRevisionForShowDiff;
private volatile boolean myInRefresh;
private List<Object> myTargetSelection;
private boolean myIsStaticAndEmbedded;
private Splitter myDetailsSplitter;
@@ -194,7 +194,7 @@ public class FileHistoryPanelImpl extends PanelWithActionsAndCloseButton impleme
if (!ApplicationManager.getApplication().isActive()) return;
lastTask = ourExecutor.submit(() -> {
if (!myInRefresh && !updateAlarm.isDisposed() && myHistorySession.shouldBeRefreshed()) {
if (!updateAlarm.isDisposed() && myHistorySession.shouldBeRefreshed()) {
refreshUiAndScheduleDataRefresh(true);
}
});
@@ -312,7 +312,6 @@ public class FileHistoryPanelImpl extends PanelWithActionsAndCloseButton impleme
treeView.scrollRectToVisible(treeView.getCellRect(lastRow, 0, true));
}
}
myInRefresh = false;
myTargetSelection = null;
mySplitter.revalidate();
@@ -324,7 +323,7 @@ public class FileHistoryPanelImpl extends PanelWithActionsAndCloseButton impleme
if ((virtualFile == null || !virtualFile.isValid()) && !myFilePath.getIOFile().exists()) {
myDualView.setEmptyText("File " + myFilePath.getName() + " not found");
}
else if (myInRefresh) {
else if (VcsCachingHistory.getHistoryLock(myVcs, VcsBackgroundableActions.CREATE_HISTORY_SESSION, myFilePath, myStartingRevision).isLocked()) {
myDualView.setEmptyText(CommonBundle.getLoadingTreeNodeText());
}
else {
@@ -432,9 +431,6 @@ public class FileHistoryPanelImpl extends PanelWithActionsAndCloseButton impleme
private void refreshUiAndScheduleDataRefresh(boolean canUseCache) {
ApplicationManager.getApplication().invokeAndWait(() -> {
if (myInRefresh) return;
myInRefresh = true;
myRefresherI.refresh(canUseCache);
});
}
@@ -1007,14 +1003,17 @@ public class FileHistoryPanelImpl extends PanelWithActionsAndCloseButton impleme
}
public void actionPerformed(AnActionEvent e) {
if (myInRefresh) return;
refreshUiAndScheduleDataRefresh(false);
}
@Override
public void update(AnActionEvent e) {
super.update(e);
e.getPresentation().setEnabled(!myInRefresh);
e.getPresentation().setEnabled(!isInRefresh());
}
private boolean isInRefresh() {
return VcsCachingHistory.getHistoryLock(myVcs, VcsBackgroundableActions.CREATE_HISTORY_SESSION, myFilePath, myStartingRevision).isLocked();
}
}