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

http://www.jetbrains.net/jira/browse/IDEADEV-470 fixed

Browse Source
This commit is contained in:
Olesya Smirnova
2005-02-27 18:57:17 +03:00
parent f30c029242
commit 41d4341346
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openapi/src/com/intellij/ide/util/treeView/NodeRenderer.java
+15 -6
View File
@@ -40,6 +40,7 @@ import com.intellij.navigation.ItemPresentation;
import javax.swing.*;
import javax.swing.tree.DefaultMutableTreeNode;
import java.awt.*;
public class NodeRenderer extends ColoredTreeCellRenderer {
public void customizeCellRenderer(JTree tree,
@@ -49,11 +50,13 @@ public class NodeRenderer extends ColoredTreeCellRenderer {
boolean leaf,
int row,
boolean hasFocus) {
Color color = null;
if (value instanceof DefaultMutableTreeNode) {
DefaultMutableTreeNode node = (DefaultMutableTreeNode)value;
Object userObject = node.getUserObject();
if (userObject instanceof NodeDescriptor) {
NodeDescriptor descriptor = (NodeDescriptor)userObject;
color = descriptor.getColor();
if (expanded) {
setIcon(descriptor.getOpenIcon());
}
@@ -62,13 +65,19 @@ public class NodeRenderer extends ColoredTreeCellRenderer {
}
}
}
String text =
tree.convertValueToText(value instanceof AbstractTreeNode
? ((AbstractTreeNode)value).toString()
: value,
selected, expanded, leaf, row, hasFocus);
final Object valueToGetText = value instanceof AbstractTreeNode ? ((AbstractTreeNode)value).toString() : value;
String text = tree.convertValueToText(valueToGetText,selected, expanded, leaf, row, hasFocus);
if (text == null) text = "";
append(text, getSimpleTextAttributes(value));
SimpleTextAttributes simpleTextAttributes = getSimpleTextAttributes(value);
if (color != null) {
final TextAttributes textAttributes = simpleTextAttributes.toTextAttributes();
textAttributes.setForegroundColor(color);
simpleTextAttributes = SimpleTextAttributes.fromTextAttributes(textAttributes);
}
append(text, simpleTextAttributes);
if (value instanceof DefaultMutableTreeNode) {
DefaultMutableTreeNode node = (DefaultMutableTreeNode)value;
source/com/intellij/ide/CopyPasteManagerEx.java
+1 -1
View File
@@ -194,7 +194,7 @@ public class CopyPasteManagerEx extends CopyPasteManager implements ClipboardOwn
return;
}
for (int i = 0; i < elements.length; i++) {
if (RefactoringMessageUtil.checkReadOnlyStatusRecursively(myProject, elements[i])) return;
if (!RefactoringMessageUtil.checkReadOnlyStatusRecursively(myProject, elements[i])) return;
}
((CopyPasteManagerEx)CopyPasteManager.getInstance()).setElements(elements, false);
updateView();