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

1 files changed, 10 insertions, 4 deletions

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));
     }
   }
 }