From 7e2a11bb0eaa6378e44636286bea50f9999bca84 Mon Sep 17 00:00:00 2001
From: Bas Leijdekkers <basleijdekkers@gmail.com>
Date: Tue, 10 Jun 2008 16:42:00 +0400
Subject: [PATCH] rollback BaseInspection change

---
 .../src/com/siyeh/ig/BaseInspection.java           | 23 +++++++++-------------
 ...ogStatementGuardedByLogConditionInspection.java |  7 +++++--
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/BaseInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/BaseInspection.java
index b6bcb5bfb1..54b004b39f 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/BaseInspection.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/BaseInspection.java
@@ -38,7 +38,6 @@ import java.text.ParseException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Collection;
 
 public abstract class BaseInspection extends BaseJavaLocalInspectionTool {
 
@@ -192,20 +191,20 @@ public abstract class BaseInspection extends BaseJavaLocalInspectionTool {
         return null;
     }
 
-    protected static void parseString(String string, Collection<String>... outs){
+    protected static void parseString(String string, List<String>... outs){
         final String[] strings = string.split(",");
-        for (Collection<String> out : outs) {
+        for (List<String> out : outs) {
             out.clear();
         }
         for (int i = 0; i < strings.length; i += outs.length) {
             for (int j = 0; j < outs.length; j++) {
-                final Collection<String> out = outs[j];
+                final List<String> out = outs[j];
                 out.add(strings[i + j]);
             }
         }
     }
 
-    protected static String formatString(Collection<String>... strings){
+    protected static String formatString(List<String>... strings){
         final StringBuilder buffer = new StringBuilder();
         final int size = strings[0].size();
         if (size > 0) {
@@ -218,16 +217,12 @@ public abstract class BaseInspection extends BaseJavaLocalInspectionTool {
         return buffer.toString();
     }
 
-    private static void formatString(Collection<String>[] strings, int index,
+    private static void formatString(List<String>[] strings, int index,
                                      StringBuilder out) {
-        boolean comma = false;
-        for (Collection<String> string : strings) {
-            if (!comma) {
-                comma = true;
-            } else {
-                out.append(',');
-            }
-            out.append(string);
+        out.append(strings[0].get(index));
+        for (int i = 1; i < strings.length; i++) {
+            out.append(',');
+            out.append(strings[i].get(index));
         }
     }
 }
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/logging/LogStatementGuardedByLogConditionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/logging/LogStatementGuardedByLogConditionInspection.java
index 912d72cd5b..18dc7fc26c 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/logging/LogStatementGuardedByLogConditionInspection.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/logging/LogStatementGuardedByLogConditionInspection.java
@@ -72,8 +72,8 @@ public class LogStatementGuardedByLogConditionInspection
                 loggerMethodAndconditionMethodTextMap.keySet();
         final Collection<String> conditionMethodNames =
                 loggerMethodAndconditionMethodTextMap.values();
-        loggerMethodAndconditionMethodNames = formatString(loggerMethodNames,
-                conditionMethodNames);
+        //loggerMethodAndconditionMethodNames = formatString(loggerMethodNames,
+        //        conditionMethodNames);
         super.writeSettings(element);
     }
 
@@ -142,6 +142,9 @@ public class LogStatementGuardedByLogConditionInspection
                     JavaPsiFacade.getInstance(project).getElementFactory();
             final PsiExpression qualifier =
                     methodExpression.getQualifierExpression();
+            if (qualifier == null) {
+                return;
+            }
             final StringBuilder ifStatementText = new StringBuilder("if (");
             ifStatementText.append(qualifier.getText());
             ifStatementText.append('.');
-- 
2.11.4.GIT