diff --git a/docs/checkstyle_checks.xml b/docs/checkstyle_checks.xml
index 4d1765b10..9c6e1f6d4 100644
--- a/docs/checkstyle_checks.xml
+++ b/docs/checkstyle_checks.xml
@@ -116,5 +116,6 @@
             <property name="braceAdjustment" value="0"/>
             <property name="caseIndent" value="0"/>
         </module>
+        <module name="ArrayTrailingComma"/>
     </module>
 </module>
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/PropertyCacheFile.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/PropertyCacheFile.java
index e3c83aa8c..ec40f6f65 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/PropertyCacheFile.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/PropertyCacheFile.java
@@ -190,7 +190,8 @@ final class PropertyCacheFile
     /** hex digits */
     private static char[] sHexChars = {
         '0', '1', '2', '3', '4', '5', '6', '7',
-        '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
+        '8', '9', 'A', 'B', 'C', 'D', 'E', 'F',
+    };
 
     /** mask for last byte */
     private static final int MASK_0X0F = 0x0F;
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/XMLLogger.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/XMLLogger.java
index aeff894a3..6504b5aaa 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/XMLLogger.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/XMLLogger.java
@@ -53,7 +53,7 @@ public class XMLLogger
 
     /** some known entities to detect */
     private static final String[] ENTITIES = {"gt", "amp", "lt", "apos",
-                                              "quot"};
+                                              "quot", };
 
     /**
      * Creates a new <code>XMLLogger</code> instance.
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/JavadocMethodCheck.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/JavadocMethodCheck.java
index 6ce05c8be..010c5899e 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/JavadocMethodCheck.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/JavadocMethodCheck.java
@@ -250,7 +250,8 @@ public class JavadocMethodCheck
             TokenTypes.PACKAGE_DEF,
             TokenTypes.IMPORT,
             TokenTypes.METHOD_DEF,
-            TokenTypes.CTOR_DEF};
+            TokenTypes.CTOR_DEF,
+        };
     }
 
     /** @see com.puppycrawl.tools.checkstyle.api.Check */
@@ -258,7 +259,8 @@ public class JavadocMethodCheck
     {
         return new int[] {
             TokenTypes.METHOD_DEF,
-            TokenTypes.CTOR_DEF};
+            TokenTypes.CTOR_DEF,
+        };
     }
 
     /** @see com.puppycrawl.tools.checkstyle.api.Check */
@@ -266,7 +268,8 @@ public class JavadocMethodCheck
     {
         return new int[] {
             TokenTypes.PACKAGE_DEF,
-            TokenTypes.IMPORT};
+            TokenTypes.IMPORT,
+        };
     }
 
     /** @see com.puppycrawl.tools.checkstyle.api.Check */
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/ModifierOrderCheck.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/ModifierOrderCheck.java
index 909e97043..cb95abfbc 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/ModifierOrderCheck.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/ModifierOrderCheck.java
@@ -74,7 +74,7 @@ public class ModifierOrderCheck
     private static final String[] JLS_ORDER =
     {
         "public", "protected", "private", "abstract", "static", "final",
-        "transient", "volatile", "synchronized", "native", "strictfp"
+        "transient", "volatile", "synchronized", "native", "strictfp",
     };
 
     /** @see com.puppycrawl.tools.checkstyle.api.Check */
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/RedundantModifierCheck.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/RedundantModifierCheck.java
index 8537fa76a..bb80ed885 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/RedundantModifierCheck.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/RedundantModifierCheck.java
@@ -49,8 +49,10 @@ public class RedundantModifierCheck
     /** @see com.puppycrawl.tools.checkstyle.api.Check */
     public int[] getDefaultTokens()
     {
-        return new int[] {TokenTypes.METHOD_DEF,
-                          TokenTypes.VARIABLE_DEF};
+        return new int[] {
+            TokenTypes.METHOD_DEF,
+            TokenTypes.VARIABLE_DEF,
+        };
     }
 
     /** @see com.puppycrawl.tools.checkstyle.api.Check */
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/RedundantThrowsCheck.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/RedundantThrowsCheck.java
index 58a1ac974..7a439565c 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/RedundantThrowsCheck.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/RedundantThrowsCheck.java
@@ -93,7 +93,8 @@ public class RedundantThrowsCheck
             TokenTypes.PACKAGE_DEF,
             TokenTypes.IMPORT,
             TokenTypes.METHOD_DEF,
-            TokenTypes.CTOR_DEF};
+            TokenTypes.CTOR_DEF,
+        };
     }
 
     /** @see com.puppycrawl.tools.checkstyle.api.Check */
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/RightCurlyCheck.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/RightCurlyCheck.java
index e4dc13ebd..a857c41b9 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/RightCurlyCheck.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/RightCurlyCheck.java
@@ -66,9 +66,11 @@ public class RightCurlyCheck
     /** @see com.puppycrawl.tools.checkstyle.api.Check */
     public int[] getDefaultTokens()
     {
-        return new int[] {TokenTypes.LITERAL_TRY,
-                          TokenTypes.LITERAL_CATCH,
-                          TokenTypes.LITERAL_ELSE};
+        return new int[] {
+            TokenTypes.LITERAL_TRY,
+            TokenTypes.LITERAL_CATCH,
+            TokenTypes.LITERAL_ELSE,
+        };
     }
 
     /** @see com.puppycrawl.tools.checkstyle.api.Check */
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/TypeNameCheck.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/TypeNameCheck.java
index 0537a7d4e..cc22fd1f5 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/TypeNameCheck.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/TypeNameCheck.java
@@ -62,6 +62,6 @@ public class TypeNameCheck
     public int[] getDefaultTokens()
     {
         return new int[] {TokenTypes.CLASS_DEF,
-                          TokenTypes.INTERFACE_DEF};
+                          TokenTypes.INTERFACE_DEF, };
     }
 }
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/UnusedImportsCheck.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/UnusedImportsCheck.java
index fbc26dfb1..43b19fbeb 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/UnusedImportsCheck.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/UnusedImportsCheck.java
@@ -77,10 +77,12 @@ public class UnusedImportsCheck
     /** @see com.puppycrawl.tools.checkstyle.api.Check */
     public int[] getDefaultTokens()
     {
-        return new int[] {TokenTypes.IMPORT,
-                          TokenTypes.CLASS_DEF,
-                          TokenTypes.INTERFACE_DEF,
-                          TokenTypes.IDENT};
+        return new int[] {
+            TokenTypes.IMPORT,
+            TokenTypes.CLASS_DEF,
+            TokenTypes.INTERFACE_DEF,
+            TokenTypes.IDENT,
+        };
     }
 
     /** @see com.puppycrawl.tools.checkstyle.api.Check */
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/WhitespaceAroundCheck.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/WhitespaceAroundCheck.java
index 8490c16df..168796f57 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/WhitespaceAroundCheck.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/WhitespaceAroundCheck.java
@@ -147,7 +147,7 @@ public class WhitespaceAroundCheck
             TokenTypes.SR_ASSIGN,
             TokenTypes.STAR,
             TokenTypes.STAR_ASSIGN,
-            TokenTypes.LITERAL_ASSERT
+            TokenTypes.LITERAL_ASSERT,
         };
     }
 
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/indentation/BlockParentHandler.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/indentation/BlockParentHandler.java
index eb8ec98a6..a92262cec 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/indentation/BlockParentHandler.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/indentation/BlockParentHandler.java
@@ -48,7 +48,7 @@ public class BlockParentHandler extends ExpressionHandler
         TokenTypes.VARIABLE_DEF,
         TokenTypes.EXPR,
         TokenTypes.OBJBLOCK,
-        TokenTypes.LITERAL_BREAK
+        TokenTypes.LITERAL_BREAK,
     };
 
     /**
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/indentation/CaseHandler.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/indentation/CaseHandler.java
index 58764a67f..662f29cb6 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/indentation/CaseHandler.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/indentation/CaseHandler.java
@@ -34,7 +34,7 @@ public class CaseHandler extends ExpressionHandler
      */
     private final int[] mCaseChildren = new int[] {
         TokenTypes.LITERAL_CASE,
-        TokenTypes.LITERAL_DEFAULT
+        TokenTypes.LITERAL_DEFAULT,
     };
 
     /**
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/indentation/HandlerFactory.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/indentation/HandlerFactory.java
index 7be6b884e..f2b4e307d 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/indentation/HandlerFactory.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/indentation/HandlerFactory.java
@@ -52,8 +52,8 @@ public class HandlerFactory
         try {
             Constructor ctor = aHandlerClass.getConstructor(new Class[] {
                 IndentationCheck.class,
-                DetailAST.class,            // current AST
-                ExpressionHandler.class     // parent
+                DetailAST.class,             // current AST
+                ExpressionHandler.class,     // parent
             });
             mTypeHandlers.put(new Integer(aType), ctor);
         }
@@ -149,7 +149,7 @@ public class HandlerFactory
                     new Object[] {
                         aIndentCheck,
                         aAst,
-                        aParent
+                        aParent,
                     }
                 );
             }