Checkstyle stuff

Remove targets for individual weird bits of the codebase
Add in code from submodules
Include checkstyle jar in the lib directory
Update rules for checkstyle 5.3

Change-Id: I85b5a53165fcef05bb176d4f5e93aa6ae3cf562a
Reviewed-on: http://gerrit.dmdirc.com/1747
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>

.gitignore

@@ -29,6 +29,7 @@ __history
 /reports/findbugs/
 /reports/report-fb.html
 /reports/report-pmd.*
+/reports/checkstyle.*
 /lib/clover.license
 /.clover
 /test_profile

build-reports.xml

@@ -7,142 +7,26 @@
     <target name="domostreports" depends="test-both,-mostreports,javadoc"
             description="Run all reports except Findbugs." />
 
-    <target name="checkstyle" depends="checkstyle-all, checkstyle-actions,
-                                       checkstyle-core,
-                                       checkstyle-commandparser,
-                                       checkstyle-config, checkstyle-logger,
-                                       checkstyle-parser, checkstyle-plugins,
-                                       checkstyle-ui, -remove-xml-files,
-                                       -move-index"
-            description="Run checkstyle." /> 
+    <target name="checkstyle" depends="checkstyle-all, -move-index" description="Run checkstyle." /> 
 
     <target name="-allreports" depends="findbugs, cpd, pmd, checkstyle" /> 
     <target name="-mostreports" depends="cpd, pmd, checkstyle" /> 
-    
-    <target name="checkstyle-plugins">
-        <taskdef resource="checkstyletask.properties"
-                         classpath="checkstyle-all-4.3.jar"/>
-        <checkstyle config="checkstyle/dmdirc_checks.xml" failureProperty="checkstyle.failure"
-                                failOnViolation="false">
-            <fileset dir="src/com/dmdirc/plugins/" includes="**/*.java"/>
-            <formatter type="xml" tofile="reports/report-plugins.xml"/>
-            
-        </checkstyle>
-        <xslt in="reports/report-plugins.xml" out="reports/report-plugins.html" style="checkstyle/checkstyle.xsl"/>
-    </target>
-    
-    <target name="checkstyle-actions">
-        <taskdef resource="checkstyletask.properties"
-                         classpath="checkstyle.jar"/>
-        <checkstyle config="checkstyle/dmdirc_checks.xml" failureProperty="checkstyle.failure"
-                                failOnViolation="false">
-            <fileset dir="src/com/dmdirc/actions/" includes="**/*.java"/>
-            <formatter type="xml" tofile="reports/report-actions.xml"/>
-            
-        </checkstyle>
-        <xslt in="reports/report-actions.xml" out="reports/report-actions.html" style="checkstyle/checkstyle.xsl"/>
-    </target>            
-    
-    <target name="checkstyle-ui">
-        <taskdef resource="checkstyletask.properties"
-                         classpath="checkstyle.jar"/>
-        <checkstyle config="checkstyle/dmdirc_checks.xml" failureProperty="checkstyle.failure"
-                                failOnViolation="false">
-            <fileset dir="src/com/dmdirc/ui/" includes="**/*.java"/>
-            <formatter type="xml" tofile="reports/report-ui.xml"/>
-        </checkstyle>
-        
-        <xslt in="reports/report-ui.xml" out="reports/report-ui.html" style="checkstyle/checkstyle.xsl"/>
-    </target>
-    
-    <target name="checkstyle-parser">
-        <taskdef resource="checkstyletask.properties"
-                         classpath="checkstyle.jar"/>
-        <checkstyle config="checkstyle/dmdirc_checks.xml" failureProperty="checkstyle.failure"
-                                failOnViolation="false">
-            <fileset dir="modules/parser/src/com/dmdirc/parser/irc/" includes="**/*.java"/>
-            <formatter type="xml" tofile="reports/report-parser.xml"/>
-        </checkstyle>
-        <xslt in="reports/report-parser.xml" out="reports/report-parser.html" style="checkstyle/checkstyle.xsl"/>
-
-    </target>
-
-    <target name="checkstyle-addons">
-        <taskdef resource="checkstyletask.properties"
-                         classpath="checkstyle.jar"/>
-        <checkstyle config="checkstyle/dmdirc_checks.xml" failureProperty="checkstyle.failure"
-                                failOnViolation="false">
-            <fileset dir="modules/addons/src/com/dmdirc/addons/" includes="**/*.java"/>
-            <formatter type="xml" tofile="reports/report-addons.xml"/>
-        </checkstyle>
-        <xslt in="reports/report-addons.xml" out="reports/report-addons.html" style="checkstyle/checkstyle.xsl"/>
 
+    <target name="-init-checkstyle">
+        <taskdef resource="checkstyletask.properties" classpath="lib/checkstyle-5.3-all.jar"/>
     </target>
     
-    <target name="checkstyle-logger">
-        <taskdef resource="checkstyletask.properties"
-                         classpath="checkstyle.jar"/>
-        <checkstyle config="checkstyle/dmdirc_checks.xml" failureProperty="checkstyle.failure"
-                                failOnViolation="false">
-            <fileset dir="src/com/dmdirc/logger/" includes="**/*.java"/>
-            <formatter type="xml" tofile="reports/report-logger.xml"/>
+    <target name="checkstyle-all" depends="-init-checkstyle">
+        <checkstyle config="checkstyle/dmdirc_checks.xml" failureProperty="checkstyle.failure" failOnViolation="false">
+            <fileset dir="src/" includes="**/*.java" excludes="net/miginfocom/**"/>
+            <fileset dir="modules/plugins/src/" includes="**/*.java"/>
+            <fileset dir="modules/parser/src/" includes="**/*.java"/>
+            <fileset dir="modules/util/src/" includes="**/*.java"/>
+            <formatter type="xml" tofile="reports/checkstyle.xml"/>
         </checkstyle>
-        <xslt in="reports/report-logger.xml" out="reports/report-logger.html" style="checkstyle/checkstyle.xsl"/>
+        <xslt in="reports/checkstyle.xml" out="reports/checkstyle.html" style="checkstyle/checkstyle.xsl"/>
     </target>
     
-    
-    <target name="checkstyle-config">
-        <taskdef resource="checkstyletask.properties"
-                         classpath="checkstyle.jar"/>
-        <checkstyle config="checkstyle/dmdirc_checks.xml" failureProperty="checkstyle.failure"
-                                failOnViolation="false">
-            <fileset dir="src/com/dmdirc/config/" includes="**/*.java"/>
-            <formatter type="xml" tofile="reports/report-config.xml"/>
-        </checkstyle>
-        <xslt in="reports/report-config.xml" out="reports/report-config.html" style="checkstyle/checkstyle.xsl"/>
-    </target>
-    
-    <target name="checkstyle-commandparser">
-        <taskdef resource="checkstyletask.properties"
-                         classpath="checkstyle.jar"/>
-        <checkstyle config="checkstyle/dmdirc_checks.xml" failureProperty="checkstyle.failure"
-                                failOnViolation="false">
-            <fileset dir="src/com/dmdirc/commandparser/" includes="**/*.java"/>
-            <formatter type="xml" tofile="reports/report-commandparser.xml"/>
-        </checkstyle>
-        <xslt in="reports/report-commandparser.xml" out="reports/report-commandparser.html" style="checkstyle/checkstyle.xsl"/>
-    </target>
-    
-    <target name="checkstyle-core">
-        <taskdef resource="checkstyletask.properties"
-                         classpath="checkstyle.jar"/>
-        
-        <checkstyle config="checkstyle/dmdirc_checks.xml" failureProperty="checkstyle.failure"
-                                failOnViolation="false">
-            <fileset dir="src/com/dmdirc/" includes="*.java"/>
-            <formatter type="xml" tofile="reports/report-core.xml"/>
-        </checkstyle>
-        <xslt in="reports/report-core.xml" out="reports/report-core.html" style="checkstyle/checkstyle.xsl"/>
-    </target>
-    
-    <target name="checkstyle-all">
-        <taskdef resource="checkstyletask.properties"
-                         classpath="checkstyle.jar"/>
-        <checkstyle config="checkstyle/dmdirc_checks.xml" failureProperty="checkstyle.failure"
-                                failOnViolation="false">
-            
-            <fileset dir="src/com/dmdirc/" includes="**/*.java"/>
-            <formatter type="xml" tofile="reports/report-all.xml"/>
-        </checkstyle>
-        <xslt in="reports/report-all.xml" out="reports/report-all.html" style="checkstyle/checkstyle.xsl"/>
-    </target>
-    
-    <target name="-remove-xml-files">
-        <delete>
-            <fileset dir="reports/" includes="*.xml"/>
-        </delete>
-    </target>
-
     <target name="-move-index">
         <!-- <copy file="checkstyle/index.html" tofile="reports/index.html"/> -->
         <copy file="checkstyle/sorttable.js" tofile="reports/sorttable.js"/>

checkstyle/dmdirc_checks.xml

@@ -7,7 +7,7 @@
 
     <!-- Checks that a package.html file exists for each package.     -->
     <!-- See http://checkstyle.sf.net/config_javadoc.html#PackageHtml -->
-    <module name="PackageHtml"/>
+    <module name="JavadocPackage"/>
 
     <!-- Checks whether files end with a new line.                        -->
     <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
@@ -17,20 +17,20 @@
     <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
     <module name="Translation"/>
 
+    <module name="Header">
+                <property name="headerFile" value="checkstyle/dmdirc.license"/>
+                <property name="ignoreLines" value="2, 21"/>
+    </module>
+
+    <module name="FileLength"/>
 
     <module name="TreeWalker">
-	    
 	<module name="ImportOrder">
 		    <property name="groups" value="com.dmdirc,java,javax"/>
 		    <property name="ordered" value="true"/>
 		    <property name="separated" value="true"/>
 	</module>
 	    
-	<module name="Header">
-		    <property name="headerFile" value="checkstyle/dmdirc.license"/>
-		    <property name="ignoreLines" value="2, 21"/>
-	</module>
-
         <!-- Checks for Javadoc comments.                     -->
         <!-- See http://checkstyle.sf.net/config_javadoc.html -->
         <module name="JavadocMethod"/>
@@ -50,25 +50,9 @@
         <module name="StaticVariableName"/>
         <module name="TypeName"/>
 
-
-        <!-- Checks for Headers                                -->
-        <!-- See http://checkstyle.sf.net/config_header.html   -->
-        <!-- <module name="Header">                            -->
-            <!-- The follow property value demonstrates the ability     -->
-            <!-- to have access to ANT properties. In this case it uses -->
-            <!-- the ${basedir} property to allow Checkstyle to be run  -->
-            <!-- from any directory within a project. See property      -->
-            <!-- expansion,                                             -->
-            <!-- http://checkstyle.sf.net/config.html#properties        -->
-            <!-- <property                                              -->
-            <!--     name="headerFile"                                  -->
-            <!--     value="${basedir}/java.header"/>                   -->
-        <!-- </module> -->
-
         <!-- Following interprets the header file as regular expressions. -->
         <!-- <module name="RegexpHeader"/>                                -->
 
-
         <!-- Checks for imports                              -->
         <!-- See http://checkstyle.sf.net/config_import.html -->
         <module name="AvoidStarImport"/>
@@ -76,14 +60,11 @@
         <module name="RedundantImport"/>
         <module name="UnusedImports"/>
 
-
         <!-- Checks for Size Violations.                    -->
         <!-- See http://checkstyle.sf.net/config_sizes.html -->
-        <module name="FileLength"/>
         <module name="MethodLength"/>
         <module name="ParameterNumber"/>
 
-
         <!-- Checks for whitespace                               -->
         <!-- See http://checkstyle.sf.net/config_whitespace.html -->
         <module name="EmptyForIteratorPad"/>