From db7534d86ca67f11266c4aca19963be4e3f3688a Mon Sep 17 00:00:00 2001
From: Julia Beliaeva <Julia.Beliaeva@jetbrains.com>
Date: Mon, 27 May 2019 01:40:26 +0300
Subject: [PATCH] [vcs-log] cleanup

GitOrigin-RevId: a3d7b6933083919a503bc2a78bd5ff71ea84127e
---
 .../com/intellij/vcs/log/ui/VcsLogUiImpl.java |  2 +-
 .../intellij/vcs/log/ui/frame/MainFrame.java  | 39 +++++++++----------
 2 files changed, 19 insertions(+), 22 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 7113ddc4fe0c..b493777a2878 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
@@ -52,7 +52,7 @@ public class VcsLogUiImpl extends AbstractVcsLogUi {
                       @Nullable VcsLogFilterCollection filters) {
     super(id, logData, manager, refresher);
     myUiProperties = uiProperties;
-    myMainFrame = new MainFrame(logData, this, uiProperties, myLog, myVisiblePack, filters);
+    myMainFrame = new MainFrame(logData, this, uiProperties, myVisiblePack, filters);
 
     for (VcsLogHighlighterFactory factory : LOG_HIGHLIGHTER_FACTORY_EP.getExtensions(myProject)) {
       getTable().addHighlighter(factory.createHighlighter(logData, this));
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 9e741c509dc3..a865fa6ebae9 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
@@ -23,12 +23,13 @@ import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.ui.JBUI;
 import com.intellij.util.ui.StatusText;
 import com.intellij.util.ui.table.ComponentsListFocusTraversalPolicy;
-import com.intellij.vcs.CommittedChangeListForRevision;
-import com.intellij.vcs.log.*;
+import com.intellij.vcs.log.CommitId;
+import com.intellij.vcs.log.VcsFullCommitDetails;
+import com.intellij.vcs.log.VcsLogFilterCollection;
+import com.intellij.vcs.log.VcsLogFilterUi;
 import com.intellij.vcs.log.data.VcsLogData;
 import com.intellij.vcs.log.impl.CommonUiProperties;
 import com.intellij.vcs.log.impl.MainVcsLogUiProperties;
-import com.intellij.vcs.log.ui.AbstractVcsLogUi;
 import com.intellij.vcs.log.ui.VcsLogActionPlaces;
 import com.intellij.vcs.log.ui.VcsLogInternalDataKeys;
 import com.intellij.vcs.log.ui.VcsLogUiImpl;
@@ -63,36 +64,32 @@ public class MainFrame extends JPanel implements DataProvider, Disposable {
   private static final String CHANGES_SPLITTER_PROPORTION = "vcs.log.changes.splitter.proportion";
 
   @NotNull private final VcsLogData myLogData;
-  @NotNull private final VcsLog myLog;
+  @NotNull private final MainVcsLogUiProperties myUiProperties;
+
+  @NotNull private final JComponent myToolbar;
+  @NotNull private final VcsLogGraphTable myGraphTable;
+
   @NotNull private final VcsLogClassicFilterUi myFilterUi;
+  @NotNull private final SearchTextField myTextFilter;
 
   @NotNull private final JBLoadingPanel myChangesLoadingPane;
-  @NotNull private final VcsLogGraphTable myGraphTable;
-  @NotNull private final DetailsPanel myDetailsPanel;
-  @NotNull private final Splitter myDetailsSplitter;
-  @NotNull private final JComponent myToolbar;
   @NotNull private final VcsLogChangesBrowser myChangesBrowser;
   @NotNull private final Splitter myChangesBrowserSplitter;
-  @NotNull private final Splitter myPreviewDiffSplitter;
-  @NotNull private final SearchTextField myTextFilter;
-  @NotNull private final MainVcsLogUiProperties myUiProperties;
   @NotNull private final MyCommitSelectionListenerForDiff mySelectionListenerForDiff;
-  @NotNull private final VcsLogChangeProcessor myPreviewDiff;
 
-  public MainFrame(@NotNull VcsLogData logData,
-                   @NotNull VcsLogUiImpl logUi,
-                   @NotNull MainVcsLogUiProperties uiProperties,
-                   @NotNull VcsLog log,
-                   @NotNull VisiblePack initialDataPack,
-                   @Nullable VcsLogFilterCollection filters) {
-    // collect info
+  @NotNull private final VcsLogChangeProcessor myPreviewDiff;
+  @NotNull private final Splitter myPreviewDiffSplitter;
+
+  @NotNull private final DetailsPanel myDetailsPanel;
+  @NotNull private final Splitter myDetailsSplitter;
+
+  public MainFrame(@NotNull VcsLogData logData, @NotNull VcsLogUiImpl logUi, @NotNull MainVcsLogUiProperties uiProperties,
+                   @NotNull VisiblePack initialDataPack, @Nullable VcsLogFilterCollection filters) {
     myLogData = logData;
-    myLog = log;
     myUiProperties = uiProperties;
 
     myFilterUi = new VcsLogClassicFilterUi(logUi, logData, myUiProperties, initialDataPack, filters);
 
-    // initialize components
     myGraphTable = new MyVcsLogGraphTable(logUi, logData, initialDataPack);
     myGraphTable.setCompactReferencesView(myUiProperties.get(MainVcsLogUiProperties.COMPACT_REFERENCES_VIEW));
     myGraphTable.setShowTagNames(myUiProperties.get(MainVcsLogUiProperties.SHOW_TAG_NAMES));