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

IDEA-114135 Fixed disposing "Version Control" tool window tabs registered using "changesViewContent" extension point - set correct disposer for created "Content" instances

Browse Source
This commit is contained in:
Konstantin Kolosovsky
2015-11-30 13:49:11 +03:00
parent f59f3ecdcd
commit 37b5e892ff
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesViewContentManager.java
+7 -7
View File
@@ -162,9 +162,6 @@ public class ChangesViewContentManager extends AbstractProjectComponent implemen
addExtensionTab(ep);
}
else if (predicateResult.equals(Boolean.FALSE) && epContent != null) {
if (!(epContent.getComponent() instanceof ContentStub)) {
ep.getInstance(myProject).disposeContent();
}
myContentManager.removeContent(epContent, true);
}
}
@@ -277,12 +274,15 @@ public class ChangesViewContentManager extends AbstractProjectComponent implemen
Content content = event.getContent();
if (content.getComponent() instanceof ContentStub) {
ChangesViewContentEP ep = ((ContentStub) content.getComponent()).getEP();
ChangesViewContentProvider provider = ep.getInstance(myProject);
final ChangesViewContentProvider provider = ep.getInstance(myProject);
final JComponent contentComponent = provider.initContent();
content.setComponent(contentComponent);
if (contentComponent instanceof Disposable) {
content.setDisposer((Disposable) contentComponent);
}
content.setDisposer(new Disposable() {
@Override
public void dispose() {
provider.disposeContent();
}
});
}
}
}