From f5124e7ddb828f4d74a07f8bd21cb7b354b56207 Mon Sep 17 00:00:00 2001 From: "Egor.Ushakov" Date: Wed, 11 Feb 2015 18:35:13 +0300 Subject: [PATCH] register renderers as extensions --- .../debugger/settings/ColorObjectRenderer.java | 4 +++- .../debugger/settings/IconObjectRenderer.java | 1 + .../debugger/settings/ImageObjectRenderer.java | 1 + .../debugger/settings/NodeRendererSettings.java | 12 ------------ resources/src/META-INF/IdeaPlugin.xml | 4 ++++ 5 files changed, 9 insertions(+), 13 deletions(-) diff --git a/java/debugger/impl/src/com/intellij/debugger/settings/ColorObjectRenderer.java b/java/debugger/impl/src/com/intellij/debugger/settings/ColorObjectRenderer.java index b5596ceb3559..2e2a01ae8be5 100644 --- a/java/debugger/impl/src/com/intellij/debugger/settings/ColorObjectRenderer.java +++ b/java/debugger/impl/src/com/intellij/debugger/settings/ColorObjectRenderer.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,6 +34,7 @@ class ColorObjectRenderer extends CompoundReferenceRenderer { public ColorObjectRenderer(final NodeRendererSettings rendererSettings) { super(rendererSettings, "Color", null, null); setClassName("java.awt.Color"); + setEnabled(true); } public String calcLabel(ValueDescriptor descriptor, EvaluationContext evaluationContext, DescriptorLabelListener listener) throws @@ -55,6 +56,7 @@ class ColorObjectRenderer extends CompoundReferenceRenderer { if (valueField != null) { final Value rgbValue = objRef.getValue(valueField); if (rgbValue instanceof IntegerValue) { + @SuppressWarnings("UseJBColor") final Color color = new Color(((IntegerValue)rgbValue).value(), true); return new ColorIcon(16, 12, color, true); } diff --git a/java/debugger/impl/src/com/intellij/debugger/settings/IconObjectRenderer.java b/java/debugger/impl/src/com/intellij/debugger/settings/IconObjectRenderer.java index 9f6f6eb15e8d..fd6b3474d178 100644 --- a/java/debugger/impl/src/com/intellij/debugger/settings/IconObjectRenderer.java +++ b/java/debugger/impl/src/com/intellij/debugger/settings/IconObjectRenderer.java @@ -38,6 +38,7 @@ class IconObjectRenderer extends CompoundReferenceRenderer implements FullValueE public IconObjectRenderer(final NodeRendererSettings rendererSettings) { super(rendererSettings, "Icon", null, null); setClassName("javax.swing.Icon"); + setEnabled(true); } public String calcLabel(ValueDescriptor descriptor, EvaluationContext evaluationContext, DescriptorLabelListener listener) throws diff --git a/java/debugger/impl/src/com/intellij/debugger/settings/ImageObjectRenderer.java b/java/debugger/impl/src/com/intellij/debugger/settings/ImageObjectRenderer.java index a7c51f137232..c4ab8a7dd9a8 100644 --- a/java/debugger/impl/src/com/intellij/debugger/settings/ImageObjectRenderer.java +++ b/java/debugger/impl/src/com/intellij/debugger/settings/ImageObjectRenderer.java @@ -45,6 +45,7 @@ class ImageObjectRenderer extends CompoundReferenceRenderer implements FullValue public ImageObjectRenderer(final NodeRendererSettings rendererSettings) { super(rendererSettings, "Image", null, null); setClassName("java.awt.Image"); + setEnabled(true); } public String calcLabel(ValueDescriptor descriptor, EvaluationContext evaluationContext, DescriptorLabelListener listener) throws diff --git a/java/debugger/impl/src/com/intellij/debugger/settings/NodeRendererSettings.java b/java/debugger/impl/src/com/intellij/debugger/settings/NodeRendererSettings.java index 32505cc41831..5874f8b33b86 100644 --- a/java/debugger/impl/src/com/intellij/debugger/settings/NodeRendererSettings.java +++ b/java/debugger/impl/src/com/intellij/debugger/settings/NodeRendererSettings.java @@ -78,9 +78,6 @@ public class NodeRendererSettings implements PersistentStateComponent { private final ClassRenderer myClassRenderer = new ClassRenderer(); private final HexRenderer myHexRenderer = new HexRenderer(); private final ToStringRenderer myToStringRenderer = new ToStringRenderer(); - private final CompoundReferenceRenderer myColorRenderer; - private final CompoundReferenceRenderer myImageRenderer; - private final CompoundReferenceRenderer myIconRenderer; // alternate collections private final NodeRenderer[] myAlternateCollectionRenderers = new NodeRenderer[]{ createCompoundReferenceRenderer( @@ -109,16 +106,10 @@ public class NodeRendererSettings implements PersistentStateComponent { @NonNls private static final String CUSTOM_RENDERERS_TAG_NAME = "CustomRenderers"; public NodeRendererSettings() { - myColorRenderer = new ColorObjectRenderer(this); - myImageRenderer = new ImageObjectRenderer(this); - myIconRenderer = new IconObjectRenderer(this); // default configuration myHexRenderer.setEnabled(false); myToStringRenderer.setEnabled(true); setAlternateCollectionViewsEnabled(true); - myColorRenderer.setEnabled(true); - myImageRenderer.setEnabled(true); - myIconRenderer.setEnabled(true); } public static NodeRendererSettings getInstance() { @@ -288,9 +279,6 @@ public class NodeRendererSettings implements PersistentStateComponent { } }); Collections.addAll(allRenderers, myAlternateCollectionRenderers); - allRenderers.add(myColorRenderer); - allRenderers.add(myImageRenderer); - allRenderers.add(myIconRenderer); allRenderers.add(myToStringRenderer); allRenderers.add(myArrayRenderer); allRenderers.add(myClassRenderer); diff --git a/resources/src/META-INF/IdeaPlugin.xml b/resources/src/META-INF/IdeaPlugin.xml index 337b6f4e61d6..8874b060d179 100644 --- a/resources/src/META-INF/IdeaPlugin.xml +++ b/resources/src/META-INF/IdeaPlugin.xml @@ -1495,6 +1495,10 @@ + + + +