From 3a1ed388b11d11e0c6185b353358368a8bd34daf Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Wed, 2 Nov 2016 11:43:27 +0100 Subject: [PATCH] cleanup --- .../debugger/ui/tree/render/CompoundNodeRenderer.java | 11 ++++++++++- .../debugger/ui/tree/render/TypeRenderer.java | 5 +++++ 2 files changed, 15 insertions(+), 1 deletion(-) 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 c8587fb462c9..9ab6dfdf2d7f 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 @@ -1,5 +1,5 @@ /* - * Copyright 2000-2015 JetBrains s.r.o. + * Copyright 2000-2016 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. @@ -46,10 +46,12 @@ public class CompoundNodeRenderer extends NodeRendererImpl{ myChildrenRenderer = childrenRenderer; } + @Override public String getUniqueId() { return UNIQUE_ID; } + @Override public CompoundNodeRenderer clone() { CompoundNodeRenderer renderer = (CompoundNodeRenderer)super.clone(); renderer.myLabelRenderer = (myLabelRenderer != null) ? (ValueLabelRenderer)myLabelRenderer.clone() : null; @@ -57,22 +59,27 @@ public class CompoundNodeRenderer extends NodeRendererImpl{ return renderer; } + @Override public void buildChildren(Value value, ChildrenBuilder builder, EvaluationContext evaluationContext) { getChildrenRenderer().buildChildren(value, builder, evaluationContext); } + @Override public PsiElement getChildValueExpression(DebuggerTreeNode node, DebuggerContext context) throws EvaluateException { return getChildrenRenderer().getChildValueExpression(node, context); } + @Override public boolean isExpandable(Value value, EvaluationContext evaluationContext, NodeDescriptor parentDescriptor) { return getChildrenRenderer().isExpandable(value, evaluationContext, parentDescriptor); } + @Override public boolean isApplicable(Type type) { return getLabelRenderer().isApplicable(type) && getChildrenRenderer().isApplicable(type); } + @Override public String calcLabel(ValueDescriptor descriptor, EvaluationContext evaluationContext, DescriptorLabelListener listener) throws EvaluateException { return getLabelRenderer().calcLabel(descriptor, evaluationContext, listener); } @@ -93,6 +100,7 @@ public class CompoundNodeRenderer extends NodeRendererImpl{ myChildrenRenderer = childrenRenderer; } + @Override @SuppressWarnings({"HardCodedStringLiteral"}) public void readExternal(Element element) throws InvalidDataException { super.readExternal(element); @@ -113,6 +121,7 @@ public class CompoundNodeRenderer extends NodeRendererImpl{ } } + @Override @SuppressWarnings({"HardCodedStringLiteral"}) public void writeExternal(Element element) throws WriteExternalException { super.writeExternal(element); diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/TypeRenderer.java b/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/TypeRenderer.java index ce5b000387a0..00333433887f 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/TypeRenderer.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/TypeRenderer.java @@ -44,6 +44,7 @@ public abstract class TypeRenderer implements Renderer { myProperties.setClassName(className); } + @Override public Renderer clone() { try { final TypeRenderer cloned = (TypeRenderer)super.clone(); @@ -56,20 +57,24 @@ public abstract class TypeRenderer implements Renderer { return null; } + @Override public boolean isApplicable(Type type) { return DebuggerUtils.instanceOf(type, getClassName()); } + @Override public void writeExternal(Element element) throws WriteExternalException { myProperties.writeExternal(element); } + @Override public void readExternal(Element element) throws InvalidDataException { myProperties.readExternal(element); } protected CachedEvaluator createCachedEvaluator() { return new CachedEvaluator() { + @Override protected String getClassName() { return TypeRenderer.this.getClassName(); }