Conform to our own Checkstyle rules in checkstyle-logging utility

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

diff --git a/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/LoggerVariableModifiersCheck.java b/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/LoggerVariableModifiersCheck.java
index e3ef112f18cd51bbeaee489e2a61f092b27a7cb3..2076d44381510160f748dbce6863381beae12fa4 100644 (file)
--- a/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/LoggerVariableModifiersCheck.java
+++ b/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/LoggerVariableModifiersCheck.java
@@ -22,19 +22,18 @@ public class LoggerVariableModifiersCheck extends Check {
     }
 
     @Override
-    public void visitToken(DetailAST aAST) {
-        if (CheckLoggingUtil.itsAFieldVariable(aAST) && CheckLoggingUtil.isLoggerType(aAST) && !hasPrivatStaticFinalModifier(aAST)) {
-            log(aAST.getLineNo(), LOG_MESSAGE);
+    public void visitToken(DetailAST ast) {
+        if (CheckLoggingUtil.isAFieldVariable(ast) && CheckLoggingUtil.isLoggerType(ast)
+                && !hasPrivatStaticFinalModifier(ast)) {
+            log(ast.getLineNo(), LOG_MESSAGE);
         }
     }
 
-    private boolean hasPrivatStaticFinalModifier(DetailAST aAST) {
-        DetailAST modifiers = aAST.findFirstToken(TokenTypes.MODIFIERS);
-        if(modifiers != null) {
-            if(modifiers.branchContains(TokenTypes.LITERAL_PRIVATE) && modifiers.branchContains(TokenTypes.LITERAL_STATIC)
-                    && modifiers.branchContains(TokenTypes.FINAL)) {
-                return true;
-            }
+    private boolean hasPrivatStaticFinalModifier(DetailAST ast) {
+        DetailAST modifiers = ast.findFirstToken(TokenTypes.MODIFIERS);
+        if (modifiers != null && modifiers.branchContains(TokenTypes.LITERAL_PRIVATE)
+                && modifiers.branchContains(TokenTypes.LITERAL_STATIC) && modifiers.branchContains(TokenTypes.FINAL)) {
+            return true;
         }
         return false;
     }