Merge pull request #3 from fartem/1.2.1

2021-04-07 Version 1.2.1: Refactored AndroidViewFieldNameCheck and up…

Author: fartem

build.gradle

@@ -1,14 +1,14 @@
 plugins {
     id 'java'
     id 'checkstyle'
-    id 'de.aaschmid.cpd' version '3.1'
+    id 'de.aaschmid.cpd' version '3.2'
 }
 
 group 'com.smlnskgmail.jaman.checkstyle'
-version '1.2.0'
+version '1.2.1'
 
 checkstyle {
-    toolVersion '8.38'
+    toolVersion '8.41.1'
     ignoreFailures false
     showViolations true
 
@@ -44,5 +44,5 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.puppycrawl.tools:checkstyle:8.38'
+    implementation 'com.puppycrawl.tools:checkstyle:8.41.1'
 }

src/main/java/com/smlnskgmail/jaman/checkstyle/checks/AndroidViewFieldNameCheck.java

@@ -13,74 +13,75 @@ public void visitToken(DetailAST ast) {
         DetailAST identifier = ast.findFirstToken(TokenTypes.TYPE).findFirstToken(TokenTypes.IDENT);
         if (identifier != null) {
             String fieldClassName = identifier.getText();
+            String ident = ast.findFirstToken(TokenTypes.IDENT).getText();
             switch (fieldClassName) {
                 case "LinearLayout":
-                    if (!ast.findFirstToken(TokenTypes.IDENT).getText().startsWith("lv")) {
+                    if (!ident.startsWith("lv")) {
                         log(ast);
                     }
                     break;
                 case "RelativeLayout":
-                    if (!ast.findFirstToken(TokenTypes.IDENT).getText().startsWith("rl")) {
+                    if (!ident.startsWith("rl")) {
                         log(ast);
                     }
                     break;
                 case "ConstraintLayout":
-                    if (!ast.findFirstToken(TokenTypes.IDENT).getText().startsWith("cl")) {
+                    if (!ident.startsWith("cl")) {
                         log(ast);
                     }
                     break;
                 case "FrameLayout":
-                    if (!ast.findFirstToken(TokenTypes.IDENT).getText().startsWith("fl")) {
+                    if (!ident.startsWith("fl")) {
                         log(ast);
                     }
                     break;
                 case "ScrollView":
-                    if (!ast.findFirstToken(TokenTypes.IDENT).getText().startsWith("sv")) {
+                    if (!ident.startsWith("sv")) {
                         log(ast);
                     }
                     break;
                 case "HorizontalScrollView":
-                    if (!ast.findFirstToken(TokenTypes.IDENT).getText().startsWith("hsv")) {
+                    if (!ident.startsWith("hsv")) {
                         log(ast);
                     }
                     break;
                 case "TextView":
-                    if (!ast.findFirstToken(TokenTypes.IDENT).getText().startsWith("tv")) {
+                    if (!ident.startsWith("tv")) {
                         log(ast);
                     }
                     break;
                 case "ImageView":
-                    if (!ast.findFirstToken(TokenTypes.IDENT).getText().startsWith("iv")) {
+                    if (!ident.startsWith("iv")) {
                         log(ast);
                     }
                     break;
                 case "ImageButton":
-                    if (!ast.findFirstToken(TokenTypes.IDENT).getText().startsWith("ib")) {
+                    if (!ident.startsWith("ib")) {
                         log(ast);
                     }
                     break;
                 case "EditText":
-                    if (!ast.findFirstToken(TokenTypes.IDENT).getText().startsWith("et")) {
+                    if (!ident.startsWith("et")) {
                         log(ast);
                     }
                     break;
                 case "Button":
-                    if (!ast.findFirstToken(TokenTypes.IDENT).getText().startsWith("btn")) {
+                    if (!ident.startsWith("btn")) {
                         log(ast);
                     }
                     break;
                 case "RecyclerView":
-                    if (!ast.findFirstToken(TokenTypes.IDENT).getText().startsWith("rv")) {
+                    if (!ident.startsWith("rv")) {
                         log(ast);
                     }
                     break;
                 case "AdaptiveRecyclerView":
-                    if (!ast.findFirstToken(TokenTypes.IDENT).getText().startsWith("arv")) {
+                    if (!ident.startsWith("arv")) {
                         log(ast);
                     }
                     break;
                 case "FloatingActionButton":
-                    if (!ast.findFirstToken(TokenTypes.IDENT).getText().startsWith("fab")) {
+                    if (!ident.startsWith("fab")) {
                         log(ast);
                     }
                     break;