From d8c8643b52b4c1e993b127780dca849932e2aeed Mon Sep 17 00:00:00 2001
From: Tyler Veness <calcmogul@gmail.com>
Date: Tue, 15 May 2018 23:58:20 -0700
Subject: [PATCH] Format HTML and XML files (#944)

Generated by wpilibsuite/styleguide#52.
---
 styleguide/checkstyle.xml                     | 478 +++++++++--------
 styleguide/checkstyleExamples.xml             | 486 ++++++++++--------
 styleguide/pmd-ruleset.xml                    |  97 ++--
 styleguide/suppressions.xml                   |  13 +-
 tidy-html.conf                                |   3 +
 tidy-xml.conf                                 |   4 +
 .../java/edu/wpi/first/wpilibj/package.html   |  55 +-
 7 files changed, 633 insertions(+), 503 deletions(-)
 create mode 100644 tidy-html.conf
 create mode 100644 tidy-xml.conf

diff --git a/styleguide/checkstyle.xml b/styleguide/checkstyle.xml
index 830c3a5462..b92bd008a1 100644
--- a/styleguide/checkstyle.xml
+++ b/styleguide/checkstyle.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0"?>
-<!DOCTYPE module PUBLIC
-        "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
-        "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
-
+<!DOCTYPE
+module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+"http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
 <!--
     Checkstyle configuration that checks the Google coding conventions from Google Java Style
     that can be found at https://google.github.io/styleguide/javaguide.html.
@@ -14,214 +13,273 @@
 
     Authors: Max Vetrenko, Ruslan Diachenko, Roman Ivanov.
  -->
-
-<module name = "Checker">
-    <property name="charset" value="UTF-8"/>
-
-    <property name="severity" value="error"/>
-
-    <module name="SuppressionFilter">
-        <property name="file" value="styleguide/suppressions.xml" />
+<module name="Checker">
+  <property name="charset"
+            value="UTF-8" />
+  <property name="severity"
+            value="error" />
+  <module name="SuppressionFilter">
+    <property name="file"
+              value="styleguide/suppressions.xml" />
+  </module>
+  <property name="fileExtensions"
+            value="java, properties, xml" />
+  <!-- Checks for whitespace                               -->
+  <!-- See http://checkstyle.sf.net/config_whitespace.html -->
+  <module name="FileTabCharacter">
+    <property name="eachLine"
+              value="true" />
+  </module>
+  <module name="NewlineAtEndOfFile">
+    <property name="lineSeparator"
+              value="lf" />
+  </module>
+  <module name="SuppressWarningsFilter" />
+  <module name="TreeWalker">
+    <module name="SuppressWarningsHolder" />
+    <module name="OuterTypeFilename" />
+    <module name="IllegalTokenText">
+      <property name="tokens"
+                value="STRING_LITERAL, CHAR_LITERAL" />
+      <property name="format"
+                value="\\u00(08|09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|\\(0(10|11|12|14|15|42|47)|134)" />
+      <property name="message"
+                value="Avoid using corresponding octal or Unicode escape." />
     </module>
-
-    <property name="fileExtensions" value="java, properties, xml"/>
-    <!-- Checks for whitespace                               -->
-    <!-- See http://checkstyle.sf.net/config_whitespace.html -->
-    <module name="FileTabCharacter">
-        <property name="eachLine" value="true"/>
+    <module name="AvoidEscapedUnicodeCharacters">
+      <property name="allowEscapesForControlCharacters"
+                value="true" />
+      <property name="allowByTailComment"
+                value="true" />
+      <property name="allowNonPrintableEscapes"
+                value="true" />
     </module>
-    <module name="NewlineAtEndOfFile">
-        <property name="lineSeparator" value="lf"/>
+    <module name="LineLength">
+      <property name="max"
+                value="100" />
+      <property name="ignorePattern"
+                value="^package.*|^import.*|a href|href|http://|https://|ftp://" />
     </module>
-
-    <module name="SuppressWarningsFilter" />
-
-    <module name="TreeWalker">
-        <module name="SuppressWarningsHolder" />
-        <module name="OuterTypeFilename"/>
-        <module name="IllegalTokenText">
-            <property name="tokens" value="STRING_LITERAL, CHAR_LITERAL"/>
-            <property name="format" value="\\u00(08|09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|\\(0(10|11|12|14|15|42|47)|134)"/>
-            <property name="message" value="Avoid using corresponding octal or Unicode escape."/>
-        </module>
-        <module name="AvoidEscapedUnicodeCharacters">
-            <property name="allowEscapesForControlCharacters" value="true"/>
-            <property name="allowByTailComment" value="true"/>
-            <property name="allowNonPrintableEscapes" value="true"/>
-        </module>
-        <module name="LineLength">
-            <property name="max" value="100"/>
-            <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
-        </module>
-        <module name="AvoidStarImport"/>
-        <module name="RedundantImport"/>
-        <module name="UnusedImports"/>
-        <module name="OneTopLevelClass"/>
-        <module name="NoLineWrap"/>
-        <module name="EmptyBlock">
-            <property name="option" value="TEXT"/>
-            <property name="tokens" value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/>
-        </module>
-        <module name="NeedBraces"/>
-        <module name="LeftCurly">
-            <property name="maxLineLength" value="100"/>
-        </module>
-        <module name="RightCurly"/>
-        <module name="RightCurly">
-            <property name="option" value="alone"/>
-            <property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, LITERAL_DO, STATIC_INIT, INSTANCE_INIT"/>
-        </module>
-        <module name="WhitespaceAround">
-            <property name="allowEmptyConstructors" value="true"/>
-            <property name="allowEmptyMethods" value="true"/>
-            <property name="allowEmptyTypes" value="true"/>
-            <property name="allowEmptyLoops" value="true"/>
-            <message key="ws.notFollowed"
-                     value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/>
-            <message key="ws.notPreceded"
-                     value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/>
-        </module>
-        <module name="WhitespaceAfter"/>
-        <module name="OneStatementPerLine"/>
-        <module name="MultipleVariableDeclarations"/>
-        <module name="ArrayTypeStyle"/>
-        <module name="MissingSwitchDefault"/>
-        <module name="FallThrough"/>
-        <module name="SimplifyBooleanExpression"/>
-        <module name="SimplifyBooleanReturn"/>
-        <module name="StringLiteralEquality"/>
-        <module name="UnnecessaryParentheses"/>
-        <module name="UpperEll"/>
-        <module name="ModifierOrder"/>
-        <module name="RedundantModifier"/>
-        <module name="EmptyLineSeparator">
-            <property name="allowNoEmptyLineBetweenFields" value="true"/>
-        </module>
-        <module name="SeparatorWrap">
-            <property name="tokens" value="DOT"/>
-            <property name="option" value="nl"/>
-        </module>
-        <module name="SeparatorWrap">
-            <property name="tokens" value="COMMA"/>
-            <property name="option" value="EOL"/>
-        </module>
-        <module name="PackageName">
-            <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/>
-            <message key="name.invalidPattern"
-                     value="Package name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="TypeName">
-            <message key="name.invalidPattern"
-                     value="Type name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="MemberName">
-            <property name="format" value="^m_[a-z][a-z0-9][a-zA-Z0-9]*$"/>
-            <message key="name.invalidPattern"
-                     value="Member name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="ParameterName">
-            <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>
-            <message key="name.invalidPattern"
-                     value="Parameter name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="CatchParameterName">
-            <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>
-            <message key="name.invalidPattern"
-                     value="Catch parameter name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="LocalVariableName">
-            <property name="tokens" value="VARIABLE_DEF"/>
-            <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>
-            <property name="allowOneCharVarInForLoop" value="true"/>
-            <message key="name.invalidPattern"
-                     value="Local variable name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="ClassTypeParameterName">
-            <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
-            <message key="name.invalidPattern"
-                     value="Class type name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="MethodTypeParameterName">
-            <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
-            <message key="name.invalidPattern"
-                     value="Method type name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="InterfaceTypeParameterName">
-            <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
-            <message key="name.invalidPattern"
-                     value="Interface type name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="NoFinalizer"/>
-        <module name="GenericWhitespace">
-            <message key="ws.followed"
-                     value="GenericWhitespace ''{0}'' is followed by whitespace."/>
-            <message key="ws.preceded"
-                     value="GenericWhitespace ''{0}'' is preceded with whitespace."/>
-            <message key="ws.illegalFollow"
-                     value="GenericWhitespace ''{0}'' should followed by whitespace."/>
-            <message key="ws.notPreceded"
-                     value="GenericWhitespace ''{0}'' is not preceded with whitespace."/>
-        </module>
-        <module name="Indentation">
-            <property name="basicOffset" value="2"/>
-            <property name="braceAdjustment" value="0"/>
-            <property name="caseIndent" value="2"/>
-            <property name="throwsIndent" value="4"/>
-            <property name="lineWrappingIndentation" value="4"/>
-            <property name="arrayInitIndent" value="2"/>
-        </module>
-        <module name="AbbreviationAsWordInName">
-            <property name="ignoreFinal" value="false"/>
-            <property name="allowedAbbreviationLength" value="3"/>
-        </module>
-        <module name="OverloadMethodsDeclarationOrder"/>
-        <module name="VariableDeclarationUsageDistance"/>
-        <module name="MethodParamPad"/>
-        <module name="TypecastParenPad"/>
-        <module name="OperatorWrap">
-            <property name="option" value="NL"/>
-            <property name="tokens" value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR, LT, MINUS, MOD, NOT_EQUAL, PLUS, QUESTION, SL, SR, STAR "/>
-        </module>
-        <module name="AnnotationLocation">
-            <property name="tokens" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF"/>
-        </module>
-        <module name="AnnotationLocation">
-            <property name="tokens" value="VARIABLE_DEF"/>
-            <property name="allowSamelineMultipleAnnotations" value="true"/>
-        </module>
-        <module name="NonEmptyAtclauseDescription"/>
-        <module name="JavadocTagContinuationIndentation"/>
-        <module name="SummaryJavadoc">
-            <property name="forbiddenSummaryFragments" value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/>
-        </module>
-        <module name="JavadocParagraph"/>
-        <module name="AtclauseOrder">
-            <property name="tagOrder" value="@param, @return, @throws, @deprecated"/>
-            <property name="target" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
-        </module>
-        <module name="JavadocMethod">
-            <property name="scope" value="public"/>
-            <property name="allowMissingParamTags" value="true"/>
-            <property name="allowMissingThrowsTags" value="true"/>
-            <property name="allowMissingReturnTag" value="true"/>
-            <property name="minLineCount" value="2"/>
-            <property name="allowedAnnotations"
-                      value="Override, Test, Before, After, BeforeClass, AfterClass, Parameters"/>
-            <property name="allowUndeclaredRTE" value="true"/>
-            <property name="allowThrowsTagsForSubclasses" value="true"/>
-            <property name="suppressLoadErrors" value="true"/>
-        </module>
-        <module name="MethodName">
-            <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/>
-            <message key="name.invalidPattern"
-                     value="Method name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="SingleLineJavadoc">
-            <property name="ignoreInlineTags" value="false"/>
-        </module>
-        <module name="EmptyCatchBlock">
-            <property name="exceptionVariableName" value="expected"/>
-        </module>
-        <module name="CommentsIndentation"/>
+    <module name="AvoidStarImport" />
+    <module name="RedundantImport" />
+    <module name="UnusedImports" />
+    <module name="OneTopLevelClass" />
+    <module name="NoLineWrap" />
+    <module name="EmptyBlock">
+      <property name="option"
+                value="TEXT" />
+      <property name="tokens"
+                value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH" />
     </module>
+    <module name="NeedBraces" />
+    <module name="LeftCurly">
+      <property name="maxLineLength"
+                value="100" />
+    </module>
+    <module name="RightCurly" />
+    <module name="RightCurly">
+      <property name="option"
+                value="alone" />
+      <property name="tokens"
+                value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, LITERAL_DO, STATIC_INIT, INSTANCE_INIT" />
+    </module>
+    <module name="WhitespaceAround">
+      <property name="allowEmptyConstructors"
+                value="true" />
+      <property name="allowEmptyMethods"
+                value="true" />
+      <property name="allowEmptyTypes"
+                value="true" />
+      <property name="allowEmptyLoops"
+                value="true" />
+      <message key="ws.notFollowed"
+               value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)" />
+      <message key="ws.notPreceded"
+               value="WhitespaceAround: ''{0}'' is not preceded with whitespace." />
+    </module>
+    <module name="WhitespaceAfter" />
+    <module name="OneStatementPerLine" />
+    <module name="MultipleVariableDeclarations" />
+    <module name="ArrayTypeStyle" />
+    <module name="MissingSwitchDefault" />
+    <module name="FallThrough" />
+    <module name="SimplifyBooleanExpression" />
+    <module name="SimplifyBooleanReturn" />
+    <module name="StringLiteralEquality" />
+    <module name="UnnecessaryParentheses" />
+    <module name="UpperEll" />
+    <module name="ModifierOrder" />
+    <module name="RedundantModifier" />
+    <module name="EmptyLineSeparator">
+      <property name="allowNoEmptyLineBetweenFields"
+                value="true" />
+    </module>
+    <module name="SeparatorWrap">
+      <property name="tokens"
+                value="DOT" />
+      <property name="option"
+                value="nl" />
+    </module>
+    <module name="SeparatorWrap">
+      <property name="tokens"
+                value="COMMA" />
+      <property name="option"
+                value="EOL" />
+    </module>
+    <module name="PackageName">
+      <property name="format"
+                value="^[a-z]+(\.[a-z][a-z0-9]*)*$" />
+      <message key="name.invalidPattern"
+               value="Package name ''{0}'' must match pattern ''{1}''." />
+    </module>
+    <module name="TypeName">
+      <message key="name.invalidPattern"
+               value="Type name ''{0}'' must match pattern ''{1}''." />
+    </module>
+    <module name="MemberName">
+      <property name="format"
+                value="^m_[a-z][a-z0-9][a-zA-Z0-9]*$" />
+      <message key="name.invalidPattern"
+               value="Member name ''{0}'' must match pattern ''{1}''." />
+    </module>
+    <module name="ParameterName">
+      <property name="format"
+                value="^[a-z][a-z0-9][a-zA-Z0-9]*$" />
+      <message key="name.invalidPattern"
+               value="Parameter name ''{0}'' must match pattern ''{1}''." />
+    </module>
+    <module name="CatchParameterName">
+      <property name="format"
+                value="^[a-z][a-z0-9][a-zA-Z0-9]*$" />
+      <message key="name.invalidPattern"
+               value="Catch parameter name ''{0}'' must match pattern ''{1}''." />
+    </module>
+    <module name="LocalVariableName">
+      <property name="tokens"
+                value="VARIABLE_DEF" />
+      <property name="format"
+                value="^[a-z][a-z0-9][a-zA-Z0-9]*$" />
+      <property name="allowOneCharVarInForLoop"
+                value="true" />
+      <message key="name.invalidPattern"
+               value="Local variable name ''{0}'' must match pattern ''{1}''." />
+    </module>
+    <module name="ClassTypeParameterName">
+      <property name="format"
+                value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)" />
+      <message key="name.invalidPattern"
+               value="Class type name ''{0}'' must match pattern ''{1}''." />
+    </module>
+    <module name="MethodTypeParameterName">
+      <property name="format"
+                value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)" />
+      <message key="name.invalidPattern"
+               value="Method type name ''{0}'' must match pattern ''{1}''." />
+    </module>
+    <module name="InterfaceTypeParameterName">
+      <property name="format"
+                value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)" />
+      <message key="name.invalidPattern"
+               value="Interface type name ''{0}'' must match pattern ''{1}''." />
+    </module>
+    <module name="NoFinalizer" />
+    <module name="GenericWhitespace">
+      <message key="ws.followed"
+               value="GenericWhitespace ''{0}'' is followed by whitespace." />
+      <message key="ws.preceded"
+               value="GenericWhitespace ''{0}'' is preceded with whitespace." />
+      <message key="ws.illegalFollow"
+               value="GenericWhitespace ''{0}'' should followed by whitespace." />
+      <message key="ws.notPreceded"
+               value="GenericWhitespace ''{0}'' is not preceded with whitespace." />
+    </module>
+    <module name="Indentation">
+      <property name="basicOffset"
+                value="2" />
+      <property name="braceAdjustment"
+                value="0" />
+      <property name="caseIndent"
+                value="2" />
+      <property name="throwsIndent"
+                value="4" />
+      <property name="lineWrappingIndentation"
+                value="4" />
+      <property name="arrayInitIndent"
+                value="2" />
+    </module>
+    <module name="AbbreviationAsWordInName">
+      <property name="ignoreFinal"
+                value="false" />
+      <property name="allowedAbbreviationLength"
+                value="3" />
+    </module>
+    <module name="OverloadMethodsDeclarationOrder" />
+    <module name="VariableDeclarationUsageDistance" />
+    <module name="MethodParamPad" />
+    <module name="TypecastParenPad" />
+    <module name="OperatorWrap">
+      <property name="option"
+                value="NL" />
+      <property name="tokens"
+                value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR, LT, MINUS, MOD, NOT_EQUAL, PLUS, QUESTION, SL, SR, STAR " />
+    </module>
+    <module name="AnnotationLocation">
+      <property name="tokens"
+                value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF" />
+    </module>
+    <module name="AnnotationLocation">
+      <property name="tokens"
+                value="VARIABLE_DEF" />
+      <property name="allowSamelineMultipleAnnotations"
+                value="true" />
+    </module>
+    <module name="NonEmptyAtclauseDescription" />
+    <module name="JavadocTagContinuationIndentation" />
+    <module name="SummaryJavadoc">
+      <property name="forbiddenSummaryFragments"
+                value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )" />
+    </module>
+    <module name="JavadocParagraph" />
+    <module name="AtclauseOrder">
+      <property name="tagOrder"
+                value="@param, @return, @throws, @deprecated" />
+      <property name="target"
+                value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF" />
+    </module>
+    <module name="JavadocMethod">
+      <property name="scope"
+                value="public" />
+      <property name="allowMissingParamTags"
+                value="true" />
+      <property name="allowMissingThrowsTags"
+                value="true" />
+      <property name="allowMissingReturnTag"
+                value="true" />
+      <property name="minLineCount"
+                value="2" />
+      <property name="allowedAnnotations"
+                value="Override, Test, Before, After, BeforeClass, AfterClass, Parameters" />
+      <property name="allowUndeclaredRTE"
+                value="true" />
+      <property name="allowThrowsTagsForSubclasses"
+                value="true" />
+      <property name="suppressLoadErrors"
+                value="true" />
+    </module>
+    <module name="MethodName">
+      <property name="format"
+                value="^[a-z][a-z0-9][a-zA-Z0-9_]*$" />
+      <message key="name.invalidPattern"
+               value="Method name ''{0}'' must match pattern ''{1}''." />
+    </module>
+    <module name="SingleLineJavadoc">
+      <property name="ignoreInlineTags"
+                value="false" />
+    </module>
+    <module name="EmptyCatchBlock">
+      <property name="exceptionVariableName"
+                value="expected" />
+    </module>
+    <module name="CommentsIndentation" />
+  </module>
 </module>
diff --git a/styleguide/checkstyleExamples.xml b/styleguide/checkstyleExamples.xml
index e2d1e6814f..99aabc8ef2 100644
--- a/styleguide/checkstyleExamples.xml
+++ b/styleguide/checkstyleExamples.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0"?>
-<!DOCTYPE module PUBLIC
-        "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
-        "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
-
+<!DOCTYPE
+module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+"http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
 <!--
     Checkstyle configuration that checks the Google coding conventions from Google Java Style
     that can be found at https://google.github.io/styleguide/javaguide.html.
@@ -14,217 +13,278 @@
 
     Authors: Max Vetrenko, Ruslan Diachenko, Roman Ivanov.
  -->
-
-<module name = "Checker">
-    <property name="charset" value="UTF-8"/>
-
-    <property name="severity" value="error"/>
-
-    <module name="SuppressionFilter">
-        <property name="file" value="styleguide/suppressions.xml" />
+<module name="Checker">
+  <property name="charset"
+            value="UTF-8" />
+  <property name="severity"
+            value="error" />
+  <module name="SuppressionFilter">
+    <property name="file"
+              value="styleguide/suppressions.xml" />
+  </module>
+  <property name="fileExtensions"
+            value="java, properties, xml" />
+  <!-- Checks for whitespace                               -->
+  <!-- See http://checkstyle.sf.net/config_whitespace.html -->
+  <module name="FileTabCharacter">
+    <property name="eachLine"
+              value="true" />
+  </module>
+  <module name="NewlineAtEndOfFile">
+    <property name="lineSeparator"
+              value="lf" />
+  </module>
+  <module name="SuppressWarningsFilter" />
+  <module name="TreeWalker">
+    <module name="SuppressWarningsHolder" />
+    <module name="OuterTypeFilename" />
+    <module name="IllegalTokenText">
+      <property name="tokens"
+                value="STRING_LITERAL, CHAR_LITERAL" />
+      <property name="format"
+                value="\\u00(08|09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|\\(0(10|11|12|14|15|42|47)|134)" />
+      <property name="message"
+                value="Avoid using corresponding octal or Unicode escape." />
     </module>
-
-    <property name="fileExtensions" value="java, properties, xml"/>
-    <!-- Checks for whitespace                               -->
-    <!-- See http://checkstyle.sf.net/config_whitespace.html -->
-    <module name="FileTabCharacter">
-        <property name="eachLine" value="true"/>
+    <module name="AvoidEscapedUnicodeCharacters">
+      <property name="allowEscapesForControlCharacters"
+                value="true" />
+      <property name="allowByTailComment"
+                value="true" />
+      <property name="allowNonPrintableEscapes"
+                value="true" />
     </module>
-    <module name="NewlineAtEndOfFile">
-        <property name="lineSeparator" value="lf"/>
+    <module name="LineLength">
+      <property name="max"
+                value="100" />
+      <property name="ignorePattern"
+                value="^package.*|^import.*|a href|href|http://|https://|ftp://" />
     </module>
-
-    <module name="SuppressWarningsFilter" />
-
-    <module name="TreeWalker">
-        <module name="SuppressWarningsHolder" />
-        <module name="OuterTypeFilename"/>
-        <module name="IllegalTokenText">
-            <property name="tokens" value="STRING_LITERAL, CHAR_LITERAL"/>
-            <property name="format" value="\\u00(08|09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|\\(0(10|11|12|14|15|42|47)|134)"/>
-            <property name="message" value="Avoid using corresponding octal or Unicode escape."/>
-        </module>
-        <module name="AvoidEscapedUnicodeCharacters">
-            <property name="allowEscapesForControlCharacters" value="true"/>
-            <property name="allowByTailComment" value="true"/>
-            <property name="allowNonPrintableEscapes" value="true"/>
-        </module>
-        <module name="LineLength">
-            <property name="max" value="100"/>
-            <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
-        </module>
-        <module name="AvoidStarImport"/>
-        <module name="RedundantImport"/>
-        <module name="UnusedImports"/>
-        <module name="OneTopLevelClass"/>
-        <module name="NoLineWrap"/>
-        <module name="EmptyBlock">
-            <property name="option" value="TEXT"/>
-            <property name="tokens" value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/>
-        </module>
-        <module name="NeedBraces"/>
-        <module name="LeftCurly">
-            <property name="maxLineLength" value="100"/>
-        </module>
-        <module name="RightCurly"/>
-        <module name="RightCurly">
-            <property name="option" value="alone"/>
-            <property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, LITERAL_DO, STATIC_INIT, INSTANCE_INIT"/>
-        </module>
-        <module name="WhitespaceAround">
-            <property name="allowEmptyConstructors" value="true"/>
-            <property name="allowEmptyMethods" value="true"/>
-            <property name="allowEmptyTypes" value="true"/>
-            <property name="allowEmptyLoops" value="true"/>
-            <message key="ws.notFollowed"
-                     value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/>
-            <message key="ws.notPreceded"
-                     value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/>
-        </module>
-        <module name="WhitespaceAfter"/>
-        <module name="OneStatementPerLine"/>
-        <module name="MultipleVariableDeclarations"/>
-        <module name="ArrayTypeStyle"/>
-        <module name="MissingSwitchDefault"/>
-        <module name="FallThrough"/>
-        <module name="SimplifyBooleanExpression"/>
-        <module name="SimplifyBooleanReturn"/>
-        <module name="StringLiteralEquality"/>
-        <module name="UnnecessaryParentheses"/>
-        <module name="UpperEll"/>
-        <module name="ModifierOrder"/>
-        <module name="RedundantModifier"/>
-        <module name="EmptyLineSeparator">
-            <property name="allowNoEmptyLineBetweenFields" value="true"/>
-        </module>
-        <module name="SeparatorWrap">
-            <property name="tokens" value="DOT"/>
-            <property name="option" value="nl"/>
-        </module>
-        <module name="SeparatorWrap">
-            <property name="tokens" value="COMMA"/>
-            <property name="option" value="EOL"/>
-        </module>
-        <module name="PackageName">
-            <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/>
-            <message key="name.invalidPattern"
-                     value="Package name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="TypeName">
-            <message key="name.invalidPattern"
-                     value="Type name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="MemberName">
-            <property name="format" value="^m_[a-z][a-z0-9][a-zA-Z0-9]*$"/>
-            <message key="name.invalidPattern"
-                     value="Member name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="ParameterName">
-            <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>
-            <message key="name.invalidPattern"
-                     value="Parameter name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="CatchParameterName">
-            <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>
-            <message key="name.invalidPattern"
-                     value="Catch parameter name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="LocalVariableName">
-            <property name="tokens" value="VARIABLE_DEF"/>
-            <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>
-            <property name="allowOneCharVarInForLoop" value="true"/>
-            <message key="name.invalidPattern"
-                     value="Local variable name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="ClassTypeParameterName">
-            <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
-            <message key="name.invalidPattern"
-                     value="Class type name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="MethodTypeParameterName">
-            <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
-            <message key="name.invalidPattern"
-                     value="Method type name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="InterfaceTypeParameterName">
-            <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
-            <message key="name.invalidPattern"
-                     value="Interface type name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="NoFinalizer"/>
-        <module name="GenericWhitespace">
-            <message key="ws.followed"
-                     value="GenericWhitespace ''{0}'' is followed by whitespace."/>
-            <message key="ws.preceded"
-                     value="GenericWhitespace ''{0}'' is preceded with whitespace."/>
-            <message key="ws.illegalFollow"
-                     value="GenericWhitespace ''{0}'' should followed by whitespace."/>
-            <message key="ws.notPreceded"
-                     value="GenericWhitespace ''{0}'' is not preceded with whitespace."/>
-        </module>
-        <module name="Indentation">
-            <property name="basicOffset" value="2"/>
-            <property name="braceAdjustment" value="0"/>
-            <property name="caseIndent" value="2"/>
-            <property name="throwsIndent" value="4"/>
-            <property name="lineWrappingIndentation" value="4"/>
-            <property name="arrayInitIndent" value="2"/>
-        </module>
-        <module name="AbbreviationAsWordInName">
-            <property name="ignoreFinal" value="false"/>
-            <property name="allowedAbbreviationLength" value="3"/>
-        </module>
-        <module name="OverloadMethodsDeclarationOrder"/>
-        <module name="VariableDeclarationUsageDistance">
-            <property name="allowedDistance" value="8"/>
-        </module>
-        <module name="MethodParamPad"/>
-        <module name="TypecastParenPad"/>
-        <module name="OperatorWrap">
-            <property name="option" value="NL"/>
-            <property name="tokens" value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR, LT, MINUS, MOD, NOT_EQUAL, PLUS, QUESTION, SL, SR, STAR "/>
-        </module>
-        <module name="AnnotationLocation">
-            <property name="tokens" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF"/>
-        </module>
-        <module name="AnnotationLocation">
-            <property name="tokens" value="VARIABLE_DEF"/>
-            <property name="allowSamelineMultipleAnnotations" value="true"/>
-        </module>
-        <module name="NonEmptyAtclauseDescription"/>
-        <module name="JavadocTagContinuationIndentation"/>
-        <module name="SummaryJavadoc">
-            <property name="forbiddenSummaryFragments" value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/>
-        </module>
-        <module name="JavadocParagraph"/>
-        <module name="AtclauseOrder">
-            <property name="tagOrder" value="@param, @return, @throws, @deprecated"/>
-            <property name="target" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
-        </module>
-        <module name="JavadocMethod">
-            <property name="scope" value="public"/>
-            <property name="allowMissingParamTags" value="true"/>
-            <property name="allowMissingThrowsTags" value="true"/>
-            <property name="allowMissingReturnTag" value="true"/>
-            <property name="minLineCount" value="2"/>
-            <property name="allowedAnnotations"
-                      value="Override, Test, Before, After, BeforeClass, AfterClass, Parameters"/>
-            <property name="allowUndeclaredRTE" value="true"/>
-            <property name="allowThrowsTagsForSubclasses" value="true"/>
-            <property name="suppressLoadErrors" value="true"/>
-            <property name="tokens" value="METHOD_DEF, ANNOTATION_FIELD_DEF"/>
-        </module>
-        <module name="MethodName">
-            <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/>
-            <message key="name.invalidPattern"
-                     value="Method name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="SingleLineJavadoc">
-            <property name="ignoreInlineTags" value="false"/>
-        </module>
-        <module name="EmptyCatchBlock">
-            <property name="exceptionVariableName" value="expected"/>
-        </module>
-        <module name="CommentsIndentation"/>
+    <module name="AvoidStarImport" />
+    <module name="RedundantImport" />
+    <module name="UnusedImports" />
+    <module name="OneTopLevelClass" />
+    <module name="NoLineWrap" />
+    <module name="EmptyBlock">
+      <property name="option"
+                value="TEXT" />
+      <property name="tokens"
+                value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH" />
     </module>
+    <module name="NeedBraces" />
+    <module name="LeftCurly">
+      <property name="maxLineLength"
+                value="100" />
+    </module>
+    <module name="RightCurly" />
+    <module name="RightCurly">
+      <property name="option"
+                value="alone" />
+      <property name="tokens"
+                value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, LITERAL_DO, STATIC_INIT, INSTANCE_INIT" />
+    </module>
+    <module name="WhitespaceAround">
+      <property name="allowEmptyConstructors"
+                value="true" />
+      <property name="allowEmptyMethods"
+                value="true" />
+      <property name="allowEmptyTypes"
+                value="true" />
+      <property name="allowEmptyLoops"
+                value="true" />
+      <message key="ws.notFollowed"
+               value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)" />
+      <message key="ws.notPreceded"
+               value="WhitespaceAround: ''{0}'' is not preceded with whitespace." />
+    </module>
+    <module name="WhitespaceAfter" />
+    <module name="OneStatementPerLine" />
+    <module name="MultipleVariableDeclarations" />
+    <module name="ArrayTypeStyle" />
+    <module name="MissingSwitchDefault" />
+    <module name="FallThrough" />
+    <module name="SimplifyBooleanExpression" />
+    <module name="SimplifyBooleanReturn" />
+    <module name="StringLiteralEquality" />
+    <module name="UnnecessaryParentheses" />
+    <module name="UpperEll" />
+    <module name="ModifierOrder" />
+    <module name="RedundantModifier" />
+    <module name="EmptyLineSeparator">
+      <property name="allowNoEmptyLineBetweenFields"
+                value="true" />
+    </module>
+    <module name="SeparatorWrap">
+      <property name="tokens"
+                value="DOT" />
+      <property name="option"
+                value="nl" />
+    </module>
+    <module name="SeparatorWrap">
+      <property name="tokens"
+                value="COMMA" />
+      <property name="option"
+                value="EOL" />
+    </module>
+    <module name="PackageName">
+      <property name="format"
+                value="^[a-z]+(\.[a-z][a-z0-9]*)*$" />
+      <message key="name.invalidPattern"
+               value="Package name ''{0}'' must match pattern ''{1}''." />
+    </module>
+    <module name="TypeName">
+      <message key="name.invalidPattern"
+               value="Type name ''{0}'' must match pattern ''{1}''." />
+    </module>
+    <module name="MemberName">
+      <property name="format"
+                value="^m_[a-z][a-z0-9][a-zA-Z0-9]*$" />
+      <message key="name.invalidPattern"
+               value="Member name ''{0}'' must match pattern ''{1}''." />
+    </module>
+    <module name="ParameterName">
+      <property name="format"
+                value="^[a-z][a-z0-9][a-zA-Z0-9]*$" />
+      <message key="name.invalidPattern"
+               value="Parameter name ''{0}'' must match pattern ''{1}''." />
+    </module>
+    <module name="CatchParameterName">
+      <property name="format"
+                value="^[a-z][a-z0-9][a-zA-Z0-9]*$" />
+      <message key="name.invalidPattern"
+               value="Catch parameter name ''{0}'' must match pattern ''{1}''." />
+    </module>
+    <module name="LocalVariableName">
+      <property name="tokens"
+                value="VARIABLE_DEF" />
+      <property name="format"
+                value="^[a-z][a-z0-9][a-zA-Z0-9]*$" />
+      <property name="allowOneCharVarInForLoop"
+                value="true" />
+      <message key="name.invalidPattern"
+               value="Local variable name ''{0}'' must match pattern ''{1}''." />
+    </module>
+    <module name="ClassTypeParameterName">
+      <property name="format"
+                value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)" />
+      <message key="name.invalidPattern"
+               value="Class type name ''{0}'' must match pattern ''{1}''." />
+    </module>
+    <module name="MethodTypeParameterName">
+      <property name="format"
+                value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)" />
+      <message key="name.invalidPattern"
+               value="Method type name ''{0}'' must match pattern ''{1}''." />
+    </module>
+    <module name="InterfaceTypeParameterName">
+      <property name="format"
+                value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)" />
+      <message key="name.invalidPattern"
+               value="Interface type name ''{0}'' must match pattern ''{1}''." />
+    </module>
+    <module name="NoFinalizer" />
+    <module name="GenericWhitespace">
+      <message key="ws.followed"
+               value="GenericWhitespace ''{0}'' is followed by whitespace." />
+      <message key="ws.preceded"
+               value="GenericWhitespace ''{0}'' is preceded with whitespace." />
+      <message key="ws.illegalFollow"
+               value="GenericWhitespace ''{0}'' should followed by whitespace." />
+      <message key="ws.notPreceded"
+               value="GenericWhitespace ''{0}'' is not preceded with whitespace." />
+    </module>
+    <module name="Indentation">
+      <property name="basicOffset"
+                value="2" />
+      <property name="braceAdjustment"
+                value="0" />
+      <property name="caseIndent"
+                value="2" />
+      <property name="throwsIndent"
+                value="4" />
+      <property name="lineWrappingIndentation"
+                value="4" />
+      <property name="arrayInitIndent"
+                value="2" />
+    </module>
+    <module name="AbbreviationAsWordInName">
+      <property name="ignoreFinal"
+                value="false" />
+      <property name="allowedAbbreviationLength"
+                value="3" />
+    </module>
+    <module name="OverloadMethodsDeclarationOrder" />
+    <module name="VariableDeclarationUsageDistance">
+      <property name="allowedDistance"
+                value="8" />
+    </module>
+    <module name="MethodParamPad" />
+    <module name="TypecastParenPad" />
+    <module name="OperatorWrap">
+      <property name="option"
+                value="NL" />
+      <property name="tokens"
+                value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR, LT, MINUS, MOD, NOT_EQUAL, PLUS, QUESTION, SL, SR, STAR " />
+    </module>
+    <module name="AnnotationLocation">
+      <property name="tokens"
+                value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF" />
+    </module>
+    <module name="AnnotationLocation">
+      <property name="tokens"
+                value="VARIABLE_DEF" />
+      <property name="allowSamelineMultipleAnnotations"
+                value="true" />
+    </module>
+    <module name="NonEmptyAtclauseDescription" />
+    <module name="JavadocTagContinuationIndentation" />
+    <module name="SummaryJavadoc">
+      <property name="forbiddenSummaryFragments"
+                value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )" />
+    </module>
+    <module name="JavadocParagraph" />
+    <module name="AtclauseOrder">
+      <property name="tagOrder"
+                value="@param, @return, @throws, @deprecated" />
+      <property name="target"
+                value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF" />
+    </module>
+    <module name="JavadocMethod">
+      <property name="scope"
+                value="public" />
+      <property name="allowMissingParamTags"
+                value="true" />
+      <property name="allowMissingThrowsTags"
+                value="true" />
+      <property name="allowMissingReturnTag"
+                value="true" />
+      <property name="minLineCount"
+                value="2" />
+      <property name="allowedAnnotations"
+                value="Override, Test, Before, After, BeforeClass, AfterClass, Parameters" />
+      <property name="allowUndeclaredRTE"
+                value="true" />
+      <property name="allowThrowsTagsForSubclasses"
+                value="true" />
+      <property name="suppressLoadErrors"
+                value="true" />
+      <property name="tokens"
+                value="METHOD_DEF, ANNOTATION_FIELD_DEF" />
+    </module>
+    <module name="MethodName">
+      <property name="format"
+                value="^[a-z][a-z0-9][a-zA-Z0-9_]*$" />
+      <message key="name.invalidPattern"
+               value="Method name ''{0}'' must match pattern ''{1}''." />
+    </module>
+    <module name="SingleLineJavadoc">
+      <property name="ignoreInlineTags"
+                value="false" />
+    </module>
+    <module name="EmptyCatchBlock">
+      <property name="exceptionVariableName"
+                value="expected" />
+    </module>
+    <module name="CommentsIndentation" />
+  </module>
 </module>
diff --git a/styleguide/pmd-ruleset.xml b/styleguide/pmd-ruleset.xml
index 950c133ac8..1b50aa778d 100644
--- a/styleguide/pmd-ruleset.xml
+++ b/styleguide/pmd-ruleset.xml
@@ -3,59 +3,58 @@
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 http://pmd.sourceforge.net/ruleset_2_0_0.xsd">
-    <rule ref="rulesets/java/basic.xml" />
-    <rule ref="rulesets/java/braces.xml" />
-    <rule ref="rulesets/java/empty.xml" />
-    <rule ref="rulesets/java/empty.xml/EmptyCatchBlock">
-        <properties>
-            <property name="allowCommentedBlocks" value="true"/>
-        </properties>
-    </rule>
-    <rule ref="rulesets/java/imports.xml" />
-    <rule ref="rulesets/java/junit.xml">
-        <exclude name="JUnitTestContainsTooManyAsserts" />
-    </rule>
-    <rule ref="rulesets/java/strings.xml">
-        <exclude name="AvoidDuplicateLiterals" />
-    </rule>
-    <rule ref="rulesets/java/unnecessary.xml" />
-    <rule ref="rulesets/java/unusedcode.xml" />
-    <rule ref="rulesets/java/unusedcode.xml/UnusedFormalParameter">
-        <properties>
-            <property name="checkAll" value="true"/>
-        </properties>
-    </rule>
 
-    <!-- Custom Rules -->
-
-    <rule name="UseRequireNonNull"
-          message="Use Objects.requireNonNull() instead of throwing a NullPointerException yourself."
-          language="java"
-          class="net.sourceforge.pmd.lang.rule.XPathRule">
-        <description>
-           Use Objects.requireNonNull() instead of throwing a NullPointerException yourself.
-        </description>
-        <properties>
-            <property name="xpath">
-                <value>
-                    <![CDATA[
+  <rule ref="rulesets/java/basic.xml" />
+  <rule ref="rulesets/java/braces.xml" />
+  <rule ref="rulesets/java/empty.xml" />
+  <rule ref="rulesets/java/empty.xml/EmptyCatchBlock">
+    <properties>
+      <property name="allowCommentedBlocks"
+                value="true" />
+    </properties>
+  </rule>
+  <rule ref="rulesets/java/imports.xml" />
+  <rule ref="rulesets/java/junit.xml">
+    <exclude name="JUnitTestContainsTooManyAsserts" />
+  </rule>
+  <rule ref="rulesets/java/strings.xml">
+    <exclude name="AvoidDuplicateLiterals" />
+  </rule>
+  <rule ref="rulesets/java/unnecessary.xml" />
+  <rule ref="rulesets/java/unusedcode.xml" />
+  <rule ref="rulesets/java/unusedcode.xml/UnusedFormalParameter">
+    <properties>
+      <property name="checkAll"
+                value="true" />
+    </properties>
+  </rule>
+  <!-- Custom Rules -->
+  <rule name="UseRequireNonNull"
+        message="Use Objects.requireNonNull() instead of throwing a NullPointerException yourself."
+        language="java"
+        class="net.sourceforge.pmd.lang.rule.XPathRule">
+    <description>Use Objects.requireNonNull() instead of throwing a
+    NullPointerException yourself.</description>
+    <properties>
+      <property name="xpath">
+        <value>
+<![CDATA[
                         //IfStatement[child::Expression//NullLiteral]/Statement//ThrowStatement/Expression/PrimaryExpression/PrimaryPrefix/AllocationExpression/ClassOrInterfaceType[@Image='NullPointerException']
                     ]]>
-                </value>
-            </property>
-        </properties>
-        <priority>3</priority>
-        <example>
-            <![CDATA[
+        </value>
+      </property>
+    </properties>
+    <priority>3</priority>
+    <example>
+<![CDATA[
                 public class Example {
-	                public Example(Object example) {
-		                if (example == null) {
-			                throw new NullPointerException();
-		                }
-	                }
+                        public Example(Object example) {
+                                if (example == null) {
+                                        throw new NullPointerException();
+                                }
+                        }
                 }
             ]]>
-        </example>
-    </rule>
-
+    </example>
+  </rule>
 </ruleset>
diff --git a/styleguide/suppressions.xml b/styleguide/suppressions.xml
index 9c98b44a35..80e5a1b0d0 100644
--- a/styleguide/suppressions.xml
+++ b/styleguide/suppressions.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0"?>
-
-<!DOCTYPE suppressions PUBLIC
-        "-//Puppy Crawl//DTD Suppressions 1.1//EN"
-        "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
+<!DOCTYPE
+suppressions PUBLIC "-//Puppy Crawl//DTD Suppressions 1.1//EN"
+"http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
 <suppressions>
-    <suppress files=".*sim.*" checks="[a-zA-Z0-9]*"/>
-    <suppress files="edu.wpi.first.wpilibj.util.WPILibVersion" checks="[a-zA-Z0-9]*"/>
+  <suppress files=".*sim.*"
+            checks="[a-zA-Z0-9]*" />
+  <suppress files="edu.wpi.first.wpilibj.util.WPILibVersion"
+            checks="[a-zA-Z0-9]*" />
 </suppressions>
diff --git a/tidy-html.conf b/tidy-html.conf
new file mode 100644
index 0000000000..23c4e739c2
--- /dev/null
+++ b/tidy-html.conf
@@ -0,0 +1,3 @@
+indent: yes
+indent-spaces: 2
+wrap: 80
diff --git a/tidy-xml.conf b/tidy-xml.conf
new file mode 100644
index 0000000000..0fb9bdaf8f
--- /dev/null
+++ b/tidy-xml.conf
@@ -0,0 +1,4 @@
+indent: yes
+indent-spaces: 2
+indent-attributes: yes
+literal-attributes: yes
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/package.html b/wpilibj/src/main/java/edu/wpi/first/wpilibj/package.html
index beaa189373..d11ae27cdb 100644
--- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/package.html
+++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/package.html
@@ -1,25 +1,30 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-    <title>WPI Robotics library</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=MacRoman">
-</head>
-<body>
-The WPI Robotics library (WPILibJ) is a set of Java classes that interfaces to the hardware in the
-FRC control system and your robot. There are classes to handle sensors, motors, the driver
-station, and a number of other utility functions like timing and field management.
-The library is designed to:
-<ul>
-    <li>Deal with all the low level interfacing to these components so you can concentrate on
-        solving this year's "robot problem". This is a philosophical decision to let you focus
-        on the higher-level design of your robot rather than deal with the details of the
-        processor and the operating system.
-    </li>
-    <li>Understand everything at all levels by making the full source code of the library
-        available. You can study (and modify) the algorithms used by the gyro class for
-        oversampling and integration of the input signal or just ask the class for the current
-        robot heading. You can work at any level.
-    </li>
-</ul>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+  <head>
+    <title>
+      WPI Robotics library
+    </title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  </head>
+  <body>
+    The WPI Robotics library (WPILibJ) is a set of Java classes that interfaces
+    to the hardware in the FRC control system and your robot. There are classes
+    to handle sensors, motors, the driver station, and a number of other
+    utility functions like timing and field management. The library is designed
+    to:
+    <ul>
+      <li>Deal with all the low level interfacing to these components so you
+      can concentrate on solving this year's "robot problem". This is a
+      philosophical decision to let you focus on the higher-level design of
+      your robot rather than deal with the details of the processor and the
+      operating system.
+      </li>
+      <li>Understand everything at all levels by making the full source code of
+      the library available. You can study (and modify) the algorithms used by
+      the gyro class for oversampling and integration of the input signal or
+      just ask the class for the current robot heading. You can work at any
+      level.
+      </li>
+    </ul>
+  </body>
+</html>