diff --git a/web.inspect/nbproject/project.xml b/web.inspect/nbproject/project.xml
--- a/web.inspect/nbproject/project.xml
+++ b/web.inspect/nbproject/project.xml
@@ -188,7 +188,7 @@
- 6.42
+ 6.59
diff --git a/web.inspect/src/org/netbeans/modules/web/inspect/webkit/knockout/KnockoutPanel.java b/web.inspect/src/org/netbeans/modules/web/inspect/webkit/knockout/KnockoutPanel.java
--- a/web.inspect/src/org/netbeans/modules/web/inspect/webkit/knockout/KnockoutPanel.java
+++ b/web.inspect/src/org/netbeans/modules/web/inspect/webkit/knockout/KnockoutPanel.java
@@ -114,16 +114,13 @@
NbBundle.getMessage(KnockoutPanel.class, "KnockoutPanel.contextView.name")); // NOI18N
contextView.setAllowedDragActions(DnDConstants.ACTION_NONE);
contextView.setAllowedDropActions(DnDConstants.ACTION_NONE);
+ contextView.setShowNodeIcons(false);
contextView.addPropertyColumn(
KnockoutNode.ValueProperty.NAME,
NbBundle.getMessage(KnockoutPanel.class, "KnockoutPanel.contextView.value")); // NOI18N
Outline outline = contextView.getOutline();
outline.setRootVisible(false);
- TableCellRenderer renderer = outline.getDefaultRenderer(Object.class);
- if (renderer != null) {
- outline.setDefaultRenderer(Object.class, new NoIconRenderer(renderer));
- }
}
/**
@@ -287,72 +284,4 @@
}
- /**
- * Renderer that delegates to the given renderer but doesn't paint icons.
- */
- final static class NoIconRenderer implements TableCellRenderer {
- /** The original table cell renderer. */
- private final TableCellRenderer originalRenderer;
- /** Icon used instead of the original icons. */
- private final Icon emptyIcon;
-
- /**
- * Creates a new {@code NoIconRenderer} for the specified renderer.
- *
- * @param originalRenderer renderer whose icon should be removed.
- */
- public NoIconRenderer(TableCellRenderer originalRenderer) {
- this.originalRenderer = originalRenderer;
- // Icons with zero width/height are ignored
- this.emptyIcon = new EmptyIcon(1, 1);
- }
-
- @Override
- public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
- Component component = originalRenderer.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
- if (component instanceof JLabel) {
- JLabel label = (JLabel)component;
- if (label.getIcon() != null) {
- label.setIcon(emptyIcon);
- }
- }
- return component;
- }
-
- }
-
- /**
- * Empty (transparent) icon.
- */
- final static class EmptyIcon implements Icon {
- private final int width;
- private final int height;
-
- /**
- * Creates a new {@code EmptyIcon}.
- *
- * @param width width of the icon.
- * @param height height of the icon.
- */
- EmptyIcon(int width, int height) {
- this.width = width;
- this.height = height;
- }
-
- @Override
- public void paintIcon(Component c, Graphics g, int x, int y) {
- }
-
- @Override
- public int getIconWidth() {
- return width;
- }
-
- @Override
- public int getIconHeight() {
- return height;
- }
-
- }
-
}
diff --git a/web.inspect/src/org/netbeans/modules/web/inspect/webkit/ui/CSSStylesSelectionPanel.java b/web.inspect/src/org/netbeans/modules/web/inspect/webkit/ui/CSSStylesSelectionPanel.java
--- a/web.inspect/src/org/netbeans/modules/web/inspect/webkit/ui/CSSStylesSelectionPanel.java
+++ b/web.inspect/src/org/netbeans/modules/web/inspect/webkit/ui/CSSStylesSelectionPanel.java
@@ -119,6 +119,7 @@
import org.openide.explorer.ExplorerUtils;
import org.openide.explorer.view.BeanTreeView;
import org.openide.explorer.view.ListView;
+import org.openide.explorer.view.NodeRenderer;
import org.openide.explorer.view.TreeTableView;
import org.openide.explorer.view.Visualizer;
import org.openide.filesystems.FileObject;
@@ -838,19 +839,7 @@
setRootVisible(false);
setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION);
final TreeCellRenderer renderer = tree.getCellRenderer();
- tree.setCellRenderer(new TreeCellRenderer() {
- @Override
- public Component getTreeCellRendererComponent(JTree tree,
- Object value, boolean selected, boolean expanded,
- boolean leaf, int row, boolean hasFocus) {
- Component component = renderer.getTreeCellRendererComponent(
- tree, value, selected, expanded, leaf, row, hasFocus);
- if (component instanceof JLabel) {
- ((JLabel)component).setIcon(null);
- }
- return component;
- }
- });
+ ((NodeRenderer) renderer).setShowIcons(false);
hideTreeLines();
if (Boolean.getBoolean("netbeans.plaf.dark.theme") // NOI18N
|| "Nimbus".equals(UIManager.getLookAndFeel().getID())) { // NOI18N