From bc55dad32e0d5902b700af16e0bc7ffb43e4bfb4 Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <AMPivovarov@gmail.com>
Date: Tue, 20 Jun 2017 16:52:43 +0300
Subject: [PATCH] vcs: remove unnecessary field

---
 .../openapi/vcs/changes/ui/ChangesTreeList.java        | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesTreeList.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesTreeList.java
index b158b9edb2ec..7c7e72db0a52 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesTreeList.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesTreeList.java
@@ -80,8 +80,6 @@ public abstract class ChangesTreeList<T> extends Tree implements TypeSafeDataPro
   @NotNull private Runnable myDoubleClickHandler = EmptyRunnable.getInstance();
   private boolean myAlwaysExpandList;
 
-  @NotNull private final MyTreeCellRenderer myNodeRenderer;
-
   @NonNls private final static String FLATTEN_OPTION_KEY = "ChangesBrowser.SHOW_FLATTEN";
 
   @Nullable private final Runnable myInclusionListener;
@@ -103,8 +101,6 @@ public abstract class ChangesTreeList<T> extends Tree implements TypeSafeDataPro
     myChangeDecorator = decorator;
     myIncludedChanges = new HashSet<>(initiallyIncluded);
     myAlwaysExpandList = true;
-    final ChangesBrowserNodeRenderer nodeRenderer = new ChangesBrowserNodeRenderer(myProject, () -> myShowFlatten, myHighlightProblems);
-    myNodeRenderer = new MyTreeCellRenderer(nodeRenderer);
     myCheckboxWidth = new JCheckBox().getPreferredSize().width;
 
     setHorizontalAutoScrollingEnabled(false);
@@ -112,7 +108,9 @@ public abstract class ChangesTreeList<T> extends Tree implements TypeSafeDataPro
     setShowsRootHandles(true);
     setOpaque(false);
     new TreeSpeedSearch(this, ChangesBrowserNode.TO_TEXT_CONVERTER);
-    setCellRenderer(myNodeRenderer);
+
+    final ChangesBrowserNodeRenderer nodeRenderer = new ChangesBrowserNodeRenderer(myProject, () -> myShowFlatten, myHighlightProblems);
+    setCellRenderer(new MyTreeCellRenderer(nodeRenderer));
 
     new MyToggleSelectionAction().registerCustomShortcutSet(new CustomShortcutSet(KeyStroke.getKeyStroke(KeyEvent.VK_SPACE, 0)), this);
     registerKeyboardAction(new ActionListener() {
@@ -163,7 +161,7 @@ public abstract class ChangesTreeList<T> extends Tree implements TypeSafeDataPro
       }
     }.installOn(this);
 
-    new TreeLinkMouseListener(myNodeRenderer.myTextRenderer) {
+    new TreeLinkMouseListener(nodeRenderer) {
       @Override
       protected int getRendererRelativeX(@NotNull MouseEvent e, @NotNull JTree tree, @NotNull TreePath path) {
         int x = super.getRendererRelativeX(e, tree, path);