Merge "Merge remote-tracking branch 'aosp/snapshot-master' into merge"

4 files changed, 43 insertions, 32 deletions

diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/InspectionGadgetsBundle.properties b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/InspectionGadgetsBundle.properties
index 694189a8ad01..f62b033c85c8 100644
--- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/InspectionGadgetsBundle.properties
+++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/InspectionGadgetsBundle.properties
@@ -2034,4 +2034,6 @@ inner.class.referenced.via.subclass.quickfix=Rationalize inner class access
 boolean.parameter.display.name='public' method with 'boolean' parameter
 boolean.parameter.problem.descriptor='public' method <code>#ref</code> with 'boolean' parameter
 boolean.parameters.problem.descriptor='public' method <code>#ref</code> with 'boolean' parameters
+boolean.parameter.constructor.problem.descriptor='public' constructor <code>#ref</code> with 'boolean' parameter
+boolean.parameters.constructor.problem.descriptor='public' constructor <code>#ref</code> with 'boolean' parameters
 boolean.parameter.only.report.multiple.option=Only report methods with multiple boolean parameters
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/abstraction/BooleanParameterInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/abstraction/BooleanParameterInspection.java
index 5513f421793b..d328f49b1cbf 100644
--- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/abstraction/BooleanParameterInspection.java
+++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/abstraction/BooleanParameterInspection.java
@@ -45,11 +45,17 @@ public class BooleanParameterInspection extends BaseInspection {
   @NotNull
   @Override
   protected String buildErrorString(Object... infos) {
-    if (((Integer)infos[0]).intValue() == 1) {
-      return InspectionGadgetsBundle.message("boolean.parameter.problem.descriptor");
+    final PsiMethod method = (PsiMethod)infos[0];
+    final int booleanParameterCount = ((Integer)infos[1]).intValue();
+    if (booleanParameterCount == 1) {
+      return method.isConstructor()
+             ? InspectionGadgetsBundle.message("boolean.parameter.constructor.problem.descriptor")
+             : InspectionGadgetsBundle.message("boolean.parameter.problem.descriptor");
     }
     else {
-      return InspectionGadgetsBundle.message("boolean.parameters.problem.descriptor");
+      return method.isConstructor()
+             ? InspectionGadgetsBundle.message("boolean.parameters.constructor.problem.descriptor")
+             : InspectionGadgetsBundle.message("boolean.parameters.problem.descriptor");
     }
   }
 
@@ -96,7 +102,7 @@ public class BooleanParameterInspection extends BaseInspection {
       if (count == 0 || onlyReportMultiple && count == 1) {
         return;
       }
-      registerMethodError(method, Integer.valueOf(count));
+      registerMethodError(method, method, Integer.valueOf(count));
     }
   }
 }
diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/IgnoreResultOfCallInspectionBase.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/IgnoreResultOfCallInspectionBase.java
index 7e197d9a167d..da52a98e6d70 100644
--- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/IgnoreResultOfCallInspectionBase.java
+++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/IgnoreResultOfCallInspectionBase.java
@@ -47,17 +47,28 @@ public class IgnoreResultOfCallInspectionBase extends BaseInspection {
   /**
    * @noinspection PublicField
    */
-  @NonNls public String callCheckString = "java.io.InputStream,read," +
-                                          "java.io.InputStream,skip," +
-                                          "java.lang.StringBuffer,toString," +
-                                          "java.lang.StringBuilder,toString," +
+  @NonNls public String callCheckString = "java.io.File,.*," +
+                                          "java.io.InputStream,read|skip|available|markSupported," +
+                                          "java.io.Writer,read|skip|ready|markSupported," +
+                                          "java.lang.Boolean,.*," +
+                                          "java.lang.Byte,.*," +
+                                          "java.lang.Character,.*," +
+                                          "java.lang.Double,.*," +
+                                          "java.lang.Float,.*," +
+                                          "java.lang.Integer,.*," +
+                                          "java.lang.Long,.*," +
+                                          "java.lang.Math,.*," +
+                                          "java.lang.Object,equals|hashCode|toString," +
+                                          "java.lang.Short,.*," +
+                                          "java.lang.StrictMath,.*," +
                                           "java.lang.String,.*," +
                                           "java.math.BigInteger,.*," +
                                           "java.math.BigDecimal,.*," +
                                           "java.net.InetAddress,.*," +
-                                          "java.io.File,.*," +
-                                          "java.lang.Object,equals|hashCode," +
-                                          "java.util.regex.Matcher,.*";
+                                          "java.net.URI,.*," +
+                                          "java.util.UUID,.*," +
+                                          "java.util.regex.Matcher,pattern|toMatchResult|start|end|group|groupCount|matches|find|lookingAt|quoteReplacement|replaceAll|replaceFirst|regionStart|regionEnd|hasTransparantBounds|hasAnchoringBounds|hitEnd|requireEnd," +
+                                          "java.util.regex.Pattern,.*";
   Map<String, Pattern> patternCache = null;
 
   public IgnoreResultOfCallInspectionBase() {
diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/initialization/StaticVariableInitializationInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/initialization/StaticVariableInitializationInspection.java
index 9886f1c01c57..a1497d80c46d 100644
--- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/initialization/StaticVariableInitializationInspection.java
+++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/initialization/StaticVariableInitializationInspection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2009 Dave Griffith, Bas Leijdekkers
+ * Copyright 2003-2013 Dave Griffith, Bas Leijdekkers
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,22 +44,18 @@ public class StaticVariableInitializationInspection extends BaseInspection {
   @Override
   @NotNull
   public String getDisplayName() {
-    return InspectionGadgetsBundle.message(
-      "static.variable.may.not.be.initialized.display.name");
+    return InspectionGadgetsBundle.message("static.variable.may.not.be.initialized.display.name");
   }
 
   @Override
   @NotNull
   public String buildErrorString(Object... infos) {
-    return InspectionGadgetsBundle.message(
-      "static.variable.may.not.be.initialized.problem.descriptor");
+    return InspectionGadgetsBundle.message("static.variable.may.not.be.initialized.problem.descriptor");
   }
 
   @Override
   public JComponent createOptionsPanel() {
-    return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message(
-      "primitive.fields.ignore.option"),
-                                          this, "m_ignorePrimitives");
+    return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message("primitive.fields.ignore.option"), this, "m_ignorePrimitives");
   }
 
   @Override
@@ -77,17 +73,14 @@ public class StaticVariableInitializationInspection extends BaseInspection {
 
     @Override
     public void visitField(@NotNull PsiField field) {
-      if (!field.hasModifierProperty(PsiModifier.STATIC)) {
+      if (!field.hasModifierProperty(PsiModifier.STATIC) || field.hasModifierProperty(PsiModifier.FINAL)) {
         return;
       }
       if (field.getInitializer() != null) {
         return;
       }
       final PsiClass containingClass = field.getContainingClass();
-      if (containingClass == null) {
-        return;
-      }
-      if (containingClass.isEnum()) {
+      if (containingClass == null || containingClass.isEnum()) {
         return;
       }
       if (m_ignorePrimitives) {
@@ -96,15 +89,14 @@ public class StaticVariableInitializationInspection extends BaseInspection {
           return;
         }
       }
-      final PsiClassInitializer[] initializers =
-        containingClass.getInitializers();
+      final PsiClassInitializer[] initializers = containingClass.getInitializers();
       for (final PsiClassInitializer initializer : initializers) {
-        if (initializer.hasModifierProperty(PsiModifier.STATIC)) {
-          final PsiCodeBlock body = initializer.getBody();
-          if (InitializationUtils.blockAssignsVariableOrFails(body,
-                                                              field)) {
-            return;
-          }
+        if (!initializer.hasModifierProperty(PsiModifier.STATIC)) {
+          continue;
+        }
+        final PsiCodeBlock body = initializer.getBody();
+        if (InitializationUtils.blockAssignsVariableOrFails(body, field)) {
+          return;
         }
       }
       registerFieldError(field);