MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-18 09:34:34 +07:00
Code Issues Packages Projects Releases Wiki Activity

[vcs-log] dispose DeepComparators with ui

Browse Source
This commit is contained in:
Julia Beliaeva
2016-04-08 18:35:17 +03:00
committed by Julia Beliaeva
parent cbe2acffb8
commit 0a96c5cc18
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/branch/DeepComparatorHolder.java
+10 -1
View File
@@ -17,6 +17,7 @@ package git4idea.branch;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Disposer;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.vcs.log.VcsLogUi;
import git4idea.repo.GitRepositoryManager;
@@ -45,6 +46,15 @@ public class DeepComparatorHolder implements Disposable {
if (comparator == null) {
comparator = new DeepComparator(myProject, myRepositoryManager, ui, this);
myComparators.put(ui, comparator);
if (ui instanceof Disposable) {
Disposer.register((Disposable)ui, new Disposable() {
@Override
public void dispose() {
DeepComparator removed = myComparators.remove(ui);
if (removed != null) Disposer.dispose(removed); // check for null in case we dispose DeepComparatorHolder before ui
}
});
}
}
return comparator;
}
@@ -53,5 +63,4 @@ public class DeepComparatorHolder implements Disposable {
public void dispose() {
myComparators.clear();
}
}