From cb7367da44412e2296c6d5dff6b948bf1337fa3f Mon Sep 17 00:00:00 2001 From: "Vladislav.Soroka" Date: Tue, 19 Nov 2013 15:22:50 +0400 Subject: [PATCH] External system: not serializable com.intellij.util.containers.ContainerUtilRt$EmptyList replaced with Collections.emptyList --- .../actions/AddGradleDslDependencyActionHandler.java | 3 ++- .../plugins/gradle/service/project/GradleExecutionHelper.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/integrations/maven/codeInsight/actions/AddGradleDslDependencyActionHandler.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/integrations/maven/codeInsight/actions/AddGradleDslDependencyActionHandler.java index 09e96cc39be4..9d91cd3be5b8 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/integrations/maven/codeInsight/actions/AddGradleDslDependencyActionHandler.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/integrations/maven/codeInsight/actions/AddGradleDslDependencyActionHandler.java @@ -37,6 +37,7 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrCall; import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrExpression; import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrMethodCall; +import java.util.Collections; import java.util.List; /** @@ -54,7 +55,7 @@ class AddGradleDslDependencyActionHandler implements CodeInsightActionHandler { ids = AddGradleDslDependencyAction.TEST_THREAD_LOCAL.get(); } else { - ids = MavenArtifactSearchDialog.searchForArtifact(project, ContainerUtil.emptyList()); + ids = MavenArtifactSearchDialog.searchForArtifact(project, Collections.emptyList()); } if (ids.isEmpty()) return; diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleExecutionHelper.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleExecutionHelper.java index 77d2e46d78e5..6edaee4b5051 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleExecutionHelper.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleExecutionHelper.java @@ -47,6 +47,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.lang.reflect.Field; +import java.util.Collections; import java.util.List; import java.util.concurrent.TimeUnit; @@ -79,7 +80,7 @@ public class GradleExecutionHelper { @NotNull ExternalSystemTaskNotificationListener listener, @Nullable final String vmOptions) { BuildLauncher result = connection.newBuild(); - List extraJvmArgs = vmOptions == null ? ContainerUtil.emptyList() : ContainerUtil.newArrayList(vmOptions.trim()); + List extraJvmArgs = vmOptions == null ? Collections.emptyList() : ContainerUtil.newArrayList(vmOptions.trim()); prepare(result, id, settings, listener, extraJvmArgs, connection); return result; }