Bump odlparent to 3.0.0-SNAPSHOT and fix breakages

[yangtools.git] / common / checkstyle-logging / src / main / java / org / opendaylight / yangtools / checkstyle / LoggerDeclarationsCountCheck.java

diff --git a/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/LoggerDeclarationsCountCheck.java b/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/LoggerDeclarationsCountCheck.java
index 51bbe3e06e10ab27b1424cf36ff080abe208a724..f16dae6dd93dad466923115b7afd320c7be93b8f 100644 (file)
--- a/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/LoggerDeclarationsCountCheck.java
+++ b/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/LoggerDeclarationsCountCheck.java
@@ -10,35 +10,46 @@ package org.opendaylight.yangtools.checkstyle;
 
 import static org.opendaylight.yangtools.checkstyle.CheckLoggingUtil.isAFieldVariable;
 
-import com.puppycrawl.tools.checkstyle.api.Check;
+import com.puppycrawl.tools.checkstyle.api.AbstractCheck;
 import com.puppycrawl.tools.checkstyle.api.DetailAST;
 import com.puppycrawl.tools.checkstyle.api.TokenTypes;
 
-public class LoggerDeclarationsCountCheck extends Check {
+public class LoggerDeclarationsCountCheck extends AbstractCheck {
 
     private static final String LOG_MESSAGE = "Logger might be declared only once.";
+    private static final int[] TOKENS = { TokenTypes.VARIABLE_DEF };
+
     private String prevClassName = "";
 
     @Override
     public int[] getDefaultTokens() {
-        return new int[]{TokenTypes.VARIABLE_DEF};
+        return TOKENS;
+    }
+
+    @Override
+    public int[] getAcceptableTokens() {
+        return TOKENS;
     }
 
     @Override
-    public void visitToken(DetailAST aAST) {
-        if (CheckLoggingUtil.isLoggerType(aAST) && isAFieldVariable(aAST)) {
-            final String className = CheckLoggingUtil.getClassName(aAST);
-            if(this.prevClassName.equals(className)) {
-                log(aAST.getLineNo(), LOG_MESSAGE);
+    public int[] getRequiredTokens() {
+        return TOKENS;
+    }
+
+    @Override
+    public void visitToken(final DetailAST ast) {
+        if (CheckLoggingUtil.isLoggerType(ast) && isAFieldVariable(ast)) {
+            final String className = CheckLoggingUtil.getClassName(ast);
+            if (this.prevClassName.equals(className)) {
+                log(ast.getLineNo(), LOG_MESSAGE);
             }
             this.prevClassName = className;
         }
     }
 
     @Override
-    public void finishTree(DetailAST aRootAST) {
-        super.finishTree(aRootAST);
+    public void finishTree(final DetailAST rootAST) {
+        super.finishTree(rootAST);
         this.prevClassName = "";
     }
-
 }