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

diff: LST - fix threading

Browse Source 
We don't need all this synchronisation anymore, as LST/LSTM are using their own locks instead of WriteAction.
This is cleanup after 79ead28 8171c11
This commit is contained in:
Aleksey Pivovarov
2014-09-24 15:37:25 +04:00
parent 22bdba1234
commit 652b81f693
1 changed files with 5 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/impl/LineStatusTrackerManager.java
+5 -25
View File
@@ -25,6 +25,7 @@ package com.intellij.openapi.vcs.impl;
import com.intellij.lifecycle.PeriodicalTasksCloser;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.application.Application;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ModalityState;
import com.intellij.openapi.components.ProjectComponent;
import com.intellij.openapi.diagnostic.Logger;
@@ -48,7 +49,6 @@ import com.intellij.openapi.util.Disposer;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vcs.*;
import com.intellij.openapi.vcs.changes.committed.AbstractCalledLater;
import com.intellij.openapi.vcs.ex.LineStatusTracker;
import com.intellij.openapi.vcs.history.VcsRevisionNumber;
import com.intellij.openapi.vfs.VirtualFile;
@@ -81,8 +81,6 @@ public class LineStatusTrackerManager implements ProjectComponent, LineStatusTra
@NotNull private final Map<Document, LineStatusTracker> myLineStatusTrackers;
// !!! no state queries and self lock for add/remove
// removal from here - not under write action
@NotNull private final QueueProcessorRemovePartner<Document, BaseRevisionLoader> myPartner;
private long myLoadCounter;
@@ -184,7 +182,6 @@ public class LineStatusTrackerManager implements ProjectComponent, LineStatusTra
@Override
public LineStatusTracker getLineStatusTracker(final Document document) {
myApplication.assertReadAccessAllowed();
synchronized (myLock) {
if (isDisabled()) return null;
@@ -193,7 +190,6 @@ public class LineStatusTrackerManager implements ProjectComponent, LineStatusTra
}
private void resetTrackersForOpenFiles() {
myApplication.assertReadAccessAllowed();
if (isDisabled()) return;
if (LOG.isDebugEnabled()) {
@@ -207,7 +203,6 @@ public class LineStatusTrackerManager implements ProjectComponent, LineStatusTra
}
private void resetTracker(@NotNull final VirtualFile virtualFile) {
myApplication.assertReadAccessAllowed();
if (isDisabled()) return;
final Document document = FileDocumentManager.getInstance().getCachedDocument(virtualFile);
@@ -245,7 +240,6 @@ public class LineStatusTrackerManager implements ProjectComponent, LineStatusTra
}
private boolean shouldBeInstalled(@Nullable final VirtualFile virtualFile) {
myApplication.assertIsDispatchThread();
if (isDisabled()) return false;
if (virtualFile == null || virtualFile instanceof LightVirtualFile) return false;
@@ -304,8 +298,6 @@ public class LineStatusTrackerManager implements ProjectComponent, LineStatusTra
}
private void startAlarm(@NotNull final Document document, @NotNull final VirtualFile virtualFile) {
myApplication.assertReadAccessAllowed();
synchronized (myLock) {
myPartner.add(document, new BaseRevisionLoader(document, virtualFile));
}
@@ -398,16 +390,9 @@ public class LineStatusTrackerManager implements ProjectComponent, LineStatusTra
final Document document = editor.getDocument();
final VirtualFile virtualFile = FileDocumentManager.getInstance().getFile(document);
if (virtualFile == null) return;
// TODO: is there possible race between editorCreated / editorReleased ?
new AbstractCalledLater(myProject, ModalityState.NON_MODAL) {
@Override
public void run() {
if (shouldBeInstalled(virtualFile)) {
installTracker(virtualFile, document);
}
}
}.callMe();
if (shouldBeInstalled(virtualFile)) {
installTracker(virtualFile, document);
}
}
public void editorReleased(@NotNull EditorFactoryEvent event) {
@@ -416,12 +401,7 @@ public class LineStatusTrackerManager implements ProjectComponent, LineStatusTra
final Document doc = editor.getDocument();
final Editor[] editors = event.getFactory().getEditors(doc, myProject);
if (editors.length == 0) {
new AbstractCalledLater(myProject, ModalityState.NON_MODAL) {
@Override
public void run() {
releaseTracker(doc);
}
}.callMe();
releaseTracker(doc);
}
}
}