From 6a08e626c6a92a16e0fcc2004f0bfc73029e2241 Mon Sep 17 00:00:00 2001 From: "Egor.Ushakov" Date: Wed, 29 Oct 2014 16:07:51 +0300 Subject: [PATCH] code cleanup - use singletonList for single element collections --- .../intellij/debugger/engine/JavaExecutionStack.java | 3 +-- .../debugger/settings/ImageObjectRenderer.java | 4 ++-- .../debugger/ui/impl/watch/CompilingEvaluator.java | 11 ++++------- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/JavaExecutionStack.java b/java/debugger/impl/src/com/intellij/debugger/engine/JavaExecutionStack.java index 61bd5d4df803..c19b0e8ec027 100644 --- a/java/debugger/impl/src/com/intellij/debugger/engine/JavaExecutionStack.java +++ b/java/debugger/impl/src/com/intellij/debugger/engine/JavaExecutionStack.java @@ -32,7 +32,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import javax.swing.*; -import java.util.Arrays; import java.util.Collections; import java.util.Iterator; @@ -176,7 +175,7 @@ public class JavaExecutionStack extends XExecutionStack { } if (first || DebuggerSettings.getInstance().SHOW_LIBRARY_STACKFRAMES || (!frame.getDescriptor().isSynthetic() && !frame.getDescriptor().isInLibraryContent())) { if (++myAdded > mySkip) { - myContainer.addStackFrames(Arrays.asList(frame), false); + myContainer.addStackFrames(Collections.singletonList(frame), false); } } myDebugProcess.getManagerThread().schedule( 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 8f48ae93b995..fa332a347794 100644 --- a/java/debugger/impl/src/com/intellij/debugger/settings/ImageObjectRenderer.java +++ b/java/debugger/impl/src/com/intellij/debugger/settings/ImageObjectRenderer.java @@ -32,7 +32,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import javax.swing.*; -import java.util.Arrays; +import java.util.Collections; import java.util.List; /** @@ -88,7 +88,7 @@ class ImageObjectRenderer extends CompoundReferenceRenderer implements FullValue if (cls != null) { List methods = cls.methodsByName(methodName); if (!methods.isEmpty()) { - return process.invokeMethod(evaluationContext, cls, methods.get(0), Arrays.asList(obj)); + return process.invokeMethod(evaluationContext, cls, methods.get(0), Collections.singletonList(obj)); } } return null; diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/CompilingEvaluator.java b/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/CompilingEvaluator.java index 90df15380b3f..8900db300cf1 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/CompilingEvaluator.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/CompilingEvaluator.java @@ -50,10 +50,7 @@ import org.jetbrains.org.objectweb.asm.Opcodes; import javax.tools.*; import java.io.ByteArrayOutputStream; import java.net.URI; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; +import java.util.*; /** * @author egor @@ -250,9 +247,9 @@ public class CompilingEvaluator implements ExpressionEvaluator { StringReference url = proxy.mirrorOf("file:a"); keep(url, context); ObjectReference reference = classType.newInstance(threadReference, classType.concreteMethodByName("", "(Ljava/lang/String;)V"), - Arrays.asList(url), ClassType.INVOKE_SINGLE_THREADED); + Collections.singletonList(url), ClassType.INVOKE_SINGLE_THREADED); keep(reference, context); - arrayRef.setValues(Arrays.asList(reference)); + arrayRef.setValues(Collections.singletonList(reference)); return arrayRef; } @@ -290,7 +287,7 @@ public class CompilingEvaluator implements ExpressionEvaluator { diagnostic, options, null, - Arrays.asList(new SourceFileObject(getMainClassName(), JavaFileObject.Kind.SOURCE, getClassCode())) + Collections.singletonList(new SourceFileObject(getMainClassName(), JavaFileObject.Kind.SOURCE, getClassCode())) ).call()) { StringBuilder res = new StringBuilder("Compilation failed:\n"); for (Diagnostic d : diagnostic.getDiagnostics()) {