Fix some quality flaws

6 files changed, 18 insertions, 23 deletions

diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/TendencyAnalyser.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/TendencyAnalyser.java
index 995afdc29bf..4277f9d7bd0 100644
--- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/TendencyAnalyser.java
+++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/TendencyAnalyser.java
@@ -23,11 +23,11 @@ import java.util.List;
 
 public class TendencyAnalyser {
 
-  public final static Integer TENDENCY_BIG_UP = 2;
-  public final static Integer TENDENCY_UP = 1;
-  public final static Integer TENDENCY_NEUTRAL = 0;
-  public final static Integer TENDENCY_DOWN = -1;
-  public final static Integer TENDENCY_BIG_DOWN = -2;
+  public static final Integer TENDENCY_BIG_UP = 2;
+  public static final Integer TENDENCY_UP = 1;
+  public static final Integer TENDENCY_NEUTRAL = 0;
+  public static final Integer TENDENCY_DOWN = -1;
+  public static final Integer TENDENCY_BIG_DOWN = -2;
 
   public Integer analyseLevel(List<Double> values) {
     TendencyAnalyser.SlopeData slopeData = analyse(values);
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 bda1bd7cd6e..dcdcc76a3f4 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,7 +23,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 public final class FindbugsCategory {
-  private final static Map<String, String> FINDBUGS_TO_SONAR = new HashMap<String, String>();
+  private static final Map<String, String> FINDBUGS_TO_SONAR = new HashMap<String, String>();
 
   static {
     FINDBUGS_TO_SONAR.put("BAD_PRACTICE", "Bad practice");
diff --git a/plugins/sonar-jacoco-plugin/src/main/java/org/sonar/plugins/jacoco/JacocoAntInitializer.java b/plugins/sonar-jacoco-plugin/src/main/java/org/sonar/plugins/jacoco/JacocoAntInitializer.java
index 2c3dc35afaf..fcbb63f294c 100644
--- a/plugins/sonar-jacoco-plugin/src/main/java/org/sonar/plugins/jacoco/JacocoAntInitializer.java
+++ b/plugins/sonar-jacoco-plugin/src/main/java/org/sonar/plugins/jacoco/JacocoAntInitializer.java
@@ -106,7 +106,7 @@ public class JacocoAntInitializer extends Initializer implements CoverageExtensi
 
   }
 
-  private static abstract class TaskEnhancer {
+  private abstract static class TaskEnhancer {
     /**
      * @param task Task instance to enhance
      * @return <code>true</code> if this enhancer is capable of enhancing the requested task
diff --git a/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/java/ast/visitor/PublicApiVisitor.java b/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/java/ast/visitor/PublicApiVisitor.java
index 94d96dd4c10..bf2a3c5bed0 100644
--- a/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/java/ast/visitor/PublicApiVisitor.java
+++ b/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/java/ast/visitor/PublicApiVisitor.java
@@ -19,21 +19,16 @@
  */
 package org.sonar.java.ast.visitor;
 
-import java.util.Arrays;
-import java.util.List;
-
+import com.puppycrawl.tools.checkstyle.api.*;
 import org.sonar.squid.api.SourceCode;
 import org.sonar.squid.measures.Metric;
 
-import com.puppycrawl.tools.checkstyle.api.AnnotationUtility;
-import com.puppycrawl.tools.checkstyle.api.DetailAST;
-import com.puppycrawl.tools.checkstyle.api.FileContents;
-import com.puppycrawl.tools.checkstyle.api.Scope;
-import com.puppycrawl.tools.checkstyle.api.TokenTypes;
+import java.util.Arrays;
+import java.util.List;
 
 public class PublicApiVisitor extends JavaAstVisitor {
 
-  final static String OVERRIDE_ANNOTATION_KEYWORD = "Override";
+  static final String OVERRIDE_ANNOTATION_KEYWORD = "Override";
 
   public static final List<Integer> TOKENS = Arrays.asList(TokenTypes.CLASS_DEF, TokenTypes.INTERFACE_DEF, TokenTypes.METHOD_DEF,
       TokenTypes.CTOR_DEF, TokenTypes.ANNOTATION_DEF, TokenTypes.ANNOTATION_FIELD_DEF, TokenTypes.VARIABLE_DEF);
diff --git a/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/java/ast/visitor/SuppressWarningsAnnotationUtils.java b/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/java/ast/visitor/SuppressWarningsAnnotationUtils.java
index c0413ddf322..fb2c20174de 100644
--- a/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/java/ast/visitor/SuppressWarningsAnnotationUtils.java
+++ b/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/java/ast/visitor/SuppressWarningsAnnotationUtils.java
@@ -29,9 +29,9 @@ import com.puppycrawl.tools.checkstyle.api.TokenTypes;
  */
 public final class SuppressWarningsAnnotationUtils {
 
-  private final static String SUPPRESS_WARNINGS_ANNOTATION_NAME = "SuppressWarnings";
-  private final static String SUPPRESS_WARNINGS_ANNOTATION_FQ_NAME = "java.lang." + SUPPRESS_WARNINGS_ANNOTATION_NAME;
-  private final static String VALUE = "\"all\"";
+  private static final String SUPPRESS_WARNINGS_ANNOTATION_NAME = "SuppressWarnings";
+  private static final String SUPPRESS_WARNINGS_ANNOTATION_FQ_NAME = "java.lang." + SUPPRESS_WARNINGS_ANNOTATION_NAME;
+  private static final String VALUE = "\"all\"";
 
   public static boolean isSuppressAllWarnings(DetailAST ast) {
     DetailAST suppressWarningsAnnotation = getSuppressWarningsAnnotation(ast);
diff --git a/plugins/sonar-surefire-plugin/src/main/java/org/sonar/plugins/surefire/data/UnitTestResult.java b/plugins/sonar-surefire-plugin/src/main/java/org/sonar/plugins/surefire/data/UnitTestResult.java
index 63cbe164a2c..17b8f8a26f2 100644
--- a/plugins/sonar-surefire-plugin/src/main/java/org/sonar/plugins/surefire/data/UnitTestResult.java
+++ b/plugins/sonar-surefire-plugin/src/main/java/org/sonar/plugins/surefire/data/UnitTestResult.java
@@ -22,10 +22,10 @@ package org.sonar.plugins.surefire.data;
 import org.apache.commons.lang.StringEscapeUtils;
 
 public final class UnitTestResult {
-  public final static String STATUS_OK = "ok";
-  public final static String STATUS_ERROR = "error";
-  public final static String STATUS_FAILURE = "failure";
-  public final static String STATUS_SKIPPED = "skipped";
+  public static final String STATUS_OK = "ok";
+  public static final String STATUS_ERROR = "error";
+  public static final String STATUS_FAILURE = "failure";
+  public static final String STATUS_SKIPPED = "skipped";
 
   private String name, status, stackTrace, message;
   private long durationMilliseconds = 0L;