Changed AbstractRule to implement Rule. Conflict resolution on

UPIVR.


git-svn-id: https://pmd.svn.sourceforge.net/svnroot/pmd/trunk@124 51baf565-9d33-0410-a72c-fc3788e3496d

pmd/build.xml

@@ -12,6 +12,13 @@
   <!-- Set default values for the build -->
   <property file="project.properties" />
 
+
+<target name="jjt">
+  <jjtree target="src/Java1.4-c.jjt"
+          outputdirectory="src"
+          javacchome="lib/javacc" />
+</target>
+
 <!-- maven:start -->
 
 <!-- ======================================================== -->

pmd/etc/build.xml

@@ -82,7 +82,7 @@
     <target name="jjtree">
         <mkdir dir="tmp"/>
         <copy overwrite="yes" todir="tmp">
-            <fileset dir="src/net/sourceforge/pmd/ast" includes="SimpleNode.java,JavaParserVisitorAdapter.java"/>
+            <fileset dir="src/net/sourceforge/pmd/ast" includes="SimpleNode.java,JavaParserVisitorAdapter.java,AccessNode.java"/>
         </copy>
         <delete>
             <fileset dir="src/net/sourceforge/pmd/ast" includes="*.java,*.jj"/>
@@ -96,6 +96,17 @@
         <delete dir="tmp"/>
     </target>
 
+    <target name="jjtree-2">
+        <mkdir dir="tmp"/>
+        <jjtree target="etc/Java1.4-c.jjt" outputdirectory="src/net/sourceforge/pmd/ast" javacchome="/home/dpeugh/software/javacc2.1"/>
+        <javacc target="src/net/sourceforge/pmd/ast/Java1.4-c.jj" outputdirectory="src/net/sourceforge/pmd/ast" javacchome="/home/dpeugh/software/javacc2.1"/>
+        <copy overwrite="yes" todir="src/net/sourceforge/pmd/ast">
+            <fileset dir="tmp" includes="*.java"/>
+        </copy>
+        <delete file="src/net/sourceforge/pmd/ast/Java1.4-c.jj"/>
+        <delete dir="tmp"/>
+    </target>
+
 	<target name="clean" depends="delete,compile"/>
 
     <target name="dist" depends="clean,jar"/>

pmd/src/net/sourceforge/pmd/AbstractRule.java

@@ -11,7 +11,10 @@ import net.sourceforge.pmd.ast.SimpleNode;
 import java.util.List;
 import java.util.Iterator;
 
-public abstract class AbstractRule extends JavaParserVisitorAdapter {
+public abstract class AbstractRule 
+    extends JavaParserVisitorAdapter
+    implements Rule
+{
 
     public String getName() {
         return getClass().getName();