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] dispose VcsLogProgress with project

Browse Source
This commit is contained in:
Julia Beliaeva
2017-11-27 18:47:57 +03:00
parent 200e378b9c
commit 0e95bb4eaf
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogData.java
+1 -2
View File
@@ -93,8 +93,7 @@ public class VcsLogData implements Disposable, VcsLogDataProvider {
myUserRegistry = (VcsUserRegistryImpl)ServiceManager.getService(project, VcsUserRegistry.class);
myFatalErrorsConsumer = fatalErrorsConsumer;
VcsLogProgress progress = new VcsLogProgress();
Disposer.register(this, progress);
VcsLogProgress progress = new VcsLogProgress(project, this);
VcsLogCachesInvalidator invalidator = CachesInvalidator.EP_NAME.findExtension(VcsLogCachesInvalidator.class);
if (invalidator.isValid()) {
platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogProgress.java
+6
View File
@@ -20,6 +20,7 @@ import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.progress.EmptyProgressIndicator;
import com.intellij.openapi.progress.ProgressIndicator;
import com.intellij.openapi.progress.util.AbstractProgressIndicatorBase;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Disposer;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
@@ -35,6 +36,11 @@ public class VcsLogProgress implements Disposable {
@NotNull private final Set<ProgressIndicator> myTasksWithVisibleProgress = ContainerUtil.newHashSet();
@NotNull private final Set<ProgressIndicator> myTasksWithSilentProgress = ContainerUtil.newHashSet();
public VcsLogProgress(@NotNull Project project, @NotNull Disposable parent) {
Disposer.register(parent, () -> Disposer.dispose(this));
Disposer.register(project, this);
}
@NotNull
public ProgressIndicator createProgressIndicator() {
return createProgressIndicator(true);
platform/vcs-log/impl/test/com/intellij/vcs/log/data/VcsLogRefresherTest.java
+1 -1
View File
@@ -210,7 +210,7 @@ public class VcsLogRefresherTest extends VcsPlatformTest {
}
}, myProject);
return new VcsLogRefresherImpl(myProject, myLogData.getStorage(), myLogProviders, myLogData.getUserRegistry(), myLogData.getIndex(),
new VcsLogProgress(),
new VcsLogProgress(myProject, myLogData),
myLogData.getTopCommitsCache(), dataPackConsumer, FAILING_EXCEPTION_HANDLER, RECENT_COMMITS_COUNT
) {
@Override