Fix violations

4 files changed, 12 insertions, 16 deletions

diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/NewViolationsDecorator.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/NewViolationsDecorator.java
index 4b13744f4a0..e603fb1f129 100644
--- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/NewViolationsDecorator.java
+++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/NewViolationsDecorator.java
@@ -32,7 +32,6 @@ import org.sonar.api.rules.RulePriority;
 import org.sonar.api.rules.Violation;
 import org.sonar.batch.components.PastSnapshot;
 import org.sonar.batch.components.TimeMachineConfiguration;
-import org.sonar.core.NotDryRun;
 
 import java.util.*;
 
diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/VariationDecorator.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/VariationDecorator.java
index a1c9d5236b1..cb10c34d886 100644
--- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/VariationDecorator.java
+++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/VariationDecorator.java
@@ -19,7 +19,6 @@
  */
 package org.sonar.plugins.core.timemachine;
 
-import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import org.apache.commons.lang.StringUtils;
 import org.sonar.api.CoreProperties;
diff --git a/plugins/sonar-findbugs-plugin/src/main/java/org/sonar/plugins/findbugs/FindbugsCategory.java b/plugins/sonar-findbugs-plugin/src/main/java/org/sonar/plugins/findbugs/FindbugsCategory.java
index d6db5e209cc..d74f90c74cd 100644
--- a/plugins/sonar-findbugs-plugin/src/main/java/org/sonar/plugins/findbugs/FindbugsCategory.java
+++ b/plugins/sonar-findbugs-plugin/src/main/java/org/sonar/plugins/findbugs/FindbugsCategory.java
@@ -23,24 +23,24 @@ import java.util.HashMap;
 import java.util.Map;
 
 public final class FindbugsCategory {
-  private final static Map<String, String> findbugsToSonar = new HashMap<String, String>();
+  private final static Map<String, String> FINDBUGS_TO_SONAR = new HashMap<String, String>();
 
   static {
-    findbugsToSonar.put("BAD_PRACTICE", "Bad practice");
-    findbugsToSonar.put("CORRECTNESS", "Correctness");
-    findbugsToSonar.put("MT_CORRECTNESS", "Multithreaded correctness");
-    findbugsToSonar.put("I18N", "Internationalization");
-    findbugsToSonar.put("EXPERIMENTAL", "Experimental");
-    findbugsToSonar.put("MALICIOUS_CODE", "Malicious code");
-    findbugsToSonar.put("PERFORMANCE", "Performance");
-    findbugsToSonar.put("SECURITY", "Security");
-    findbugsToSonar.put("STYLE", "Style");
+    FINDBUGS_TO_SONAR.put("BAD_PRACTICE", "Bad practice");
+    FINDBUGS_TO_SONAR.put("CORRECTNESS", "Correctness");
+    FINDBUGS_TO_SONAR.put("MT_CORRECTNESS", "Multithreaded correctness");
+    FINDBUGS_TO_SONAR.put("I18N", "Internationalization");
+    FINDBUGS_TO_SONAR.put("EXPERIMENTAL", "Experimental");
+    FINDBUGS_TO_SONAR.put("MALICIOUS_CODE", "Malicious code");
+    FINDBUGS_TO_SONAR.put("PERFORMANCE", "Performance");
+    FINDBUGS_TO_SONAR.put("SECURITY", "Security");
+    FINDBUGS_TO_SONAR.put("STYLE", "Style");
   }
 
   public static String findbugsToSonar(String findbugsCategKey) {
-    return findbugsToSonar.get(findbugsCategKey);
+    return FINDBUGS_TO_SONAR.get(findbugsCategKey);
   }
 
   private FindbugsCategory() {
   }
-}
\ No newline at end of file
+}
diff --git a/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/plugins/squid/bridges/NoSonarFilterLoader.java b/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/plugins/squid/bridges/NoSonarFilterLoader.java
index e73de853a8a..0fa8fd0e05b 100644
--- a/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/plugins/squid/bridges/NoSonarFilterLoader.java
+++ b/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/plugins/squid/bridges/NoSonarFilterLoader.java
@@ -42,9 +42,7 @@ public class NoSonarFilterLoader extends Bridge {
   @Override
   public void onFile(SourceFile squidFile, Resource sonarFile) {
     if (noSonarFilter != null) {
-      // lines with NOSONAR tag
       Set<Integer> ignoredLines = new HashSet<Integer>(squidFile.getNoSonarTagLines());
-      // classes and methods with annotation SuppressWarnings
       new SquidVisitorNotifier(squidFile, new SuppressWarningsVisitor(ignoredLines)).notifyVisitors();
 
       noSonarFilter.addResource(sonarFile, ignoredLines);