From 2e92afbcf0c23d639779d3e5520519fc442f183e Mon Sep 17 00:00:00 2001
From: "Gregory.Shrago" <gregory.shrago@jetbrains.com>
Date: Wed, 23 Oct 2013 23:39:01 +0400
Subject: [PATCH] minor scrolling fix

---
 .../src/com/intellij/usages/impl/UsageViewImpl.java      | 9 +++------
 .../intellij/usages/impl/UsageViewTreeCellRenderer.java  | 9 ++++++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java b/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java
index d95348c98655..e25c29389a7d 100644
--- a/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java
+++ b/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java
@@ -46,7 +46,6 @@ import com.intellij.psi.SmartPsiElementPointer;
 import com.intellij.ui.*;
 import com.intellij.ui.components.JBTabbedPane;
 import com.intellij.ui.content.Content;
-import com.intellij.ui.speedSearch.SpeedSearchSupply;
 import com.intellij.ui.treeStructure.Tree;
 import com.intellij.usageView.UsageInfo;
 import com.intellij.usageView.UsageViewBundle;
@@ -75,8 +74,6 @@ import javax.swing.tree.*;
 import java.awt.*;
 import java.awt.datatransfer.StringSelection;
 import java.awt.event.*;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
 import java.util.*;
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
@@ -447,10 +444,10 @@ public class UsageViewImpl implements UsageView, UsageModelTracker.UsageModelTra
       public String convert(TreePath o) {
         Object value = o.getLastPathComponent();
         TreeCellRenderer renderer = myTree.getCellRenderer();
-        if (renderer instanceof ColoredTreeCellRenderer) {
-          ColoredTreeCellRenderer coloredRenderer = (ColoredTreeCellRenderer)renderer;
+        if (renderer instanceof UsageViewTreeCellRenderer) {
+          UsageViewTreeCellRenderer coloredRenderer = (UsageViewTreeCellRenderer)renderer;
           coloredRenderer.clear();
-          coloredRenderer.customizeCellRenderer(myTree, value, false, false, false, 0, false);
+          coloredRenderer.customizeCellRenderer(null, value, false, false, false, 0, false);
           return coloredRenderer.getCharSequence(true).toString();
         }
         else {
diff --git a/platform/usageView/src/com/intellij/usages/impl/UsageViewTreeCellRenderer.java b/platform/usageView/src/com/intellij/usages/impl/UsageViewTreeCellRenderer.java
index 6a314ee21829..06913a5667e6 100644
--- a/platform/usageView/src/com/intellij/usages/impl/UsageViewTreeCellRenderer.java
+++ b/platform/usageView/src/com/intellij/usages/impl/UsageViewTreeCellRenderer.java
@@ -27,6 +27,7 @@ import com.intellij.usageView.UsageTreeColors;
 import com.intellij.usageView.UsageTreeColorsScheme;
 import com.intellij.usageView.UsageViewBundle;
 import com.intellij.usages.*;
+import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 import javax.swing.tree.DefaultMutableTreeNode;
@@ -51,9 +52,9 @@ class UsageViewTreeCellRenderer extends ColoredTreeCellRenderer {
   }
 
   @Override
-  public void customizeCellRenderer(JTree tree, Object value, boolean selected, boolean expanded, boolean leaf, int row, boolean hasFocus) {
+  public void customizeCellRenderer(@Nullable JTree tree, Object value, boolean selected, boolean expanded, boolean leaf, int row, boolean hasFocus) {
     boolean showAsReadOnly = false;
-    if (value instanceof Node && value != tree.getModel().getRoot()) {
+    if (value instanceof Node && tree != null && value != tree.getModel().getRoot()) {
       Node node = (Node)value;
       if (!node.isValid()) {
         append(UsageViewBundle.message("node.invalid") + " ", ourInvalidAttributes);
@@ -124,7 +125,9 @@ class UsageViewTreeCellRenderer extends ColoredTreeCellRenderer {
     else {
       append(value.toString(), SimpleTextAttributes.REGULAR_ATTRIBUTES);
     }
-    SpeedSearchUtil.applySpeedSearchHighlighting(myTree, this, true, mySelected);
+    if (tree != null) {
+      SpeedSearchUtil.applySpeedSearchHighlighting(tree, this, true, mySelected);
+    }
   }
 
   private static SimpleTextAttributes patchAttrs(Node node, SimpleTextAttributes original) {