diff options
author | Tor Norbye <tnorbye@google.com> | 2014-07-25 20:12:40 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-07-24 20:55:36 +0000 |
commit | 6044be7330c93bc8dacb0f63e62da8029f39a16f (patch) | |
tree | 0ba72f5de1949e0527874a799baa224cbe1537e0 /java/debugger/impl/src/com/intellij/debugger/ui/tree/render/ToStringRenderer.java | |
parent | b03a5855292feb8c331815f883fe64372aacd872 (diff) | |
parent | e5266e2343c8d275d79fa0be725180d0fe3a993c (diff) | |
download | idea-6044be7330c93bc8dacb0f63e62da8029f39a16f.tar.gz |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'java/debugger/impl/src/com/intellij/debugger/ui/tree/render/ToStringRenderer.java')
-rw-r--r-- | java/debugger/impl/src/com/intellij/debugger/ui/tree/render/ToStringRenderer.java | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/ToStringRenderer.java b/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/ToStringRenderer.java index fd77aa900a7c..4016289147a7 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/ToStringRenderer.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/ToStringRenderer.java @@ -36,7 +36,7 @@ import com.sun.jdi.*; import org.jdom.Element; import org.jetbrains.annotations.NonNls; -import java.util.Iterator; +import java.util.List; import static com.intellij.psi.CommonClassNames.JAVA_LANG_STRING; @@ -126,14 +126,10 @@ public class ToStringRenderer extends NodeRendererImpl { @SuppressWarnings({"HardCodedStringLiteral"}) private static boolean overridesToString(Type type) { if(type instanceof ClassType) { - final ClassType classType = (ClassType)type; - final java.util.List methods = classType.methodsByName("toString", "()Ljava/lang/String;"); - if (methods.size() > 0) { - for (Iterator iterator = methods.iterator(); iterator.hasNext();) { - final Method method = (Method)iterator.next(); - if(!(method.declaringType().name()).equals(CommonClassNames.JAVA_LANG_OBJECT)){ - return true; - } + final List<Method> methods = ((ClassType)type).methodsByName("toString", "()Ljava/lang/String;"); + for (Method method : methods) { + if (!(method.declaringType().name()).equals(CommonClassNames.JAVA_LANG_OBJECT)) { + return true; } } } @@ -182,7 +178,7 @@ public class ToStringRenderer extends NodeRendererImpl { private boolean isFiltered(Type t) { if (t instanceof ReferenceType) { for (ClassFilter classFilter : myClassFilters) { - if (classFilter.isEnabled() && DebuggerUtilsEx.getSuperType(t, classFilter.getPattern()) != null) { + if (classFilter.isEnabled() && DebuggerUtils.getSuperType(t, classFilter.getPattern()) != null) { return true; } } |