From 6cf3bca403a9359c380ba0c135557d635358e2a5 Mon Sep 17 00:00:00 2001
From: Julia Beliaeva <julia.beliaeva@jetbrains.com>
Date: Thu, 7 Apr 2016 23:44:24 +0300
Subject: [PATCH] [vcs-log] dispose instances of LoadingPane

---
 .../src/com/intellij/vcs/log/ui/frame/DetailsPanel.java     | 5 +++--
 .../impl/src/com/intellij/vcs/log/ui/frame/MainFrame.java   | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/DetailsPanel.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/DetailsPanel.java
index 1677dbadce6d..f07ff8a05d81 100644
--- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/DetailsPanel.java
+++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/DetailsPanel.java
@@ -98,7 +98,8 @@ class DetailsPanel extends JPanel implements ListSelectionListener {
   DetailsPanel(@NotNull VcsLogDataManager logDataManager,
                @NotNull VcsLogGraphTable graphTable,
                @NotNull VcsLogColorManager colorManager,
-               @NotNull VisiblePack initialDataPack) {
+               @NotNull VisiblePack initialDataPack,
+               @NotNull Disposable parent) {
     myLogDataManager = logDataManager;
     myGraphTable = graphTable;
     myColorManager = colorManager;
@@ -129,7 +130,7 @@ class DetailsPanel extends JPanel implements ListSelectionListener {
     myMainContentPanel.add(myReferencesPanel, "");
     myMainContentPanel.add(myCommitDetailsPanel, "");
 
-    myLoadingPanel = new JBLoadingPanel(new BorderLayout(), logDataManager, ProgressWindow.DEFAULT_PROGRESS_DIALOG_POSTPONE_TIME_MILLIS) {
+    myLoadingPanel = new JBLoadingPanel(new BorderLayout(), parent, ProgressWindow.DEFAULT_PROGRESS_DIALOG_POSTPONE_TIME_MILLIS) {
       @Override
       public Color getBackground() {
         return getDetailsBackground();
diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/MainFrame.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/MainFrame.java
index 7fd26ebda69a..41d544c5e326 100644
--- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/MainFrame.java
+++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/MainFrame.java
@@ -90,14 +90,14 @@ public class MainFrame extends JPanel implements DataProvider, Disposable {
     myGraphTable = new VcsLogGraphTable(ui, logDataManager, initialDataPack);
     myBranchesPanel = new BranchesPanel(logDataManager, ui, initialDataPack.getRefs());
     setBranchesPanelVisible(uiProperties.isShowBranchesPanel());
-    myDetailsPanel = new DetailsPanel(logDataManager, myGraphTable, ui.getColorManager(), initialDataPack);
+    myDetailsPanel = new DetailsPanel(logDataManager, myGraphTable, ui.getColorManager(), initialDataPack, this);
 
     myChangesBrowser = new RepositoryChangesBrowser(project, null, Collections.<Change>emptyList(), null);
     myChangesBrowser.getViewer().setScrollPaneBorder(IdeBorderFactory.createBorder(SideBorder.TOP));
     myChangesBrowser.getDiffAction().registerCustomShortcutSet(myChangesBrowser.getDiffAction().getShortcutSet(), getGraphTable());
     myChangesBrowser.getEditSourceAction().registerCustomShortcutSet(CommonShortcuts.getEditSource(), getGraphTable());
     myChangesBrowser.getViewer().setEmptyText("");
-    myChangesLoadingPane = new JBLoadingPanel(new BorderLayout(), project, ProgressWindow.DEFAULT_PROGRESS_DIALOG_POSTPONE_TIME_MILLIS);
+    myChangesLoadingPane = new JBLoadingPanel(new BorderLayout(), this, ProgressWindow.DEFAULT_PROGRESS_DIALOG_POSTPONE_TIME_MILLIS);
     myChangesLoadingPane.add(myChangesBrowser);
 
     myGraphTable.getSelectionModel().addListSelectionListener(new CommitSelectionListener());
@@ -125,7 +125,7 @@ public class MainFrame extends JPanel implements DataProvider, Disposable {
     setLayout(new BorderLayout());
     add(myChangesBrowserSplitter);
 
-    Disposer.register(logDataManager, this);
+    Disposer.register(ui, this);
     myGraphTable.resetDefaultFocusTraversalKeys();
     setFocusTraversalPolicyProvider(true);
     setFocusTraversalPolicy(new MyFocusPolicy());