Issue checkstyle#929: update sevntu_checks.xml and move Log to top of…

… class (will be squashed if it works)
crud3 · Oct 15, 2017 · 57bcc6f · 57bcc6f
1 parent f2c96b2
commit 57bcc6f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/config/checkstyle_sevntu_checks.xml b/config/checkstyle_sevntu_checks.xml
@@ -152,7 +152,8 @@
         <module name="ForbidWildcardAsReturnType"/>
         <module name="CustomDeclarationOrder">
             <property name="customDeclarationOrder"
-                      value="InnerEnum(public .*)
+                      value="Field((private) final Log ([\w]*L|l)og)
+                      ### InnerEnum(public .*)
                       ### Field(public static final)
                       ### Field(public static .*)
                       ### Field(protected static final)

diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/Checker.java b/src/main/java/com/puppycrawl/tools/checkstyle/Checker.java
@@ -64,12 +64,13 @@
  * @author Andrei Selkin
  */
 public class Checker extends AutomaticBean implements MessageDispatcher, RootModule {
-    /** Message to use when an exception occurs and should be printed as a violation. */
-    public static final String EXCEPTION_MSG = "general.exception";
-
+
     /** Logger for Checker. */
     private final Log log;
 
+    /** Message to use when an exception occurs and should be printed as a violation. */
+    public static final String EXCEPTION_MSG = "general.exception";
+
     /** Maintains error count. */
     private final SeverityLevelCounter counter = new SeverityLevelCounter(
             SeverityLevel.ERROR);

diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/TranslationCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/TranslationCheck.java
@@ -102,6 +102,9 @@
  */
 public class TranslationCheck extends AbstractFileSetCheck {
 
+    /** Logger for TranslationCheck. */
+    private final Log log;
+
     /**
      * A key is pointing to the warning message text for missing key
      * in "messages.properties" file.
@@ -125,9 +128,6 @@ public class TranslationCheck extends AbstractFileSetCheck {
      */
     private static final String WRONG_LANGUAGE_CODE_KEY = "translation.wrongLanguageCode";
 
-    /** Logger for TranslationCheck. */
-    private final Log log;
-
     /**
      * Regexp string for default translation files.
      * For example, messages.properties.