Fix some things found by static analysis.

Change-Id: I4f9307db0607bb00258ab75d0afb446d472f04c9

8 files changed, 17 insertions, 14 deletions

diff --git a/gradle/src/integration-test/groovy/com/android/build/gradle/ProjectTest.groovy b/gradle/src/integration-test/groovy/com/android/build/gradle/ProjectTest.groovy
index abe1848..9dcb28e 100644
--- a/gradle/src/integration-test/groovy/com/android/build/gradle/ProjectTest.groovy
+++ b/gradle/src/integration-test/groovy/com/android/build/gradle/ProjectTest.groovy
@@ -179,7 +179,7 @@ class ProjectTest extends BaseTest {
         return (File) localProp.file
     }
 
-    private void checkImageColor(File folder, String fileName, int expectedColor) {
+    private static void checkImageColor(File folder, String fileName, int expectedColor) {
         File f = new File(folder, fileName)
         assertTrue("File '" + f.getAbsolutePath() + "' does not exist.", f.isFile())
 
diff --git a/gradle/src/main/groovy/com/android/build/gradle/BasePlugin.groovy b/gradle/src/main/groovy/com/android/build/gradle/BasePlugin.groovy
index 3260bdd..75e4a39 100644
--- a/gradle/src/main/groovy/com/android/build/gradle/BasePlugin.groovy
+++ b/gradle/src/main/groovy/com/android/build/gradle/BasePlugin.groovy
@@ -840,7 +840,7 @@ public abstract class BasePlugin {
         }
     }
 
-    def collectArtifacts(Configuration configuration, Map<ModuleVersionIdentifier,
+    static def collectArtifacts(Configuration configuration, Map<ModuleVersionIdentifier,
                          List<ResolvedArtifact>> artifacts) {
         configuration.resolvedConfiguration.resolvedArtifacts.each { ResolvedArtifact artifact ->
             def id = artifact.moduleVersion.id
@@ -927,7 +927,7 @@ public abstract class BasePlugin {
      * @param otherProjectTaskName name of task in other projects
      * @param configurationName name of configuration to use to find the other projects
      */
-    private void addDependsOnTaskInOtherProjects(final Task task, boolean useDependedOn,
+    private static void addDependsOnTaskInOtherProjects(final Task task, boolean useDependedOn,
                                                  String otherProjectTaskName,
                                                  String configurationName) {
         Project project = task.getProject();
@@ -973,7 +973,7 @@ public abstract class BasePlugin {
         return list
     }
 
-    protected List<SymbolFileProvider> getTextSymbolDependencies(
+    protected static List<SymbolFileProvider> getTextSymbolDependencies(
             List<AndroidDependency> libraries) {
         List<SymbolFileProvider> list = Lists.newArrayListWithCapacity(libraries.size())
 
diff --git a/gradle/src/main/groovy/com/android/build/gradle/internal/AndroidAsciiReportRenderer.java b/gradle/src/main/groovy/com/android/build/gradle/internal/AndroidAsciiReportRenderer.java
index 315daf8..a1b5768 100644
--- a/gradle/src/main/groovy/com/android/build/gradle/internal/AndroidAsciiReportRenderer.java
+++ b/gradle/src/main/groovy/com/android/build/gradle/internal/AndroidAsciiReportRenderer.java
@@ -63,6 +63,7 @@ public class AndroidAsciiReportRenderer extends TextReportRenderer {
         hasConfigs = true;
         renderer = new GraphRenderer(getTextOutput());
         renderer.visit(new Action<StyledTextOutput>() {
+            @Override
             public void execute(StyledTextOutput styledTextOutput) {
                 getTextOutput().withStyle(Identifier).text(variant.getName());
                 getTextOutput().withStyle(Description).text("");
@@ -93,6 +94,7 @@ public class AndroidAsciiReportRenderer extends TextReportRenderer {
         renderChildren(libraries);
     }
 
+    @Override
     public void complete() throws IOException {
         if (hasCyclicDependencies) {
             getTextOutput().withStyle(Info).println(
@@ -104,6 +106,7 @@ public class AndroidAsciiReportRenderer extends TextReportRenderer {
 
     private void render(final AndroidDependency lib, boolean lastChild) {
         renderer.visit(new Action<StyledTextOutput>() {
+            @Override
             public void execute(StyledTextOutput styledTextOutput) {
                 getTextOutput().text(((BundleDependency)lib).getName());
             }
diff --git a/gradle/src/main/groovy/com/android/build/gradle/internal/DefaultAndroidSourceDirectorySet.java b/gradle/src/main/groovy/com/android/build/gradle/internal/DefaultAndroidSourceDirectorySet.java
index 5ff37d1..af11abd 100644
--- a/gradle/src/main/groovy/com/android/build/gradle/internal/DefaultAndroidSourceDirectorySet.java
+++ b/gradle/src/main/groovy/com/android/build/gradle/internal/DefaultAndroidSourceDirectorySet.java
@@ -21,6 +21,7 @@ import com.google.common.collect.Lists;
 import org.gradle.api.internal.file.FileResolver;
 
 import java.io.File;
+import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 
@@ -51,9 +52,7 @@ public class DefaultAndroidSourceDirectorySet implements AndroidSourceDirectoryS
 
     @Override
     public AndroidSourceDirectorySet srcDirs(Object... srcDirs) {
-        for (Object srcDir : srcDirs) {
-            source.add(srcDir);
-        }
+        Collections.addAll(source, srcDirs);
         return this;
     }
 
diff --git a/gradle/src/main/groovy/com/android/build/gradle/internal/DependencyChecker.groovy b/gradle/src/main/groovy/com/android/build/gradle/internal/DependencyChecker.groovy
index 03d6f76..f6121ca 100644
--- a/gradle/src/main/groovy/com/android/build/gradle/internal/DependencyChecker.groovy
+++ b/gradle/src/main/groovy/com/android/build/gradle/internal/DependencyChecker.groovy
@@ -92,7 +92,7 @@ public class DependencyChecker {
         }
     }
 
-    private int getApiLevelFromMavenArtifact(String version) {
+    private static int getApiLevelFromMavenArtifact(String version) {
         switch (version) {
             case "1.5_r3":
             case "1.5_r4":
diff --git a/gradle/src/test/groovy/com/android/build/gradle/AppPluginDslTest.groovy b/gradle/src/test/groovy/com/android/build/gradle/AppPluginDslTest.groovy
index aa599cc..54788a4 100644
--- a/gradle/src/test/groovy/com/android/build/gradle/AppPluginDslTest.groovy
+++ b/gradle/src/test/groovy/com/android/build/gradle/AppPluginDslTest.groovy
@@ -204,7 +204,7 @@ public class AppPluginDslTest extends BaseTest {
         checkTasks(variant, false)
     }
 
-    private void checkTasks(BuildVariant variant, boolean testVariant) {
+    private static void checkTasks(BuildVariant variant, boolean testVariant) {
         assertNotNull(variant.processManifest)
         assertNotNull(variant.aidlCompile)
         assertNotNull(variant.mergeResources)
@@ -238,7 +238,7 @@ public class AppPluginDslTest extends BaseTest {
         }
     }
 
-    private BuildVariant findVariant(Collection<BuildVariant> variants, String name) {
+    private static BuildVariant findVariant(Collection<BuildVariant> variants, String name) {
         for (BuildVariant variant : variants) {
             if (name.equals(variant.name)) {
                 return variant
diff --git a/gradle/src/test/groovy/com/android/build/gradle/AppPluginInternalTest.groovy b/gradle/src/test/groovy/com/android/build/gradle/AppPluginInternalTest.groovy
index 2641416..d8cf0ef 100644
--- a/gradle/src/test/groovy/com/android/build/gradle/AppPluginInternalTest.groovy
+++ b/gradle/src/test/groovy/com/android/build/gradle/AppPluginInternalTest.groovy
@@ -234,7 +234,8 @@ public class AppPluginInternalTest extends BaseTest {
         assertNotNull(findVariant(variants, "F2FcTest"))
     }
 
-    private ApplicationVariant findVariant(Collection<ApplicationVariant> variants, String name) {
+    private static ApplicationVariant findVariant(Collection<ApplicationVariant> variants,
+                                                  String name) {
         for (ApplicationVariant variant : variants) {
             if (name.equals(variant.name)) {
                 return variant
diff --git a/gradle/src/test/groovy/com/android/build/gradle/LibraryPluginDslTest.groovy b/gradle/src/test/groovy/com/android/build/gradle/LibraryPluginDslTest.groovy
index 25f6a65..79c85a5 100644
--- a/gradle/src/test/groovy/com/android/build/gradle/LibraryPluginDslTest.groovy
+++ b/gradle/src/test/groovy/com/android/build/gradle/LibraryPluginDslTest.groovy
@@ -67,7 +67,7 @@ public class LibraryPluginDslTest extends BaseTest {
         checkLibraryTasks(variant)
     }
 
-    private void checkTestTasks(BuildVariant variant) {
+    private static void checkTestTasks(BuildVariant variant) {
         assertNotNull(variant.processManifest)
         assertNotNull(variant.aidlCompile)
         assertNotNull(variant.mergeResources)
@@ -92,7 +92,7 @@ public class LibraryPluginDslTest extends BaseTest {
         assertNotNull(variant.runTests)
     }
 
-    private void checkLibraryTasks(BuildVariant variant) {
+    private static void checkLibraryTasks(BuildVariant variant) {
         assertNotNull(variant.processManifest)
         assertNotNull(variant.aidlCompile)
         assertNotNull(variant.processResources)
@@ -110,7 +110,7 @@ public class LibraryPluginDslTest extends BaseTest {
         assertNull(variant.runTests)
     }
 
-    private BuildVariant findVariant(Collection<BuildVariant> variants, String name) {
+    private static BuildVariant findVariant(Collection<BuildVariant> variants, String name) {
         for (BuildVariant variant : variants) {
             if (name.equals(variant.name)) {
                 return variant