Issue #4845: removed usage of TokenTypes from inputs

checkstyle · Mar 12, 2022 · 506496c · 506496c
1 parent 5e43145
commit 506496c
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 35 deletions.
diff --git a/...ools/checkstyle/checks/coding/declarationorder/InputDeclarationOrderForwardReference.java b/...ools/checkstyle/checks/coding/declarationorder/InputDeclarationOrderForwardReference.java
@@ -11,7 +11,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import com.puppycrawl.tools.checkstyle.api.TokenTypes;
+import java.util.Calendar;
 
 public class InputDeclarationOrderForwardReference {
 
@@ -34,7 +34,7 @@ public class InputDeclarationOrderForwardReference {
     private static final String COMMON_PART = "common_part";
     public static final String FIRST = COMMON_PART + "2";
 
-    private static final String SECOND = String.valueOf(TokenTypes.ELIST) + FIRST;
+    private static final String SECOND = String.valueOf(Calendar.MONDAY) + FIRST;
     public static final String THIRD = FIRST;
 
     private static int ID = 5;

diff --git a/...heckstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexityAnnotations.java b/...heckstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexityAnnotations.java
@@ -23,12 +23,12 @@
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
 
-import com.puppycrawl.tools.checkstyle.api.TokenTypes;
+import java.util.Calendar;
 
 /* This input file is intended to be used on strict configuration: max=0 */
 public class InputClassFanOutComplexityAnnotations { // violation
 
-    private int tokenType = TokenTypes.EXPR;
+    private int dayOfWeek = Calendar.MONDAY;
 
     public void foo1(@TypeAnnotation char a) {}
 
@@ -82,10 +82,10 @@ class OuterClass { // violation
 
     private static final String value = "4";
 
-    @TwoParametersAnnotation(value = "4", tokenType = 1)
+    @TwoParametersAnnotation(value = "4", dayOfWeek = 1)
     public static final String EMPTY_STRING = "";
 
-    @TwoParametersAnnotation(value = value, tokenType = TokenTypes.ANNOTATION)
+    @TwoParametersAnnotation(value = value, dayOfWeek = Calendar.TUESDAY)
     public static final String TAB = "\t";
 
 }
@@ -108,6 +108,6 @@ interface MyInterface {}
 
     String value();
 
-    int tokenType();
+    int dayOfWeek();
 
 }
diff --git a/...ckstyle/checks/whitespace/nowhitespaceafter/InputNoWhitespaceAfterArrayDeclarations2.java b/...ckstyle/checks/whitespace/nowhitespaceafter/InputNoWhitespaceAfterArrayDeclarations2.java
@@ -10,7 +10,7 @@
 
 import java.util.List;
 
-import com.puppycrawl.tools.checkstyle.api.TokenTypes;
+
 
 public class InputNoWhitespaceAfterArrayDeclarations2
 {

diff --git a/...hitespace/nowhitespacebeforecasedefaultcolon/InputNoWhitespaceBeforeCaseDefaultColon.java b/...hitespace/nowhitespacebeforecasedefaultcolon/InputNoWhitespaceBeforeCaseDefaultColon.java
@@ -7,7 +7,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.whitespace.nowhitespacebeforecasedefaultcolon;
 
-import com.puppycrawl.tools.checkstyle.api.TokenTypes;
+import java.util.Calendar;
 
 public class InputNoWhitespaceBeforeCaseDefaultColon {
     {
@@ -62,10 +62,10 @@ public class InputNoWhitespaceBeforeCaseDefaultColon {
                 break;
         }
 
-        switch (TokenTypes.ABSTRACT) {
-            case TokenTypes.TYPECAST : // violation
+        switch (Calendar.MONDAY) {
+            case Calendar.TUESDAY    : // violation
                 break;
-            case TokenTypes.ARRAY_DECLARATOR:
+            case Calendar.WEDNESDAY:
                 break;
             default:
                 break;

diff --git a/...checkstyle/meta/javadocmetadatascraper/InputJavadocMetadataScraperAbstractSuperCheck.java b/...checkstyle/meta/javadocmetadatascraper/InputJavadocMetadataScraperAbstractSuperCheck.java
@@ -12,9 +12,9 @@
 
 import com.puppycrawl.tools.checkstyle.FileStatefulCheck;
 import com.puppycrawl.tools.checkstyle.api.AbstractCheck;
-import com.puppycrawl.tools.checkstyle.api.DetailAST;
-import com.puppycrawl.tools.checkstyle.api.TokenTypes;
-import com.puppycrawl.tools.checkstyle.utils.ScopeUtil;
+
+
+
 
 /** //violation
  * <p>

diff --git a/...style/meta/javadocmetadatascraper/InputJavadocMetadataScraperAnnotationUseStyleCheck.java b/...style/meta/javadocmetadatascraper/InputJavadocMetadataScraperAnnotationUseStyleCheck.java
@@ -11,8 +11,8 @@
 
 import com.puppycrawl.tools.checkstyle.StatelessCheck;
 import com.puppycrawl.tools.checkstyle.api.AbstractCheck;
-import com.puppycrawl.tools.checkstyle.api.DetailAST;
-import com.puppycrawl.tools.checkstyle.api.TokenTypes;
+
+
 
 /**
  * <p>

diff --git a/...checkstyle/meta/javadocmetadatascraper/InputJavadocMetadataScraperAtclauseOrderCheck.java b/...checkstyle/meta/javadocmetadatascraper/InputJavadocMetadataScraperAtclauseOrderCheck.java
@@ -12,12 +12,12 @@
 import java.util.List;
 
 import com.puppycrawl.tools.checkstyle.StatelessCheck;
-import com.puppycrawl.tools.checkstyle.api.DetailAST;
-import com.puppycrawl.tools.checkstyle.api.DetailNode;
-import com.puppycrawl.tools.checkstyle.api.JavadocTokenTypes;
-import com.puppycrawl.tools.checkstyle.api.TokenTypes;
-import com.puppycrawl.tools.checkstyle.utils.JavadocUtil;
-import com.puppycrawl.tools.checkstyle.utils.TokenUtil;
+
+
+
+
+
+
 
 /**
  * <p>

diff --git a/...ls/checkstyle/meta/javadocmetadatascraper/InputJavadocMetadataScraperRightCurlyCheck.java b/...ls/checkstyle/meta/javadocmetadatascraper/InputJavadocMetadataScraperRightCurlyCheck.java
@@ -10,14 +10,14 @@
 import java.util.Arrays;
 import java.util.Locale;
 
-import com.puppycrawl.tools.checkstyle.DetailAstImpl;
+
 import com.puppycrawl.tools.checkstyle.StatelessCheck;
 import com.puppycrawl.tools.checkstyle.api.AbstractCheck;
-import com.puppycrawl.tools.checkstyle.api.DetailAST;
-import com.puppycrawl.tools.checkstyle.api.TokenTypes;
-import com.puppycrawl.tools.checkstyle.utils.CheckUtil;
-import com.puppycrawl.tools.checkstyle.utils.CommonUtil;
-import com.puppycrawl.tools.checkstyle.utils.TokenUtil;
+
+
+
+
+
 
 /**
  * <p>

diff --git a/...ools/checkstyle/meta/javadocmetadatascraper/InputJavadocMetadataScraperWriteTagCheck.java b/...ools/checkstyle/meta/javadocmetadatascraper/InputJavadocMetadataScraperWriteTagCheck.java
@@ -12,12 +12,12 @@
 
 import com.puppycrawl.tools.checkstyle.StatelessCheck;
 import com.puppycrawl.tools.checkstyle.api.AbstractCheck;
-import com.puppycrawl.tools.checkstyle.api.DetailAST;
-import com.puppycrawl.tools.checkstyle.api.FileContents;
-import com.puppycrawl.tools.checkstyle.api.SeverityLevel;
-import com.puppycrawl.tools.checkstyle.api.TextBlock;
-import com.puppycrawl.tools.checkstyle.api.TokenTypes;
-import com.puppycrawl.tools.checkstyle.utils.CommonUtil;
+
+
+
+
+
+
 
 /**
  * <p>