diff --git a/pmd/pom.xml b/pmd/pom.xml
index 31a1596c23..39ffbfe2f3 100644
--- a/pmd/pom.xml
+++ b/pmd/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.sourceforge.pmd</groupId>
     <artifactId>pmd</artifactId>
@@ -240,11 +241,10 @@
     <properties>
         <javacc.version>4.1</javacc.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <!--
-             This value actually differs to maven default expectation(src/site/xdoc/) as
-             we need to pre process those and we place them instead in target/generated-xdocs/.
-             If the xdocs files stay in src/site/xdoc/, mvn tries to copy over the generated one,
-             and complains... -->
+        <!-- This value actually differs to maven default expectation(src/site/xdoc/)
+            as we need to pre process those and we place them instead in target/generated-xdocs/.
+            If the xdocs files stay in src/site/xdoc/, mvn tries to copy over the generated
+            one, and complains... -->
         <src.xdocs.dir>src/site/xdocs</src.xdocs.dir>
         <pmd.website.baseurl>http://pmd.sourceforge.net/snapshot</pmd.website.baseurl>
     </properties>
@@ -276,14 +276,14 @@
         </extensions>
         <plugins>
             <plugin>
-              <artifactId>maven-resources-plugin</artifactId>
-              <version>2.5</version>
-              <configuration>
-                <useDefaultDelimiters>false</useDefaultDelimiters>
-                <delimiters>
-                    <delimiter>${*}</delimiter>
-                </delimiters>
-              </configuration>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.5</version>
+                <configuration>
+                    <useDefaultDelimiters>false</useDefaultDelimiters>
+                    <delimiters>
+                        <delimiter>${*}</delimiter>
+                    </delimiters>
+                </configuration>
             </plugin>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -308,39 +308,45 @@
                 <version>1.7</version>
                 <inherited>true</inherited>
                 <executions>
-                  <execution>
-                    <id>process-sources</id>
-                    <phase>process-sources</phase>
-                    <configuration>
-                      <target>
-                        <ant antfile="src/main/ant/alljavacc.xml">
-                          <property name="src" value="${project.build.sourceDirectory}" />
-                          <property name="javacc.jar" value="${settings.localRepository}/net/java/dev/javacc/javacc/${javacc.version}/javacc-${javacc.version}.jar" />
-                        </ant>
-                      </target>
-                    </configuration>
-                    <goals>
-                      <goal>run</goal>
-                    </goals>
+                    <execution>
+                        <id>process-sources</id>
+                        <phase>process-sources</phase>
+                        <configuration>
+                            <target>
+                                <ant antfile="src/main/ant/alljavacc.xml">
+                                    <property name="src"
+                                        value="${project.build.sourceDirectory}" />
+                                    <property name="javacc.jar"
+                                        value="${settings.localRepository}/net/java/dev/javacc/javacc/${javacc.version}/javacc-${javacc.version}.jar" />
+                                </ant>
+                            </target>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
                     </execution>
                     <execution>
-                      <id>generate-ruleset-as-xdocs</id>
-                      <phase>pre-site</phase>
-                      <configuration>
-                        <target>
-                         <echo>PMD specific tasks: generating xdocs from rulesets</echo>
-                         <mkdir dir="${project.build.directory}/generated-xdocs/" />
-                         <copy toDir="${project.build.directory}/generated-xdocs/" overwrite="true" verbose="true">
-                               <fileset dir="${src.xdocs.dir}" />
-                           <filterset>
-                             <filter token="VERSION" value="${project.version}" />
-                           </filterset>
-                         </copy>
-                        </target>
-		              </configuration>
-		              <goals>
-		                <goal>run</goal>
-		              </goals>
+                        <id>generate-ruleset-as-xdocs</id>
+                        <phase>pre-site</phase>
+                        <configuration>
+                            <target>
+                                <echo>PMD specific tasks: generating xdocs from rulesets</echo>
+                                <mkdir
+                                    dir="${project.build.directory}/generated-xdocs/" />
+                                <copy
+                                    toDir="${project.build.directory}/generated-xdocs/"
+                                    overwrite="true" verbose="true">
+                                    <fileset dir="${src.xdocs.dir}" />
+                                    <filterset>
+                                        <filter token="VERSION"
+                                            value="${project.version}" />
+                                    </filterset>
+                                </copy>
+                            </target>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
                     </execution>
                     <execution>
                         <id>move-index-and-delete-generated-xdocs</id>
@@ -348,22 +354,26 @@
                         <configuration>
                             <target>
                                 <echo>PMD site specific tasks</echo>
-                                <echo>1. Copying missing images to site
-                                    directory.</echo>
-                                <copy todir="${project.build.directory}/site/images/">
-                                    <fileset dir="${src.xdocs.dir}/images/" includes="**/*.*" />
+                                <echo>1. Copying missing images to site directory.</echo>
+                                <copy
+                                    todir="${project.build.directory}/site/images/">
+                                    <fileset dir="${src.xdocs.dir}/images/"
+                                        includes="**/*.*" />
                                 </copy>
-                                <echo>2. Adding missing text files to
-                                    site.</echo>
+                                <echo>2. Adding missing text files to site.</echo>
                                 <copy todir="${project.build.directory}/site/">
-                                    <fileset dir="${src.xdocs.dir}/" includes="**/*.txt" />
+                                    <fileset dir="${src.xdocs.dir}/"
+                                        includes="**/*.txt" />
                                 </copy>
-                                <echo>3. Deleting useless generated
-                                    files.</echo>
+                                <echo>3. Deleting useless generated files.</echo>
                                 <delete quiet="true">
-                                    <fileset dir="${src.xdocs.dir}/rules" includes="**/*.xml" />
-                                    <fileset dir="${src.xdocs.dir}/" includes="mergedruleset.xml" />
-                                    <fileset dir="${project.build.directory}" includes="site/mergedruleset.html" />
+                                    <fileset dir="${src.xdocs.dir}/rules"
+                                        includes="**/*.xml" />
+                                    <fileset dir="${src.xdocs.dir}/"
+                                        includes="mergedruleset.xml" />
+                                    <fileset
+                                        dir="${project.build.directory}"
+                                        includes="site/mergedruleset.html" />
                                 </delete>
                             </target>
                         </configuration>
@@ -376,10 +386,12 @@
                         <phase>clean</phase>
                         <configuration>
                             <target>
-                                <echo>PMD specific tasks: cleaning  generated xdocs</echo>
+                                <echo>PMD specific tasks: cleaning generated xdocs</echo>
                                 <delete quiet="true">
-                                    <fileset dir="${src.xdocs.dir}/rules" includes="**/*.xml" />
-                                    <fileset dir="${src.xdocs.dir}/" includes="mergedruleset.xml" />
+                                    <fileset dir="${src.xdocs.dir}/rules"
+                                        includes="**/*.xml" />
+                                    <fileset dir="${src.xdocs.dir}/"
+                                        includes="mergedruleset.xml" />
                                 </delete>
                             </target>
                         </configuration>
@@ -389,10 +401,9 @@
                     </execution>
                 </executions>
             </plugin>
-            <!-- As Clover can be quite an hassle, know that you can skip it
-                 by using the following option when running mvn:
-                   $ mvn clean -Dmaven.clover.skip=true site
-            -->
+            <!-- As Clover can be quite an hassle, know that you can skip 
+                it by using the following option when running mvn: $ mvn clean -Dmaven.clover.skip=true 
+                site -->
             <plugin>
                 <groupId>com.atlassian.maven.plugins</groupId>
                 <artifactId>maven-clover2-plugin</artifactId>
@@ -425,11 +436,12 @@
                 <configuration>
                     <appendAssemblyId>false</appendAssemblyId>
                     <archiverConfig>
-                      <defaultDirectoryMode>493</defaultDirectoryMode> <!-- 0755 -->
+                        <defaultDirectoryMode>493</defaultDirectoryMode> <!-- 0755 -->
                     </archiverConfig>
                 </configuration>
                 <executions>
-                    <!-- needs to run after the site, as the site documentation will be included in the zip files -->
+                    <!-- needs to run after the site, as the site documentation 
+                        will be included in the zip files -->
                     <execution>
                         <id>build-bin-dist</id>
                         <phase>post-site</phase>
@@ -459,17 +471,17 @@
                 </executions>
             </plugin>
             <plugin>
-              <groupId>net.sourceforge.pmd</groupId>
-              <artifactId>pmd-build</artifactId>
-              <version>0.6</version>
-              <executions>
-                <execution>
-                <phase>pre-site</phase>
-                <goals>
-                  <goal>pmd-pre-site</goal>
-                </goals>
-                </execution>
-              </executions>
+                <groupId>net.sourceforge.pmd</groupId>
+                <artifactId>pmd-build</artifactId>
+                <version>0.6</version>
+                <executions>
+                    <execution>
+                        <phase>pre-site</phase>
+                        <goals>
+                            <goal>pmd-pre-site</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -545,9 +557,9 @@
             <scope>runtime</scope>
         </dependency>
         <dependency>
-          <groupId>net.java.dev.javacc</groupId>
-          <artifactId>javacc</artifactId>
-          <version>${javacc.version}</version>
+            <groupId>net.java.dev.javacc</groupId>
+            <artifactId>javacc</artifactId>
+            <version>${javacc.version}</version>
         </dependency>
     </dependencies>
 
@@ -567,7 +579,9 @@
                     <reportSet>
                         <reports>
                             <report>javadoc</report>
-                            <!-- FIXME: The following report fails <report>test-javadoc</report> -->
+                            <!-- FIXME: The following report fails
+                            <report>test-javadoc</report>
+                            -->
                         </reports>
                     </reportSet>
                 </reportSets>
@@ -583,18 +597,19 @@
                     <minimumTokens>100</minimumTokens>
                     <targetJdk>1.6</targetJdk>
                     <rulesets>
-                        <!--  once the pmd plugin is migrated to pmd-5, we should be able to use the current dogfood configuration -->
-<!--                        <ruleset>src/main/resources/rulesets/internal/dogfood.xml</ruleset> -->
+                        <!-- once the pmd plugin is migrated to pmd-5, we
+                            should be able to use the current dogfood configuration -->
+                        <!-- <ruleset>src/main/resources/rulesets/internal/dogfood.xml</ruleset> -->
                         <ruleset>https://pmd.svn.sourceforge.net/svnroot/pmd/branches/pmd/4.3.x/rulesets/internal/dogfood.xml</ruleset>
                     </rulesets>
                 </configuration>
             </plugin>
 
-            <!-- Emma is a test coverage tools to be used instead of clover.
-                As the mvn2 plugin is not released yet, the plugin is commented out, so you
-                build won't fail: You can get an Emma plugin for Maven2 at http://jira.codehaus.org/browse/MOJO-762
+            <!-- Emma is a test coverage tools to be used instead of clover. 
+                As the mvn2 plugin is not released yet, the plugin is commented out, so you 
+                build won't fail: You can get an Emma plugin for Maven2 at http://jira.codehaus.org/browse/MOJO-762 
                 Download the tarball, extract, cd into dir, run $ mvn install. -->
-            <!-- <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>emma-maven-plugin</artifactId>
+            <!-- <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>emma-maven-plugin</artifactId> 
                 </plugin> -->
 
             <plugin>
@@ -670,38 +685,38 @@
             <build>
                 <plugins>
                     <plugin>
-                      <inherited>true</inherited>
-                      <groupId>org.apache.maven.plugins</groupId>
-                      <artifactId>maven-source-plugin</artifactId>
-                      <executions>
-                        <execution>
-                          <id>attach-sources</id>
-                          <goals>
-                            <goal>jar</goal>
-                          </goals>
-                        </execution>
-                      </executions>
+                        <inherited>true</inherited>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-source-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>attach-sources</id>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
                     </plugin>
                     <plugin>
-                      <inherited>true</inherited>
-                      <groupId>org.apache.maven.plugins</groupId>
-                      <artifactId>maven-javadoc-plugin</artifactId>
-                      <executions>
-                        <execution>
-                          <id>attach-javadocs</id>
-                          <goals>
-                              <goal>jar</goal>
-                          </goals>
-                        </execution>
-                      </executions>
+                        <inherited>true</inherited>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>attach-javadocs</id>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
                     </plugin>
                     <plugin>
-                      <inherited>true</inherited>
-                      <groupId>org.apache.maven.plugins</groupId>
-                      <artifactId>maven-deploy-plugin</artifactId>
-                      <configuration>
-                          <updateReleaseInfo>true</updateReleaseInfo>
-                      </configuration>
+                        <inherited>true</inherited>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-deploy-plugin</artifactId>
+                        <configuration>
+                            <updateReleaseInfo>true</updateReleaseInfo>
+                        </configuration>
                     </plugin>
                 </plugins>
             </build>
@@ -728,14 +743,16 @@
             <id>reports</id>
             <build>
                 <plugins>
-                   <plugin>
+                    <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-pmd-plugin</artifactId>
                         <version>2.7.1</version>
                         <executions>
                             <execution>
                                 <phase>verify</phase>
-                                <goals><goal>pmd</goal></goals>
+                                <goals>
+                                    <goal>pmd</goal>
+                                </goals>
                             </execution>
                         </executions>
                         <configuration>
@@ -743,8 +760,9 @@
                             <minimumTokens>100</minimumTokens>
                             <targetJdk>1.6</targetJdk>
                             <rulesets>
-                                <!--  once the pmd plugin is migrated to pmd-5, we should be able to use the current dogfood configuration -->
-<!--                                 <ruleset>src/main/resources/rulesets/internal/dogfood.xml</ruleset> -->
+                                <!-- once the pmd plugin is migrated to pmd-5, 
+                                    we should be able to use the current dogfood configuration -->
+                                <!-- <ruleset>src/main/resources/rulesets/internal/dogfood.xml</ruleset> -->
                                 <ruleset>https://pmd.svn.sourceforge.net/svnroot/pmd/branches/pmd/4.3.x/rulesets/internal/dogfood.xml</ruleset>
                             </rulesets>
                         </configuration>
@@ -756,7 +774,9 @@
                         <executions>
                             <execution>
                                 <phase>verify</phase>
-                                <goals><goal>checkstyle</goal></goals>
+                                <goals>
+                                    <goal>checkstyle</goal>
+                                </goals>
                             </execution>
                         </executions>
                         <configuration>
diff --git a/pmd/src/main/ant/alljavacc.xml b/pmd/src/main/ant/alljavacc.xml
index c327e2ef69..d7e3ce88a4 100644
--- a/pmd/src/main/ant/alljavacc.xml
+++ b/pmd/src/main/ant/alljavacc.xml
@@ -1,83 +1,140 @@
 <project name="pmd" default="alljavacc" basedir="../../">
 
-	<property name="dir.lib" value="${basedir}/lib" />
+    <property name="dir.lib" value="${basedir}/lib" />
     <property name="javacc-home.path" value="${dir.lib}" />
-    <property name="javacc-home.path" value="${basedir}/javacchome"/>
+    <property name="javacc-home.path" value="${basedir}/javacchome" />
 
-    <mkdir dir="${javacc-home.path}"/>
-    <copy file="${javacc.jar}" tofile="${javacc-home.path}/javacc.jar"/>
+    <mkdir dir="${javacc-home.path}" />
+    <copy file="${javacc.jar}" tofile="${javacc-home.path}/javacc.jar" />
 
-    <target name="alljavacc" description="Generates all JavaCC aspects within PMD" depends="dummyjjtree,javajjtree,jspjjtree,cppjavacc"/>
+    <target name="alljavacc"
+            description="Generates all JavaCC aspects within PMD"
+            depends="dummyjjtree,javajjtree,jspjjtree,cppjavacc" />
 
     <target name="dummyjjtree" description="Generates the reusable JavaCC aspects">
 
         <delete dir="${src}/net/sourceforge/pmd/lang/ast/dummy" />
         <mkdir dir="${src}/net/sourceforge/pmd/lang/ast/dummy" />
         <echo>Using JavaCC home:"${javacc-home.path}</echo>
-		<jjtree target="etc/grammar/dummy.jjt" outputdirectory="${src}/net/sourceforge/pmd/lang/ast/dummy" javacchome="${javacc-home.path}" />
+        <jjtree target="etc/grammar/dummy.jjt"
+                outputdirectory="${src}/net/sourceforge/pmd/lang/ast/dummy"
+                javacchome="${javacc-home.path}" />
 
-		<!-- Generate CharStream interface -->
-		<javacc usercharstream="true" target="${src}/net/sourceforge/pmd/lang/ast/dummy/dummy.jj" outputdirectory="${src}/net/sourceforge/pmd/lang/ast/dummy" javacchome="${javacc-home.path}" />
-		<replace file="${src}/net/sourceforge/pmd/lang/ast/dummy/CharStream.java" token="net.sourceforge.pmd.lang.ast.dummy" value="net.sourceforge.pmd.lang.ast" />
-		<move overwrite="true" file="${src}/net/sourceforge/pmd/lang/ast/dummy/CharStream.java" tofile="${src}/net/sourceforge/pmd/lang/ast/CharStream.java" />
+        <!-- Generate CharStream interface -->
+        <javacc usercharstream="true"
+                target="${src}/net/sourceforge/pmd/lang/ast/dummy/dummy.jj"
+                outputdirectory="${src}/net/sourceforge/pmd/lang/ast/dummy"
+                javacchome="${javacc-home.path}" />
+        <replace file="${src}/net/sourceforge/pmd/lang/ast/dummy/CharStream.java"
+                 token="net.sourceforge.pmd.lang.ast.dummy"
+                 value="net.sourceforge.pmd.lang.ast" />
+        <move overwrite="true"
+              file="${src}/net/sourceforge/pmd/lang/ast/dummy/CharStream.java"
+              tofile="${src}/net/sourceforge/pmd/lang/ast/CharStream.java" />
 
-		<!-- Generate ASCII w/ Unicode Escapes CharStream implementation -->
-		<javacc usercharstream="false" unicodeinput="false" javaunicodeescape="true" static="false" target="${src}/net/sourceforge/pmd/lang/ast/dummy/dummy.jj" outputdirectory="${src}/net/sourceforge/pmd/lang/ast/dummy" javacchome="${javacc-home.path}" />
-		<replace file="${src}/net/sourceforge/pmd/lang/ast/dummy/JavaCharStream.java" token="net.sourceforge.pmd.lang.ast.dummy" value="net.sourceforge.pmd.lang.ast" />
-		<replace file="${src}/net/sourceforge/pmd/lang/ast/dummy/JavaCharStream.java" token="public class JavaCharStream" value="public class JavaCharStream implements CharStream" />
-		<move overwrite="true" file="${src}/net/sourceforge/pmd/lang/ast/dummy/JavaCharStream.java" tofile="${src}/net/sourceforge/pmd/lang/ast/JavaCharStream.java" />
+        <!-- Generate ASCII w/ Unicode Escapes CharStream implementation -->
+        <javacc usercharstream="false"
+                unicodeinput="false"
+                javaunicodeescape="true"
+                static="false"
+                target="${src}/net/sourceforge/pmd/lang/ast/dummy/dummy.jj"
+                outputdirectory="${src}/net/sourceforge/pmd/lang/ast/dummy"
+                javacchome="${javacc-home.path}" />
+        <replace file="${src}/net/sourceforge/pmd/lang/ast/dummy/JavaCharStream.java"
+                 token="net.sourceforge.pmd.lang.ast.dummy"
+                 value="net.sourceforge.pmd.lang.ast" />
+        <replace file="${src}/net/sourceforge/pmd/lang/ast/dummy/JavaCharStream.java"
+                 token="public class JavaCharStream"
+                 value="public class JavaCharStream implements CharStream" />
+        <move overwrite="true"
+              file="${src}/net/sourceforge/pmd/lang/ast/dummy/JavaCharStream.java"
+              tofile="${src}/net/sourceforge/pmd/lang/ast/JavaCharStream.java" />
 
-		<!-- Generate ASCII w/o Unicode Escapes CharStream implementation -->
-		<javacc usercharstream="false" unicodeinput="false" javaunicodeescape="false" static="false" target="${src}/net/sourceforge/pmd/lang/ast/dummy/dummy.jj" outputdirectory="${src}/net/sourceforge/pmd/lang/ast/dummy" javacchome="${javacc-home.path}" />
-		<replace file="${src}/net/sourceforge/pmd/lang/ast/dummy/SimpleCharStream.java" token="net.sourceforge.pmd.lang.ast.dummy" value="net.sourceforge.pmd.lang.ast" />
-		<replace file="${src}/net/sourceforge/pmd/lang/ast/dummy/SimpleCharStream.java" token="public class SimpleCharStream" value="public class SimpleCharStream implements CharStream" />
-		<move overwrite="true" file="${src}/net/sourceforge/pmd/lang/ast/dummy/SimpleCharStream.java" tofile="${src}/net/sourceforge/pmd/lang/ast/SimpleCharStream.java" />
-		<replace file="${src}/net/sourceforge/pmd/lang/ast/dummy/TokenMgrError.java" token="net.sourceforge.pmd.lang.ast.dummy" value="net.sourceforge.pmd.lang.ast" />
-		<replace file="${src}/net/sourceforge/pmd/lang/ast/dummy/TokenMgrError.java" token="extends Error" value="extends RuntimeException" />
-		<replace file="${src}/net/sourceforge/pmd/lang/ast/dummy/TokenMgrError.java" token="static final int" value="public static final int" />
-		<replace file="${src}/net/sourceforge/pmd/lang/ast/dummy/TokenMgrError.java">
-			<replacetoken><![CDATA["Lexical error at line "]]></replacetoken>
-			<replacevalue><![CDATA["Lexical error in file " + AbstractTokenManager.getFileName() + " at line "]]></replacevalue>
-		</replace>
-		<move overwrite="true" file="${src}/net/sourceforge/pmd/lang/ast/dummy/TokenMgrError.java" tofile="${src}/net/sourceforge/pmd/lang/ast/TokenMgrError.java" />
+        <!-- Generate ASCII w/o Unicode Escapes CharStream implementation -->
+        <javacc usercharstream="false"
+                unicodeinput="false"
+                javaunicodeescape="false"
+                static="false"
+                target="${src}/net/sourceforge/pmd/lang/ast/dummy/dummy.jj"
+                outputdirectory="${src}/net/sourceforge/pmd/lang/ast/dummy"
+                javacchome="${javacc-home.path}" />
+        <replace file="${src}/net/sourceforge/pmd/lang/ast/dummy/SimpleCharStream.java"
+                 token="net.sourceforge.pmd.lang.ast.dummy"
+                 value="net.sourceforge.pmd.lang.ast" />
+        <replace file="${src}/net/sourceforge/pmd/lang/ast/dummy/SimpleCharStream.java"
+                 token="public class SimpleCharStream"
+                 value="public class SimpleCharStream implements CharStream" />
+        <move overwrite="true"
+              file="${src}/net/sourceforge/pmd/lang/ast/dummy/SimpleCharStream.java"
+              tofile="${src}/net/sourceforge/pmd/lang/ast/SimpleCharStream.java" />
+        <replace file="${src}/net/sourceforge/pmd/lang/ast/dummy/TokenMgrError.java"
+                 token="net.sourceforge.pmd.lang.ast.dummy"
+                 value="net.sourceforge.pmd.lang.ast" />
+        <replace file="${src}/net/sourceforge/pmd/lang/ast/dummy/TokenMgrError.java"
+                 token="extends Error"
+                 value="extends RuntimeException" />
+        <replace file="${src}/net/sourceforge/pmd/lang/ast/dummy/TokenMgrError.java"
+                 token="static final int"
+                 value="public static final int" />
+        <replace file="${src}/net/sourceforge/pmd/lang/ast/dummy/TokenMgrError.java">
+            <replacetoken><![CDATA["Lexical error at line "]]></replacetoken>
+            <replacevalue><![CDATA["Lexical error in file " + AbstractTokenManager.getFileName() + " at line "]]></replacevalue>
+        </replace>
+        <move overwrite="true"
+              file="${src}/net/sourceforge/pmd/lang/ast/dummy/TokenMgrError.java"
+              tofile="${src}/net/sourceforge/pmd/lang/ast/TokenMgrError.java" />
 
         <delete dir="${src}/net/sourceforge/pmd/lang/ast/dummy" />
 
-	</target>
+    </target>
 
-	<target name="javajjtree" description="Generates the Java parser and AST source filesr">
-		<delete file="${src}/net/sourceforge/pmd/lang/java/ast/Java.jj" />
-		<delete file="${src}/net/sourceforge/pmd/lang/java/ast/JavaParser.java" />
-		<delete file="${src}/net/sourceforge/pmd/lang/java/ast/JavaParserConstants.java" />
-		<delete file="${src}/net/sourceforge/pmd/lang/java/ast/JavaParserTreeConstants.java" />
-		<delete file="${src}/net/sourceforge/pmd/lang/java/ast/JavaParserTokenManager.java" />
-		<delete file="${src}/net/sourceforge/pmd/lang/java/ast/Token.java" />
-		<delete file="${src}/net/sourceforge/pmd/lang/java/ast/TokenMgrError.java" />
-		<delete file="${src}/net/sourceforge/pmd/lang/java/ast/ParseException.java" />
-		<jjtree target="etc/grammar/Java.jjt" outputdirectory="${src}/net/sourceforge/pmd/lang/java/ast" javacchome="${javacc-home.path}" />
-		<!-- Ensure generated using CharStream interface -->
-		<javacc static="false" usercharstream="true" target="${src}/net/sourceforge/pmd/lang/java/ast/Java.jj" outputdirectory="${src}/net/sourceforge/pmd/lang/java/ast" javacchome="${javacc-home.path}" />
-		<delete file="${src}/net/sourceforge/pmd/lang/java/ast/Java.jj" />
-		<delete file="${src}/net/sourceforge/pmd/lang/java/ast/Node.java" />
-		<delete file="${src}/net/sourceforge/pmd/lang/java/ast/SimpleNode.java" />
-		<delete file="${src}/net/sourceforge/pmd/lang/java/ast/CharStream.java" />
-		<delete file="${src}/net/sourceforge/pmd/lang/java/ast/TokenMgrError.java" />
-		<replace file="${src}/net/sourceforge/pmd/lang/java/ast/JavaParserTokenManager.java" token="class JavaParserTokenManager" value="class JavaParserTokenManager extends net.sourceforge.pmd.lang.ast.AbstractTokenManager" />
-		<replace file="${src}/net/sourceforge/pmd/lang/java/ast/JavaParser.java" token="throw new Error" value="throw new RuntimeException" />
-		<replace file="${src}/net/sourceforge/pmd/lang/java/ast/ParseException.java" token="extends Exception" value="extends net.sourceforge.pmd.lang.ast.ParseException" />
-		<replace file="${src}/net/sourceforge/pmd/lang/java/ast/JavaParserVisitor.java" token="SimpleNode" value="JavaNode" />
-		<replace file="${src}/net/sourceforge/pmd/lang/java/ast/JJTJavaParserState.java">
-			<replacetoken>public class</replacetoken>
-			<replacevalue><![CDATA[import net.sourceforge.pmd.lang.ast.Node;
+    <target name="javajjtree" description="Generates the Java parser and AST source filesr">
+        <delete file="${src}/net/sourceforge/pmd/lang/java/ast/Java.jj" />
+        <delete file="${src}/net/sourceforge/pmd/lang/java/ast/JavaParser.java" />
+        <delete file="${src}/net/sourceforge/pmd/lang/java/ast/JavaParserConstants.java" />
+        <delete file="${src}/net/sourceforge/pmd/lang/java/ast/JavaParserTreeConstants.java" />
+        <delete file="${src}/net/sourceforge/pmd/lang/java/ast/JavaParserTokenManager.java" />
+        <delete file="${src}/net/sourceforge/pmd/lang/java/ast/Token.java" />
+        <delete file="${src}/net/sourceforge/pmd/lang/java/ast/TokenMgrError.java" />
+        <delete file="${src}/net/sourceforge/pmd/lang/java/ast/ParseException.java" />
+        <jjtree target="etc/grammar/Java.jjt"
+                outputdirectory="${src}/net/sourceforge/pmd/lang/java/ast"
+                javacchome="${javacc-home.path}" />
+        <!-- Ensure generated using CharStream interface -->
+        <javacc static="false"
+                usercharstream="true"
+                target="${src}/net/sourceforge/pmd/lang/java/ast/Java.jj"
+                outputdirectory="${src}/net/sourceforge/pmd/lang/java/ast"
+                javacchome="${javacc-home.path}" />
+        <delete file="${src}/net/sourceforge/pmd/lang/java/ast/Java.jj" />
+        <delete file="${src}/net/sourceforge/pmd/lang/java/ast/Node.java" />
+        <delete file="${src}/net/sourceforge/pmd/lang/java/ast/SimpleNode.java" />
+        <delete file="${src}/net/sourceforge/pmd/lang/java/ast/CharStream.java" />
+        <delete file="${src}/net/sourceforge/pmd/lang/java/ast/TokenMgrError.java" />
+        <replace file="${src}/net/sourceforge/pmd/lang/java/ast/JavaParserTokenManager.java"
+                 token="class JavaParserTokenManager"
+                 value="class JavaParserTokenManager extends net.sourceforge.pmd.lang.ast.AbstractTokenManager" />
+        <replace file="${src}/net/sourceforge/pmd/lang/java/ast/JavaParser.java"
+                 token="throw new Error"
+                 value="throw new RuntimeException" />
+        <replace file="${src}/net/sourceforge/pmd/lang/java/ast/ParseException.java"
+                 token="extends Exception"
+                 value="extends net.sourceforge.pmd.lang.ast.ParseException" />
+        <replace file="${src}/net/sourceforge/pmd/lang/java/ast/JavaParserVisitor.java"
+                 token="SimpleNode"
+                 value="JavaNode" />
+        <replace file="${src}/net/sourceforge/pmd/lang/java/ast/JJTJavaParserState.java">
+            <replacetoken>public class</replacetoken>
+            <replacevalue><![CDATA[import net.sourceforge.pmd.lang.ast.Node;
 
 public class]]></replacevalue>
-		</replace>
-		<replace file="${src}/net/sourceforge/pmd/lang/java/ast/Token.java">
-			<replacetoken><![CDATA[       default : return new Token(ofKind, image);
+        </replace>
+        <replace file="${src}/net/sourceforge/pmd/lang/java/ast/Token.java">
+            <replacetoken><![CDATA[       default : return new Token(ofKind, image);
      }
   }
 ]]></replacetoken>
-			<replacevalue><![CDATA[       case JavaParserConstants.RUNSIGNEDSHIFT :
+            <replacevalue><![CDATA[       case JavaParserConstants.RUNSIGNEDSHIFT :
        case JavaParserConstants.RSIGNEDSHIFT :
        case JavaParserConstants.GT:
          return new GTToken(ofKind, image);
@@ -92,57 +149,71 @@ public class]]></replacevalue>
      }
   }
 ]]></replacevalue>
-		</replace>
-	</target>
+        </replace>
+    </target>
 
-	<target name="jspjjtree" description="Generates the JSP parser and AST source filesr">
-		<delete file="${src}/net/sourceforge/pmd/lang/jsp/ast/JspParser.jj" />
-		<delete file="${src}/net/sourceforge/pmd/lang/jsp/ast/JspParser.java" />
-		<delete file="${src}/net/sourceforge/pmd/lang/jsp/ast/JspParserConstants.java" />
-		<delete file="${src}/net/sourceforge/pmd/lang/jsp/ast/JspParserTreeConstants.java" />
-		<delete file="${src}/net/sourceforge/pmd/lang/jsp/ast/JspParserTokenManager.java" />
-		<delete file="${src}/net/sourceforge/pmd/lang/jsp/ast/Token.java" />
-		<delete file="${src}/net/sourceforge/pmd/lang/jsp/ast/TokenMgrError.java" />
-		<delete file="${src}/net/sourceforge/pmd/lang/jsp/ast/ParseException.java" />
-		<jjtree target="etc/grammar/JspParser.jjt" outputdirectory="${src}/net/sourceforge/pmd/lang/jsp/ast/" javacchome="${javacc-home.path}" />
-		<!-- Ensure generated using CharStream interface -->
-		<javacc static="false" usercharstream="true" 
-			unicodeinput="true" javaunicodeescape="false" 
-			target="${src}/net/sourceforge/pmd/lang/jsp/ast/JspParser.jj" 
-			outputdirectory="${src}/net/sourceforge/pmd/lang/jsp/ast" 
-			javacchome="${javacc-home.path}"  />
-		<delete file="${src}/net/sourceforge/pmd/lang/jsp/ast/JspParser.jj" />
-		<delete file="${src}/net/sourceforge/pmd/lang/jsp/ast/Node.java" />
-		<delete file="${src}/net/sourceforge/pmd/lang/jsp/ast/SimpleNode.java" />
-		<delete file="${src}/net/sourceforge/pmd/lang/jsp/ast/CharStream.java" />
-		<delete file="${src}/net/sourceforge/pmd/lang/jsp/ast/TokenMgrError.java" />
-		<replace file="${src}/net/sourceforge/pmd/lang/jsp/ast/JspParserTokenManager.java" token="class JspParserTokenManager" value="class JspParserTokenManager extends net.sourceforge.pmd.lang.ast.AbstractTokenManager" />
-		<replace file="${src}/net/sourceforge/pmd/lang/jsp/ast/JspParser.java" token="throw new Error" value="throw new RuntimeException" />
-		<replace file="${src}/net/sourceforge/pmd/lang/jsp/ast/ParseException.java" token="extends Exception" value="extends net.sourceforge.pmd.lang.ast.ParseException" />
-		<replace file="${src}/net/sourceforge/pmd/lang/jsp/ast/JspParserVisitor.java" token="SimpleNode" value="JspNode" />
-		<replace file="${src}/net/sourceforge/pmd/lang/jsp/ast/JJTJspParserState.java">
-			<replacetoken>public class</replacetoken>
-			<replacevalue><![CDATA[import net.sourceforge.pmd.lang.ast.Node;
+    <target name="jspjjtree" description="Generates the JSP parser and AST source filesr">
+        <delete file="${src}/net/sourceforge/pmd/lang/jsp/ast/JspParser.jj" />
+        <delete file="${src}/net/sourceforge/pmd/lang/jsp/ast/JspParser.java" />
+        <delete file="${src}/net/sourceforge/pmd/lang/jsp/ast/JspParserConstants.java" />
+        <delete file="${src}/net/sourceforge/pmd/lang/jsp/ast/JspParserTreeConstants.java" />
+        <delete file="${src}/net/sourceforge/pmd/lang/jsp/ast/JspParserTokenManager.java" />
+        <delete file="${src}/net/sourceforge/pmd/lang/jsp/ast/Token.java" />
+        <delete file="${src}/net/sourceforge/pmd/lang/jsp/ast/TokenMgrError.java" />
+        <delete file="${src}/net/sourceforge/pmd/lang/jsp/ast/ParseException.java" />
+        <jjtree target="etc/grammar/JspParser.jjt"
+                outputdirectory="${src}/net/sourceforge/pmd/lang/jsp/ast/"
+                javacchome="${javacc-home.path}" />
+        <!-- Ensure generated using CharStream interface -->
+        <javacc static="false"
+                usercharstream="true"
+                unicodeinput="true"
+                javaunicodeescape="false"
+                target="${src}/net/sourceforge/pmd/lang/jsp/ast/JspParser.jj"
+                outputdirectory="${src}/net/sourceforge/pmd/lang/jsp/ast"
+                javacchome="${javacc-home.path}" />
+        <delete file="${src}/net/sourceforge/pmd/lang/jsp/ast/JspParser.jj" />
+        <delete file="${src}/net/sourceforge/pmd/lang/jsp/ast/Node.java" />
+        <delete file="${src}/net/sourceforge/pmd/lang/jsp/ast/SimpleNode.java" />
+        <delete file="${src}/net/sourceforge/pmd/lang/jsp/ast/CharStream.java" />
+        <delete file="${src}/net/sourceforge/pmd/lang/jsp/ast/TokenMgrError.java" />
+        <replace file="${src}/net/sourceforge/pmd/lang/jsp/ast/JspParserTokenManager.java"
+                 token="class JspParserTokenManager"
+                 value="class JspParserTokenManager extends net.sourceforge.pmd.lang.ast.AbstractTokenManager" />
+        <replace file="${src}/net/sourceforge/pmd/lang/jsp/ast/JspParser.java"
+                 token="throw new Error"
+                 value="throw new RuntimeException" />
+        <replace file="${src}/net/sourceforge/pmd/lang/jsp/ast/ParseException.java"
+                 token="extends Exception"
+                 value="extends net.sourceforge.pmd.lang.ast.ParseException" />
+        <replace file="${src}/net/sourceforge/pmd/lang/jsp/ast/JspParserVisitor.java"
+                 token="SimpleNode"
+                 value="JspNode" />
+        <replace file="${src}/net/sourceforge/pmd/lang/jsp/ast/JJTJspParserState.java">
+            <replacetoken>public class</replacetoken>
+            <replacevalue><![CDATA[import net.sourceforge.pmd.lang.ast.Node;
 
 public class]]></replacevalue>
-		</replace>
-	</target>
+        </replace>
+    </target>
 
-	<target name="cppjavacc" description="Generates the C++ grammar">
-		<delete file="${src}/net/sourceforge/pmd/lang/cpp/ast/CppParserConstants.java" />
-		<delete file="${src}/net/sourceforge/pmd/lang/cpp/ast/CppParserTokenManager.java" />
-		<delete file="${src}/net/sourceforge/pmd/lang/cpp/ast/Token.java" />
-		<delete file="${src}/net/sourceforge/pmd/lang/cpp/ast/TokenMgrError.java" />
-		<!-- Ensure generated using CharStream interface -->
-		<javacc static="false"
-				usercharstream="true"
-				target="etc/grammar/cpp.jj"
-				outputdirectory="${src}/net/sourceforge/pmd/lang/cpp/ast"
-				javacchome="${javacc-home.path}" />
-		<replace file="${src}/net/sourceforge/pmd/lang/cpp/ast/CppParserTokenManager.java" token="class CppParserTokenManager" value="class CppParserTokenManager extends net.sourceforge.pmd.lang.ast.AbstractTokenManager" />
-		<delete file="${src}/net/sourceforge/pmd/lang/cpp/ast/CharStream.java" />
-		<delete file="${src}/net/sourceforge/pmd/lang/cpp/ast/ParseException.java" />
+    <target name="cppjavacc" description="Generates the C++ grammar">
+        <delete file="${src}/net/sourceforge/pmd/lang/cpp/ast/CppParserConstants.java" />
+        <delete file="${src}/net/sourceforge/pmd/lang/cpp/ast/CppParserTokenManager.java" />
+        <delete file="${src}/net/sourceforge/pmd/lang/cpp/ast/Token.java" />
         <delete file="${src}/net/sourceforge/pmd/lang/cpp/ast/TokenMgrError.java" />
-        <delete dir="${javacc-home.path}"/>
-	</target>
+        <!-- Ensure generated using CharStream interface -->
+        <javacc static="false"
+                usercharstream="true"
+                target="etc/grammar/cpp.jj"
+                outputdirectory="${src}/net/sourceforge/pmd/lang/cpp/ast"
+                javacchome="${javacc-home.path}" />
+        <replace file="${src}/net/sourceforge/pmd/lang/cpp/ast/CppParserTokenManager.java"
+                 token="class CppParserTokenManager"
+                 value="class CppParserTokenManager extends net.sourceforge.pmd.lang.ast.AbstractTokenManager" />
+        <delete file="${src}/net/sourceforge/pmd/lang/cpp/ast/CharStream.java" />
+        <delete file="${src}/net/sourceforge/pmd/lang/cpp/ast/ParseException.java" />
+        <delete file="${src}/net/sourceforge/pmd/lang/cpp/ast/TokenMgrError.java" />
+        <delete dir="${javacc-home.path}" />
+    </target>
 </project>