Fix violations

6 files changed, 21 insertions, 16 deletions

diff --git a/sonar-duplications/src/main/java/net/sourceforge/pmd/cpd/AbstractLanguage.java b/sonar-duplications/src/main/java/net/sourceforge/pmd/cpd/AbstractLanguage.java
index e3927589e67..7237e68d2e1 100644
--- a/sonar-duplications/src/main/java/net/sourceforge/pmd/cpd/AbstractLanguage.java
+++ b/sonar-duplications/src/main/java/net/sourceforge/pmd/cpd/AbstractLanguage.java
@@ -35,6 +35,7 @@ public abstract class AbstractLanguage implements Language {
   /**
    * @deprecated in 2.14, seems that not used in Sonar ecosystem - we don't scan directories.
    */
+  @Deprecated
   public FilenameFilter getFileFilter() {
     return fileFilter;
   }
diff --git a/sonar-duplications/src/main/java/net/sourceforge/pmd/cpd/Language.java b/sonar-duplications/src/main/java/net/sourceforge/pmd/cpd/Language.java
index 12009cd6d0e..6b1e11c643c 100644
--- a/sonar-duplications/src/main/java/net/sourceforge/pmd/cpd/Language.java
+++ b/sonar-duplications/src/main/java/net/sourceforge/pmd/cpd/Language.java
@@ -29,7 +29,8 @@ public interface Language {
 
   String fileSeparator = System.getProperty("file.separator");
 
-  public Tokenizer getTokenizer();
+  Tokenizer getTokenizer();
+
+  FilenameFilter getFileFilter();
 
-  public FilenameFilter getFileFilter();
 }
diff --git a/sonar-duplications/src/main/java/net/sourceforge/pmd/cpd/TokenEntry.java b/sonar-duplications/src/main/java/net/sourceforge/pmd/cpd/TokenEntry.java
index 1976cefa619..fe1ef9e3f0c 100644
--- a/sonar-duplications/src/main/java/net/sourceforge/pmd/cpd/TokenEntry.java
+++ b/sonar-duplications/src/main/java/net/sourceforge/pmd/cpd/TokenEntry.java
@@ -28,6 +28,9 @@ import java.util.Map;
 
 public class TokenEntry implements Comparable<TokenEntry> {
 
+  private final static Map<String, Integer> TOKENS = new HashMap<String, Integer>();
+  private static int tokenCount = 0;
+
   public static final TokenEntry EOF = new TokenEntry();
 
   private String tokenSrcID;
@@ -36,34 +39,31 @@ public class TokenEntry implements Comparable<TokenEntry> {
   private int identifier;
   private int hashCode;
 
-  private final static Map<String, Integer> Tokens = new HashMap<String, Integer>();
-  private static int TokenCount = 0;
-
   private TokenEntry() {
     this.identifier = 0;
     this.tokenSrcID = "EOFMarker";
   }
 
   public TokenEntry(String image, String tokenSrcID, int beginLine) {
-    Integer i = Tokens.get(image);
+    Integer i = TOKENS.get(image);
     if (i == null) {
-      i = Tokens.size() + 1;
-      Tokens.put(image, i);
+      i = TOKENS.size() + 1;
+      TOKENS.put(image, i);
     }
     this.identifier = i.intValue();
     this.tokenSrcID = tokenSrcID;
     this.beginLine = beginLine;
-    this.index = TokenCount++;
+    this.index = tokenCount++;
   }
 
   public static TokenEntry getEOF() {
-    TokenCount++;
+    tokenCount++;
     return EOF;
   }
 
   public static void clearImages() {
-    Tokens.clear();
-    TokenCount = 0;
+    TOKENS.clear();
+    tokenCount = 0;
   }
 
   public String getTokenSrcID() {
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/security/GroupRole.java b/sonar-plugin-api/src/main/java/org/sonar/api/security/GroupRole.java
index 3e4379e574b..16f750b02db 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/security/GroupRole.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/security/GroupRole.java
@@ -19,6 +19,7 @@
  */
 package org.sonar.api.security;
 
+import com.google.common.base.Objects;
 import org.apache.commons.lang.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang.builder.ToStringStyle;
 import org.sonar.api.database.BaseIdentifiable;
@@ -81,7 +82,7 @@ public class GroupRole extends BaseIdentifiable {
   }
 
   public boolean isAnyone() {
-    return groupId==ANYONE_GROUP_ID;
+    return Objects.equal(groupId, ANYONE_GROUP_ID);
   }
 
   @Override
diff --git a/sonar-server/src/main/java/org/sonar/server/charts/deprecated/BarChart.java b/sonar-server/src/main/java/org/sonar/server/charts/deprecated/BarChart.java
index e06f9025e9b..41ddae8886e 100644
--- a/sonar-server/src/main/java/org/sonar/server/charts/deprecated/BarChart.java
+++ b/sonar-server/src/main/java/org/sonar/server/charts/deprecated/BarChart.java
@@ -111,7 +111,10 @@ public class BarChart extends BaseChartWeb implements DeprecatedChart {
   protected void applyCommomParamsBar() {
     // -- Plot
     CategoryPlot plot = jfreechart.getCategoryPlot();
-    plot.setOrientation(BaseChartWeb.BAR_CHART_VERTICAL.equals(params.get(BaseChartWeb.CHART_PARAM_TYPE)) || BaseChartWeb.BAR_CHART_VERTICAL_CUSTOM.equals(params.get(BaseChartWeb.CHART_PARAM_TYPE)) ? PlotOrientation.VERTICAL : PlotOrientation.HORIZONTAL);
+    plot.setOrientation(BaseChartWeb.BAR_CHART_VERTICAL.equals(params.get(BaseChartWeb.CHART_PARAM_TYPE))
+      || BaseChartWeb.BAR_CHART_VERTICAL_CUSTOM.equals(params.get(BaseChartWeb.CHART_PARAM_TYPE)) ?
+        PlotOrientation.VERTICAL :
+        PlotOrientation.HORIZONTAL);
     plot.setOutlineVisible("y".equals(params.get(BaseChartWeb.CHART_PARAM_OUTLINE_VISIBLE)));
     plot.setRangeGridlinesVisible("y".equals(params.get(BaseChartWeb.CHART_PARAM_OUTLINE_RANGEGRIDLINES_VISIBLE)));
     String insetsParam = params.get(CHART_PARAM_INSETS);
diff --git a/sonar-server/src/main/java/org/sonar/server/ui/CompatibilityRealm.java b/sonar-server/src/main/java/org/sonar/server/ui/CompatibilityRealm.java
index 77ef6b6140f..38bcdeee136 100644
--- a/sonar-server/src/main/java/org/sonar/server/ui/CompatibilityRealm.java
+++ b/sonar-server/src/main/java/org/sonar/server/ui/CompatibilityRealm.java
@@ -19,12 +19,11 @@
  */
 package org.sonar.server.ui;
 
-import org.sonar.api.CoreProperties;
 import org.sonar.api.security.LoginPasswordAuthenticator;
 import org.sonar.api.security.SecurityRealm;
 
 /**
- * Provides backward compatibility for {@link CoreProperties#CORE_AUTHENTICATOR_CLASS}.
+ * Provides backward compatibility for {@link org.sonar.api.CoreProperties#CORE_AUTHENTICATOR_CLASS}.
  *
  * @since 2.14
  */