Fix some things found by static analysis.

Change-Id: I4f9307db0607bb00258ab75d0afb446d472f04c9

14 files changed, 52 insertions, 71 deletions

diff --git a/builder/src/main/java/com/android/builder/BuildConfig.java b/builder/src/main/java/com/android/builder/BuildConfig.java
index 9ad8b39..f9d4b0f 100644
--- a/builder/src/main/java/com/android/builder/BuildConfig.java
+++ b/builder/src/main/java/com/android/builder/BuildConfig.java
@@ -50,10 +50,8 @@ public class BuildConfig implements Serializable {
 
         BuildConfig that = (BuildConfig) o;
 
-        if (!mBuildConfigLines.equals(that.mBuildConfigLines))
-            return false;
+        return mBuildConfigLines.equals(that.mBuildConfigLines);
 
-        return true;
     }
 
     @Override
diff --git a/builder/src/main/java/com/android/builder/BuildType.java b/builder/src/main/java/com/android/builder/BuildType.java
index 7c9e0ae..9d8abec 100644
--- a/builder/src/main/java/com/android/builder/BuildType.java
+++ b/builder/src/main/java/com/android/builder/BuildType.java
@@ -37,7 +37,7 @@ public class BuildType extends BuildConfig {
     private boolean mZipAlign = true;
 
     public BuildType(@NonNull String name) {
-        this.mName = name;
+        mName = name;
         if (DEBUG.equals(name)) {
             initDebug();
         } else if (RELEASE.equals(name)) {
@@ -133,7 +133,7 @@ public class BuildType extends BuildConfig {
 
         BuildType buildType = (BuildType) o;
 
-        if (mName != null ? !mName.equals(buildType.mName) : buildType.mName != null) return false;
+        if (!mName.equals(buildType.mName)) return false;
         if (mDebugJniBuild != buildType.mDebugJniBuild) return false;
         if (mDebugSigned != buildType.mDebugSigned) return false;
         if (mDebuggable != buildType.mDebuggable) return false;
@@ -154,7 +154,7 @@ public class BuildType extends BuildConfig {
     @Override
     public int hashCode() {
         int result = super.hashCode();
-        result = 31 * result + (mName != null ? mName.hashCode() : 0);
+        result = 31 * result + (mName.hashCode());
         result = 31 * result + (mDebuggable ? 1 : 0);
         result = 31 * result + (mDebugJniBuild ? 1 : 0);
         result = 31 * result + (mDebugSigned ? 1 : 0);
diff --git a/builder/src/main/java/com/android/builder/BundleDependency.java b/builder/src/main/java/com/android/builder/BundleDependency.java
index 022191b..f0121bb 100644
--- a/builder/src/main/java/com/android/builder/BundleDependency.java
+++ b/builder/src/main/java/com/android/builder/BundleDependency.java
@@ -19,6 +19,7 @@ package com.android.builder;
 import com.android.SdkConstants;
 import com.android.annotations.NonNull;
 import com.android.annotations.Nullable;
+import com.google.common.base.Objects;
 
 import java.io.File;
 
@@ -115,9 +116,7 @@ public abstract class BundleDependency implements AndroidDependency {
 
         BundleDependency that = (BundleDependency) o;
 
-        if (mName != null ? !mName.equals(that.mName) : that.mName != null) return false;
-
-        return true;
+        return Objects.equal(mName, that.mName);
     }
 
     @Override
diff --git a/builder/src/main/java/com/android/builder/ProductFlavor.java b/builder/src/main/java/com/android/builder/ProductFlavor.java
index e926e17..e92ed62 100644
--- a/builder/src/main/java/com/android/builder/ProductFlavor.java
+++ b/builder/src/main/java/com/android/builder/ProductFlavor.java
@@ -55,7 +55,7 @@ public class ProductFlavor extends BuildConfig {
      *
      * @see #MAIN
      */
-    public ProductFlavor(String name) {
+    public ProductFlavor(@NonNull String name) {
         mName = name;
     }
 
@@ -233,7 +233,7 @@ public class ProductFlavor extends BuildConfig {
 
         ProductFlavor that = (ProductFlavor) o;
 
-        if (mName != null ? !mName.equals(that.mName) : that.mName != null) return false;
+        if (!mName.equals(that.mName)) return false;
         if (mMinSdkVersion != that.mMinSdkVersion) return false;
         if (mTargetSdkVersion != that.mTargetSdkVersion) return false;
         if (mVersionCode != that.mVersionCode) return false;
@@ -274,7 +274,7 @@ public class ProductFlavor extends BuildConfig {
     @Override
     public int hashCode() {
         int result = super.hashCode();
-        result = 31 * result + (mName != null ? mName.hashCode() : 0);
+        result = 31 * result + mName.hashCode();
         result = 31 * result + mMinSdkVersion;
         result = 31 * result + mTargetSdkVersion;
         result = 31 * result + mVersionCode;
diff --git a/builder/src/main/java/com/android/builder/VariantConfiguration.java b/builder/src/main/java/com/android/builder/VariantConfiguration.java
index 4f22242..83bf96a 100644
--- a/builder/src/main/java/com/android/builder/VariantConfiguration.java
+++ b/builder/src/main/java/com/android/builder/VariantConfiguration.java
@@ -68,7 +68,7 @@ public class VariantConfiguration {
     private final List<AndroidDependency> mFlatLibraries = Lists.newArrayList();
 
     public static enum Type {
-        DEFAULT, LIBRARY, TEST;
+        DEFAULT, LIBRARY, TEST
     }
 
     /**
@@ -318,7 +318,7 @@ public class VariantConfiguration {
             resolveIndirectLibraryDependencies(dependencies, outFlatDependencies);
 
             // and add the current one (if needed) in front (higher priority)
-            if (outFlatDependencies.contains(library) == false) {
+            if (!outFlatDependencies.contains(library)) {
                 outFlatDependencies.add(0, library);
             }
         }
diff --git a/builder/src/main/java/com/android/builder/internal/BuildConfigGenerator.java b/builder/src/main/java/com/android/builder/internal/BuildConfigGenerator.java
index 2b2a90f..b41ed5d 100644
--- a/builder/src/main/java/com/android/builder/internal/BuildConfigGenerator.java
+++ b/builder/src/main/java/com/android/builder/internal/BuildConfigGenerator.java
@@ -90,7 +90,7 @@ public class BuildConfigGenerator {
         }
 
         File pkgFolder = getFolderPath();
-        if (pkgFolder.isDirectory() == false) {
+        if (!pkgFolder.isDirectory()) {
             pkgFolder.mkdirs();
         }
 
diff --git a/builder/src/main/java/com/android/builder/internal/compiler/DependencyGraph.java b/builder/src/main/java/com/android/builder/internal/compiler/DependencyGraph.java
index 3ca2ae3..bba3ffa 100644
--- a/builder/src/main/java/com/android/builder/internal/compiler/DependencyGraph.java
+++ b/builder/src/main/java/com/android/builder/internal/compiler/DependencyGraph.java
@@ -38,7 +38,7 @@ public class DependencyGraph {
     private final ILogger mLogger;
 
     private static enum DependencyStatus {
-        NONE, NEW_FILE, UPDATED_FILE, MISSING_FILE, ERROR;
+        NONE, NEW_FILE, UPDATED_FILE, MISSING_FILE, ERROR
     }
 
     // Files that we know about from the dependency file
@@ -136,7 +136,7 @@ public class DependencyGraph {
      */
     private void parseDependencyFile(File dependencyFile) {
         // first check if the dependency file is here.
-        if (dependencyFile.isFile() == false) {
+        if (!dependencyFile.isFile()) {
             mMissingDepFile = true;
             return;
         }
@@ -291,7 +291,7 @@ public class DependencyGraph {
         // if it's a file, remove it from the list of prereqs.
         // This way if files in this folder don't trigger a build we'll have less
         // files to go through manually
-        if (mPrereqs.remove(file) == false) {
+        if (!mPrereqs.remove(file)) {
             // turns out this is a new file!
 
             if (DEBUG) {
@@ -328,7 +328,7 @@ public class DependencyGraph {
 
         // Loop through our prereq files and make sure they still exist
         for (File prereq : mPrereqs) {
-            if (prereq.exists() == false) {
+            if (!prereq.exists()) {
                 if (DEBUG) {
                     mLogger.info("MISSING FILE: " + prereq.getAbsolutePath());
                 }
@@ -394,7 +394,7 @@ public class DependencyGraph {
     private boolean missingTargetFile() {
         // Loop through our target files and make sure they still exist
         for (File target : mTargets) {
-            if (target.exists() == false) {
+            if (!target.exists()) {
                 return true;
             }
         }
diff --git a/builder/src/main/java/com/android/builder/internal/compiler/InputPath.java b/builder/src/main/java/com/android/builder/internal/compiler/InputPath.java
index defdea1..d0bdff4 100644
--- a/builder/src/main/java/com/android/builder/internal/compiler/InputPath.java
+++ b/builder/src/main/java/com/android/builder/internal/compiler/InputPath.java
@@ -55,16 +55,8 @@ public class InputPath {
      * @return true if the file must be checked for modification.
      */
     public boolean checksForModification(File file) {
-        if (ignores(file)) {
-            return false;
-        }
-
-        if (mTouchedExtensions != null &&
-                mTouchedExtensions.contains(getExtension(file)) == false) {
-            return false;
-        }
-
-        return true;
+        return !ignores(file) && (mTouchedExtensions == null ||
+                mTouchedExtensions.contains(getExtension(file)));
     }
 
     /**
diff --git a/builder/src/main/java/com/android/builder/internal/compiler/SourceGenerator.java b/builder/src/main/java/com/android/builder/internal/compiler/SourceGenerator.java
index b06e664..9ceeca6 100644
--- a/builder/src/main/java/com/android/builder/internal/compiler/SourceGenerator.java
+++ b/builder/src/main/java/com/android/builder/internal/compiler/SourceGenerator.java
@@ -36,7 +36,7 @@ public class SourceGenerator {
     private final ILogger mLogger;
 
     static enum DisplayType {
-        FOUND, COMPILING, REMOVE_OUTPUT, REMOVE_DEP;
+        FOUND, COMPILING, REMOVE_OUTPUT, REMOVE_DEP
     }
 
     interface Processor {
@@ -119,7 +119,7 @@ public class SourceGenerator {
             processor.displayMessage(mLogger, DisplayType.REMOVE_OUTPUT, toRemove.size());
 
             for (File toRemoveFile : toRemove) {
-                if (toRemoveFile.delete() == false) {
+                if (!toRemoveFile.delete()) {
                     mLogger.warning("Failed to remove " + toRemoveFile.getAbsolutePath());
                 }
             }
@@ -130,7 +130,7 @@ public class SourceGenerator {
             processor.displayMessage(mLogger, DisplayType.REMOVE_DEP, toRemove.size());
 
             for (File file : depsToRemove) {
-                if (file.delete() == false) {
+                if (!file.delete()) {
                     mLogger.warning("Failed to remove " + file.getAbsolutePath());
                 }
             }
diff --git a/builder/src/main/java/com/android/builder/internal/packaging/JavaResourceProcessor.java b/builder/src/main/java/com/android/builder/internal/packaging/JavaResourceProcessor.java
index 48f098f..0e293e6 100644
--- a/builder/src/main/java/com/android/builder/internal/packaging/JavaResourceProcessor.java
+++ b/builder/src/main/java/com/android/builder/internal/packaging/JavaResourceProcessor.java
@@ -135,11 +135,11 @@ public class JavaResourceProcessor {
      * @param folderName the name of the folder.
      */
     public static boolean checkFolderForPackaging(String folderName) {
-        return folderName.equalsIgnoreCase("CVS") == false &&
-            folderName.equalsIgnoreCase(".svn") == false &&
-            folderName.equalsIgnoreCase("SCCS") == false &&
-            folderName.equalsIgnoreCase("META-INF") == false &&
-            folderName.startsWith("_") == false;
+        return !folderName.equalsIgnoreCase("CVS") &&
+                !folderName.equalsIgnoreCase(".svn") &&
+                !folderName.equalsIgnoreCase("SCCS") &&
+                !folderName.equalsIgnoreCase("META-INF") &&
+                !folderName.startsWith("_");
     }
 
     /**
@@ -165,24 +165,20 @@ public class JavaResourceProcessor {
      */
     public static boolean checkFileForPackaging(String fileName, String extension) {
         // ignore hidden files and backup files
-        if (fileName.charAt(0) == '.' || fileName.charAt(fileName.length()-1) == '~') {
-            return false;
-        }
+        return !(fileName.charAt(0) == '.' || fileName.charAt(fileName.length() - 1) == '~') &&
+                !"aidl".equalsIgnoreCase(extension) &&        // Aidl files
+                !"rs".equalsIgnoreCase(extension) &&          // RenderScript files
+                !"rsh".equalsIgnoreCase(extension) &&         // RenderScript header files
+                !"d".equalsIgnoreCase(extension) &&           // Dependency files
+                !"java".equalsIgnoreCase(extension) &&        // Java files
+                !"scala".equalsIgnoreCase(extension) &&       // Scala files
+                !"class".equalsIgnoreCase(extension) &&       // Java class files
+                !"scc".equalsIgnoreCase(extension) &&         // VisualSourceSafe
+                !"swp".equalsIgnoreCase(extension) &&         // vi swap file
+                !"thumbs.db".equalsIgnoreCase(fileName) &&    // image index file
+                !"picasa.ini".equalsIgnoreCase(fileName) &&   // image index file
+                !"package.html".equalsIgnoreCase(fileName) && // Javadoc
+                !"overview.html".equalsIgnoreCase(fileName);  // Javadoc
 
-        return "aidl".equalsIgnoreCase(extension) == false &&       // Aidl files
-            "rs".equalsIgnoreCase(extension) == false &&            // RenderScript files
-            "rsh".equalsIgnoreCase(extension) == false &&           // RenderScript header files
-            "d".equalsIgnoreCase(extension) == false &&             // Dependency files
-            "java".equalsIgnoreCase(extension) == false &&          // Java files
-            "scala".equalsIgnoreCase(extension) == false &&         // Scala files
-            "class".equalsIgnoreCase(extension) == false &&         // Java class files
-            "scc".equalsIgnoreCase(extension) == false &&           // VisualSourceSafe
-            "swp".equalsIgnoreCase(extension) == false &&           // vi swap file
-            "thumbs.db".equalsIgnoreCase(fileName) == false &&      // image index file
-            "picasa.ini".equalsIgnoreCase(fileName) == false &&     // image index file
-            "package.html".equalsIgnoreCase(fileName) == false &&   // Javadoc
-            "overview.html".equalsIgnoreCase(fileName) == false;    // Javadoc
     }
-
-
 }
diff --git a/builder/src/main/java/com/android/builder/internal/packaging/Packager.java b/builder/src/main/java/com/android/builder/internal/packaging/Packager.java
index 3e48619..5860f20 100644
--- a/builder/src/main/java/com/android/builder/internal/packaging/Packager.java
+++ b/builder/src/main/java/com/android/builder/internal/packaging/Packager.java
@@ -105,7 +105,7 @@ public final class Packager implements IArchiveBuilder {
             // jar file, but we need to exclude some other folder (like /META-INF) so
             // we check anyway.
             for (int i = 0 ; i < segments.length - 1; i++) {
-                if (JavaResourceProcessor.checkFolderForPackaging(segments[i]) == false) {
+                if (!JavaResourceProcessor.checkFolderForPackaging(segments[i])) {
                     return false;
                 }
             }
@@ -412,7 +412,7 @@ public final class Packager implements IArchiveBuilder {
 
         File nativeFolder = new File(jniLibLocation);
 
-        if (nativeFolder.isDirectory() == false) {
+        if (!nativeFolder.isDirectory()) {
             // not a directory? check if it's a file or doesn't exist
             if (nativeFolder.exists()) {
                 throw new PackagerException("%s is not a folder", nativeFolder);
@@ -518,12 +518,12 @@ public final class Packager implements IArchiveBuilder {
         }
 
         if (file.exists()) { // will be a file in this case.
-            if (file.canWrite() == false) {
+            if (!file.canWrite()) {
                 throw new PackagerException("Cannot write %s", file);
             }
         } else {
             try {
-                if (file.createNewFile() == false) {
+                if (!file.createNewFile()) {
                     throw new PackagerException("Failed to create %s", file);
                 }
             } catch (IOException e) {
@@ -549,7 +549,7 @@ public final class Packager implements IArchiveBuilder {
         }
 
         if (file.exists()) {
-            if (file.canRead() == false) {
+            if (!file.canRead()) {
                 throw new PackagerException("Cannot read %s", file);
             }
         } else {
diff --git a/builder/src/main/java/com/android/builder/internal/signing/KeystoreHelper.java b/builder/src/main/java/com/android/builder/internal/signing/KeystoreHelper.java
index 05f609d..ad687b0 100644
--- a/builder/src/main/java/com/android/builder/internal/signing/KeystoreHelper.java
+++ b/builder/src/main/java/com/android/builder/internal/signing/KeystoreHelper.java
@@ -134,7 +134,7 @@ public final class KeystoreHelper {
             for (String arg : commandArray) {
                 boolean hasSpace = arg.indexOf(' ') != -1;
 
-                if (firstArg == true) {
+                if (firstArg) {
                     firstArg = false;
                 } else {
                     builder.append(' ');
@@ -155,11 +155,7 @@ public final class KeystoreHelper {
                     javaHome, builder.toString());
         }
 
-        if (result != 0) {
-            return false;
-        }
-
-        return true;
+        return result == 0;
     }
 
     public static SigningInfo getSigningInfo(
diff --git a/builder/src/main/java/com/android/builder/internal/signing/SignedJarBuilder.java b/builder/src/main/java/com/android/builder/internal/signing/SignedJarBuilder.java
index 21b385f..95e99f2 100644
--- a/builder/src/main/java/com/android/builder/internal/signing/SignedJarBuilder.java
+++ b/builder/src/main/java/com/android/builder/internal/signing/SignedJarBuilder.java
@@ -221,7 +221,7 @@ public class SignedJarBuilder {
                 }
 
                 // if we have a filter, we check the entry against it
-                if (filter != null && filter.checkEntry(name) == false) {
+                if (filter != null && !filter.checkEntry(name)) {
                     continue;
                 }
 
diff --git a/builder/src/test/java/com/android/builder/resources/BaseTestCase.java b/builder/src/test/java/com/android/builder/resources/BaseTestCase.java
index 73c6e20..a18d69c 100644
--- a/builder/src/test/java/com/android/builder/resources/BaseTestCase.java
+++ b/builder/src/test/java/com/android/builder/resources/BaseTestCase.java
@@ -39,9 +39,9 @@ public abstract class BaseTestCase extends TestCase {
      * the same number of items, otherwise it'll only checks that each resource key is present
      * in both maps.
      *
-     * @param resourceMap1
-     * @param resourceMap2
-     * @param fullCompare
+     * @param resourceMap1 the first resource Map
+     * @param resourceMap2 the second resource Map
+     * @param fullCompare whether a full compare is requested.
      */
     protected void compareResourceMaps(ResourceMap resourceMap1, ResourceMap resourceMap2,
                                        boolean fullCompare) {