From 1034b4b3cd1834f9b5a9ee44cdd466b38542ec3c Mon Sep 17 00:00:00 2001
From: Julia Beliaeva <Julia.Beliaeva@jetbrains.com>
Date: Thu, 21 Jan 2016 18:54:41 +0300
Subject: [PATCH] [vcs-log] minor: remove access to MainFrame from filter ui

---
 .../impl/src/com/intellij/vcs/log/ui/VcsLogUiImpl.java       | 5 +++--
 .../intellij/vcs/log/ui/filter/VcsLogClassicFilterUi.java    | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/VcsLogUiImpl.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/VcsLogUiImpl.java
index fdd90d7faee1..03d58fcefc46 100644
--- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/VcsLogUiImpl.java
+++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/VcsLogUiImpl.java
@@ -28,7 +28,7 @@ import com.intellij.vcs.log.ui.frame.VcsLogGraphTable;
 import com.intellij.vcs.log.ui.tables.GraphTableModel;
 import org.jetbrains.annotations.NotNull;
 
-import java.awt.*;
+import javax.swing.*;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.concurrent.Future;
@@ -299,7 +299,8 @@ public class VcsLogUiImpl implements VcsLogUi, Disposable {
     return mySettings.isShowBranchesPanel();
   }
 
-  public Component getToolbar() {
+  @NotNull
+  public JComponent getToolbar() {
     return myMainFrame.getToolbar();
   }
 
diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/VcsLogClassicFilterUi.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/VcsLogClassicFilterUi.java
index e6fdfa93d59b..e5f1fc5a3c93 100644
--- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/VcsLogClassicFilterUi.java
+++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/VcsLogClassicFilterUi.java
@@ -199,7 +199,7 @@ public class VcsLogClassicFilterUi implements VcsLogFilterUi {
     ApplicationManager.getApplication().assertIsDispatchThread();
     if (filter instanceof VcsLogBranchFilter) {
       myBranchFilterModel.setFilter((VcsLogBranchFilter)filter);
-      JComponent toolbar = myUi.getMainFrame().getToolbar();
+      JComponent toolbar = myUi.getToolbar();
       toolbar.revalidate();
       toolbar.repaint();
     }