diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/CompoundNodeRenderer.java b/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/CompoundNodeRenderer.java index dc7de7904fa3..99d11ffa2580 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/CompoundNodeRenderer.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/CompoundNodeRenderer.java @@ -36,8 +36,8 @@ import java.util.List; public class CompoundNodeRenderer extends NodeRendererImpl{ public static final @NonNls String UNIQUE_ID = "CompoundNodeRenderer"; - protected ValueLabelRenderer myLabelRenderer; - protected ChildrenRenderer myChildrenRenderer; + private ValueLabelRenderer myLabelRenderer; + private ChildrenRenderer myChildrenRenderer; protected final NodeRendererSettings myRendererSettings; public CompoundNodeRenderer(NodeRendererSettings rendererSettings, String name, ValueLabelRenderer labelRenderer, ChildrenRenderer childrenRenderer) { diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/CompoundReferenceRenderer.java b/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/CompoundReferenceRenderer.java index f49cf8551795..62d0250716d5 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/CompoundReferenceRenderer.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/CompoundReferenceRenderer.java @@ -60,7 +60,7 @@ public class CompoundReferenceRenderer extends CompoundNodeRenderer{ } private NodeRenderer getDefaultRenderer() { - return getClassName().endsWith("]") ? (NodeRenderer)myRendererSettings.getArrayRenderer() : (NodeRenderer)myRendererSettings.getClassRenderer(); + return getClassName().endsWith("]") ? myRendererSettings.getArrayRenderer() : myRendererSettings.getClassRenderer(); } public ValueLabelRenderer getLabelRenderer() { @@ -70,12 +70,14 @@ public class CompoundReferenceRenderer extends CompoundNodeRenderer{ private ChildrenRenderer getRawChildrenRenderer() { NodeRenderer classRenderer = getDefaultRenderer(); - return myChildrenRenderer == classRenderer ? null : myChildrenRenderer; + final ChildrenRenderer originalRenderer = super.getChildrenRenderer(); + return originalRenderer == classRenderer ? null : originalRenderer; } private ValueLabelRenderer getRawLabelRenderer() { NodeRenderer classRenderer = getDefaultRenderer(); - return myLabelRenderer == classRenderer ? null : myLabelRenderer; + final ValueLabelRenderer originalRenderer = super.getLabelRenderer(); + return originalRenderer == classRenderer ? null : originalRenderer; } @@ -89,14 +91,16 @@ public class CompoundReferenceRenderer extends CompoundNodeRenderer{ public void setClassName(@NotNull String name) { myProperties.setClassName(name); if(getRawLabelRenderer() != null) { - if (myLabelRenderer instanceof ReferenceRenderer) { - ((ReferenceRenderer)myLabelRenderer).setClassName(name); + final ValueLabelRenderer originalLabelRenderer = super.getLabelRenderer(); + if (originalLabelRenderer instanceof ReferenceRenderer) { + ((ReferenceRenderer)originalLabelRenderer).setClassName(name); } } if(getRawChildrenRenderer() != null) { - if (myChildrenRenderer instanceof ReferenceRenderer) { - ((ReferenceRenderer)myChildrenRenderer).setClassName(name); + final ChildrenRenderer originalChildrenRenderer = super.getChildrenRenderer(); + if (originalChildrenRenderer instanceof ReferenceRenderer) { + ((ReferenceRenderer)originalChildrenRenderer).setClassName(name); } } }