MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

minor scrolling fix

Browse Source
This commit is contained in:
Gregory.Shrago
2013-10-23 23:42:38 +04:00
parent b99519ef5f
commit 2e92afbcf0
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java
+3 -6
View File
@@ -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 {
platform/usageView/src/com/intellij/usages/impl/UsageViewTreeCellRenderer.java
+6 -3
View File
@@ -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) {