Merge branch 'master' into properties-builder

pmd-plsql/src/main/ant/alljavacc.xml

@@ -78,5 +78,55 @@ public class]]></replacevalue>
                  token="extends Exception"
                  value="extends net.sourceforge.pmd.lang.ast.ParseException" />
 
+        <replace file="${target}/net/sourceforge/pmd/lang/plsql/ast/Token.java">
+            <replacetoken>public class Token implements java.io.Serializable</replacetoken>
+            <replacevalue><![CDATA[import net.sourceforge.pmd.lang.ast.GenericToken;
+
+public class Token implements GenericToken, java.io.Serializable]]></replacevalue>
+        </replace>
+
+        <!--Add implementation methods of GenericToken-->
+        <replace file="${target}/net/sourceforge/pmd/lang/plsql/ast/Token.java">
+            <replacetoken>public Token specialToken;</replacetoken>
+            <replacevalue><![CDATA[public Token specialToken;
+
+  @Override
+  public GenericToken getNext() {
+    return next;
+  }
+
+  @Override
+  public GenericToken getPreviousComment() {
+    return specialToken;
+  }
+
+  @Override
+  public String getImage() {
+    return image;
+  }
+
+  @Override
+  public int getBeginLine() {
+    return beginLine;
+  }
+
+  @Override
+  public int getEndLine() {
+    return endLine;
+  }
+
+  @Override
+  public int getBeginColumn() {
+    return beginColumn;
+  }
+
+  @Override
+  public int getEndColumn() {
+    return endColumn;
+  }
+
+]]></replacevalue>
+        </replace>
+
     </target>
 </project>