forked from phoedos/pmd
Merge branch 'pr-2294' into pmd/7.0.x
[vf, jsp] Adapt JSP & VF modules to new javacc wrapper
This commit is contained in:
Andreas Dangel
@ -15,37 +15,38 @@
|
||||
* Script code inside <script> ... </script> is not parsed.
|
||||
*/
|
||||
|
||||
options {
|
||||
options {
|
||||
USER_CHAR_STREAM = true;
|
||||
NODE_USES_PARSER=true;
|
||||
UNICODE_INPUT=true;
|
||||
FORCE_LA_CHECK = false;
|
||||
IGNORE_CASE = true;
|
||||
STATIC = false;
|
||||
|
||||
FORCE_LA_CHECK = false;
|
||||
IGNORE_CASE = true;
|
||||
STATIC = false;
|
||||
|
||||
MULTI=true;
|
||||
VISITOR=true;
|
||||
TRACK_TOKENS = true;
|
||||
}
|
||||
}
|
||||
|
||||
PARSER_BEGIN(JspParser)
|
||||
PARSER_BEGIN(JspParserImpl)
|
||||
package net.sourceforge.pmd.lang.jsp.ast;
|
||||
|
||||
import net.sourceforge.pmd.lang.ast.CharStream;
|
||||
import net.sourceforge.pmd.lang.ast.TokenMgrError;
|
||||
import net.sourceforge.pmd.lang.ast.impl.javacc.JavaccToken;
|
||||
|
||||
/**
|
||||
/**
|
||||
* JSP Parser for PMD.
|
||||
* @author Pieter, Application Engineers NV/SA, http://www.ae.be
|
||||
*/
|
||||
public class JspParser {
|
||||
public class JspParserImpl {
|
||||
|
||||
|
||||
/**
|
||||
* Counter used to keep track of unclosed tags
|
||||
*/
|
||||
private OpenTagRegister tagRegister = new OpenTagRegister();
|
||||
|
||||
|
||||
/**
|
||||
* Return the contents of a quote.
|
||||
* @param quote String - starting and ending with " or '
|
||||
@ -55,7 +56,7 @@ public class JspParser {
|
||||
private static String quoteContent(String quote) {
|
||||
return quote.substring(1, quote.length()-1);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Return the contents of a EL expression or a Value Binding expression.
|
||||
* @param expression String - starting with ${ or #{ and ending with }
|
||||
@ -67,7 +68,7 @@ public class JspParser {
|
||||
}
|
||||
}
|
||||
|
||||
PARSER_END(JspParser)
|
||||
PARSER_END(JspParserImpl)
|
||||
|
||||
|
||||
/** ******************************************************************** */
|
||||
@ -38,9 +38,10 @@
|
||||
<phase>generate-sources</phase>
|
||||
<configuration>
|
||||
<target>
|
||||
<ant antfile="src/main/ant/alljavacc.xml">
|
||||
<property name="target" value="${project.build.directory}/generated-sources/javacc" />
|
||||
<ant antfile="${javacc.ant.wrapper}" target="alljavacc">
|
||||
<property name="javacc.jar" value="${javacc.jar}" />
|
||||
<property name="lang-name" value="Jsp" />
|
||||
<property name="lang-terse-name" value="jsp" />
|
||||
</ant>
|
||||
</target>
|
||||
</configuration>
|
||||
|
||||
@ -1,139 +0,0 @@
|
||||
<project name="pmd" default="alljavacc" basedir="../../">
|
||||
|
||||
<property name="javacc-home.path" value="target/lib" />
|
||||
|
||||
<target name="alljavacc"
|
||||
description="Generates all JavaCC aspects within PMD"
|
||||
depends="checkUpToDate,init,jspjjtree,cleanup" />
|
||||
|
||||
<target name="checkUpToDate">
|
||||
<uptodate property="javaccBuildNotRequired" targetfile="${target}/last-generated-timestamp">
|
||||
<srcfiles dir="etc/grammar" includes="*.jj*"/>
|
||||
</uptodate>
|
||||
<echo message="up to date check: javaccBuildNotRequired=${javaccBuildNotRequired}"/>
|
||||
</target>
|
||||
|
||||
<target name="init" unless="javaccBuildNotRequired">
|
||||
<mkdir dir="${javacc-home.path}" />
|
||||
<copy file="${javacc.jar}" tofile="${javacc-home.path}/javacc.jar" />
|
||||
|
||||
<mkdir dir="${target}"/>
|
||||
<touch file="${target}/last-generated-timestamp"/>
|
||||
</target>
|
||||
|
||||
<target name="cleanup">
|
||||
<delete dir="${javacc-home.path}" />
|
||||
</target>
|
||||
|
||||
<target name="jspjjtree" description="Generates the JSP parser and AST source files" unless="javaccBuildNotRequired">
|
||||
<delete dir="${target}/net/sourceforge/pmd/lang/jsp/ast/" />
|
||||
<mkdir dir="${target}/net/sourceforge/pmd/lang/jsp/ast/" />
|
||||
<jjtree target="etc/grammar/JspParser.jjt"
|
||||
outputdirectory="${target}/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="${target}/net/sourceforge/pmd/lang/jsp/ast/JspParser.jj"
|
||||
outputdirectory="${target}/net/sourceforge/pmd/lang/jsp/ast"
|
||||
javacchome="${javacc-home.path}" />
|
||||
<delete file="${target}/net/sourceforge/pmd/lang/jsp/ast/Node.java" />
|
||||
<delete file="${target}/net/sourceforge/pmd/lang/jsp/ast/SimpleNode.java" />
|
||||
<delete file="${target}/net/sourceforge/pmd/lang/jsp/ast/CharStream.java" />
|
||||
<delete file="${target}/net/sourceforge/pmd/lang/jsp/ast/TokenMgrError.java" />
|
||||
<replace file="${target}/net/sourceforge/pmd/lang/jsp/ast/JspParserTokenManager.java"
|
||||
token="class JspParserTokenManager"
|
||||
value="class JspParserTokenManager extends net.sourceforge.pmd.lang.ast.AbstractTokenManager" />
|
||||
<replace file="${target}/net/sourceforge/pmd/lang/jsp/ast/JspParser.java"
|
||||
token="throw new Error"
|
||||
value="throw new RuntimeException" />
|
||||
<replace file="${target}/net/sourceforge/pmd/lang/jsp/ast/ParseException.java"
|
||||
token="extends Exception"
|
||||
value="extends net.sourceforge.pmd.lang.ast.ParseException" />
|
||||
<replace file="${target}/net/sourceforge/pmd/lang/jsp/ast/JspParserVisitor.java"
|
||||
token="SimpleNode"
|
||||
value="JspNode" />
|
||||
<replace file="${target}/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>
|
||||
<replace file="${target}/net/sourceforge/pmd/lang/jsp/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/jsp/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>
|
||||
|
||||
<delete>
|
||||
<fileset dir="${target}/net/sourceforge/pmd/lang/jsp/ast">
|
||||
<include name="AST*.java" />
|
||||
</fileset>
|
||||
</delete>
|
||||
|
||||
|
||||
|
||||
<replaceregexp>
|
||||
<regexp pattern="public (?:class|interface)" />
|
||||
<substitution expression="@Deprecated${line.separator}@net.sourceforge.pmd.annotation.InternalApi${line.separator}\0" />
|
||||
<fileset dir="${target}/net/sourceforge/pmd/lang/jsp/ast">
|
||||
<exclude name="AST*.java" />
|
||||
<exclude name="ParseException.java" />
|
||||
<exclude name="*ParserVisitor.java"/>
|
||||
</fileset>
|
||||
</replaceregexp>
|
||||
|
||||
<replaceregexp>
|
||||
<regexp pattern="(?m)\*/\s+(public class ParseException )" />
|
||||
<substitution expression="*${line.separator} * @deprecated Use superclass {@link net.sourceforge.pmd.lang.ast.ParseException}${line.separator} */${line.separator}@Deprecated${line.separator}@net.sourceforge.pmd.annotation.InternalApi${line.separator}\1" />
|
||||
<fileset file="${target}/net/sourceforge/pmd/lang/jsp/ast/ParseException.java"/>
|
||||
</replaceregexp>
|
||||
</target>
|
||||
|
||||
</project>
|
||||
@ -1,4 +1,4 @@
|
||||
/**
|
||||
/*
|
||||
* BSD-style license; for more info see http://pmd.sourceforge.net/license.html
|
||||
*/
|
||||
|
||||
|
||||
@ -1,41 +1,21 @@
|
||||
/**
|
||||
/*
|
||||
* BSD-style license; for more info see http://pmd.sourceforge.net/license.html
|
||||
*/
|
||||
|
||||
package net.sourceforge.pmd.cpd;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.Reader;
|
||||
import java.io.StringReader;
|
||||
import org.apache.commons.io.input.CharSequenceReader;
|
||||
|
||||
import net.sourceforge.pmd.lang.LanguageRegistry;
|
||||
import net.sourceforge.pmd.lang.LanguageVersionHandler;
|
||||
import net.sourceforge.pmd.cpd.internal.JavaCCTokenizer;
|
||||
import net.sourceforge.pmd.lang.TokenManager;
|
||||
import net.sourceforge.pmd.lang.jsp.JspLanguageModule;
|
||||
import net.sourceforge.pmd.lang.jsp.ast.Token;
|
||||
import net.sourceforge.pmd.lang.jsp.ast.JspTokenManager;
|
||||
import net.sourceforge.pmd.util.IOUtil;
|
||||
|
||||
public class JSPTokenizer implements Tokenizer {
|
||||
public class JSPTokenizer extends JavaCCTokenizer {
|
||||
|
||||
@Override
|
||||
public void tokenize(SourceCode sourceCode, Tokens tokenEntries) {
|
||||
StringBuilder buffer = sourceCode.getCodeBuffer();
|
||||
LanguageVersionHandler languageVersionHandler = LanguageRegistry.getLanguage(JspLanguageModule.NAME)
|
||||
.getDefaultVersion().getLanguageVersionHandler();
|
||||
|
||||
try (Reader reader = IOUtil.skipBOM(new StringReader(buffer.toString()))) {
|
||||
TokenManager tokenMgr = languageVersionHandler.getParser(languageVersionHandler.getDefaultParserOptions())
|
||||
.getTokenManager(sourceCode.getFileName(), reader);
|
||||
Token currentToken = (Token) tokenMgr.getNextToken();
|
||||
|
||||
while (currentToken.image.length() > 0) {
|
||||
tokenEntries.add(new TokenEntry(String.valueOf(currentToken.kind), sourceCode.getFileName(),
|
||||
currentToken.beginLine, currentToken.beginColumn, currentToken.endColumn));
|
||||
currentToken = (Token) tokenMgr.getNextToken();
|
||||
}
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
tokenEntries.add(TokenEntry.getEOF());
|
||||
protected TokenManager getLexerForSource(SourceCode sourceCode) {
|
||||
return new JspTokenManager(IOUtil.skipBOM(new CharSequenceReader(sourceCode.getCodeBuffer())));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/**
|
||||
/*
|
||||
* BSD-style license; for more info see http://pmd.sourceforge.net/license.html
|
||||
*/
|
||||
|
||||
@ -7,6 +7,7 @@ package net.sourceforge.pmd.lang.jsp;
|
||||
import net.sourceforge.pmd.lang.AbstractPmdLanguageVersionHandler;
|
||||
import net.sourceforge.pmd.lang.Parser;
|
||||
import net.sourceforge.pmd.lang.ParserOptions;
|
||||
import net.sourceforge.pmd.lang.jsp.ast.JspParser;
|
||||
|
||||
/**
|
||||
* Implementation of LanguageVersionHandler for the JSP parser.
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/**
|
||||
/*
|
||||
* BSD-style license; for more info see http://pmd.sourceforge.net/license.html
|
||||
*/
|
||||
|
||||
|
||||
@ -4,31 +4,19 @@
|
||||
|
||||
package net.sourceforge.pmd.lang.jsp.ast;
|
||||
|
||||
import net.sourceforge.pmd.annotation.InternalApi;
|
||||
|
||||
public class ASTAttribute extends AbstractJspNode {
|
||||
public final class ASTAttribute extends AbstractJspNode {
|
||||
|
||||
private String name;
|
||||
|
||||
@InternalApi
|
||||
@Deprecated
|
||||
public ASTAttribute(int id) {
|
||||
ASTAttribute(int id) {
|
||||
super(id);
|
||||
}
|
||||
|
||||
@InternalApi
|
||||
@Deprecated
|
||||
public ASTAttribute(JspParser p, int id) {
|
||||
super(p, id);
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
@InternalApi
|
||||
@Deprecated
|
||||
public void setName(String name) {
|
||||
void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
|
||||
@ -4,21 +4,12 @@
|
||||
|
||||
package net.sourceforge.pmd.lang.jsp.ast;
|
||||
|
||||
import net.sourceforge.pmd.annotation.InternalApi;
|
||||
public final class ASTAttributeValue extends AbstractJspNode {
|
||||
|
||||
public class ASTAttributeValue extends AbstractJspNode {
|
||||
@InternalApi
|
||||
@Deprecated
|
||||
public ASTAttributeValue(int id) {
|
||||
ASTAttributeValue(int id) {
|
||||
super(id);
|
||||
}
|
||||
|
||||
@InternalApi
|
||||
@Deprecated
|
||||
public ASTAttributeValue(JspParser p, int id) {
|
||||
super(p, id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object jjtAccept(JspParserVisitor visitor, Object data) {
|
||||
return visitor.visit(this, data);
|
||||
|
||||
@ -4,21 +4,12 @@
|
||||
|
||||
package net.sourceforge.pmd.lang.jsp.ast;
|
||||
|
||||
import net.sourceforge.pmd.annotation.InternalApi;
|
||||
public final class ASTCData extends AbstractJspNode {
|
||||
|
||||
public class ASTCData extends AbstractJspNode {
|
||||
@InternalApi
|
||||
@Deprecated
|
||||
public ASTCData(int id) {
|
||||
ASTCData(int id) {
|
||||
super(id);
|
||||
}
|
||||
|
||||
@InternalApi
|
||||
@Deprecated
|
||||
public ASTCData(JspParser p, int id) {
|
||||
super(p, id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object jjtAccept(JspParserVisitor visitor, Object data) {
|
||||
return visitor.visit(this, data);
|
||||
|
||||
@ -4,21 +4,12 @@
|
||||
|
||||
package net.sourceforge.pmd.lang.jsp.ast;
|
||||
|
||||
import net.sourceforge.pmd.annotation.InternalApi;
|
||||
public final class ASTCommentTag extends AbstractJspNode {
|
||||
|
||||
public class ASTCommentTag extends AbstractJspNode {
|
||||
@InternalApi
|
||||
@Deprecated
|
||||
public ASTCommentTag(int id) {
|
||||
ASTCommentTag(int id) {
|
||||
super(id);
|
||||
}
|
||||
|
||||
@InternalApi
|
||||
@Deprecated
|
||||
public ASTCommentTag(JspParser p, int id) {
|
||||
super(p, id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object jjtAccept(JspParserVisitor visitor, Object data) {
|
||||
return visitor.visit(this, data);
|
||||
|
||||
@ -4,20 +4,12 @@
|
||||
|
||||
package net.sourceforge.pmd.lang.jsp.ast;
|
||||
|
||||
import net.sourceforge.pmd.annotation.InternalApi;
|
||||
import net.sourceforge.pmd.lang.ast.RootNode;
|
||||
|
||||
public class ASTCompilationUnit extends AbstractJspNode implements RootNode {
|
||||
@InternalApi
|
||||
@Deprecated
|
||||
public ASTCompilationUnit(int id) {
|
||||
super(id);
|
||||
}
|
||||
public final class ASTCompilationUnit extends AbstractJspNode implements RootNode {
|
||||
|
||||
@InternalApi
|
||||
@Deprecated
|
||||
public ASTCompilationUnit(JspParser p, int id) {
|
||||
super(p, id);
|
||||
ASTCompilationUnit(int id) {
|
||||
super(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@ -4,21 +4,12 @@
|
||||
|
||||
package net.sourceforge.pmd.lang.jsp.ast;
|
||||
|
||||
import net.sourceforge.pmd.annotation.InternalApi;
|
||||
public final class ASTContent extends AbstractJspNode {
|
||||
|
||||
public class ASTContent extends AbstractJspNode {
|
||||
@InternalApi
|
||||
@Deprecated
|
||||
public ASTContent(int id) {
|
||||
ASTContent(int id) {
|
||||
super(id);
|
||||
}
|
||||
|
||||
@InternalApi
|
||||
@Deprecated
|
||||
public ASTContent(JspParser p, int id) {
|
||||
super(p, id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object jjtAccept(JspParserVisitor visitor, Object data) {
|
||||
return visitor.visit(this, data);
|
||||
|
||||
@ -4,31 +4,19 @@
|
||||
|
||||
package net.sourceforge.pmd.lang.jsp.ast;
|
||||
|
||||
import net.sourceforge.pmd.annotation.InternalApi;
|
||||
|
||||
public class ASTDeclaration extends AbstractJspNode {
|
||||
public final class ASTDeclaration extends AbstractJspNode {
|
||||
|
||||
private String name;
|
||||
|
||||
@InternalApi
|
||||
@Deprecated
|
||||
public ASTDeclaration(int id) {
|
||||
ASTDeclaration(int id) {
|
||||
super(id);
|
||||
}
|
||||
|
||||
@InternalApi
|
||||
@Deprecated
|
||||
public ASTDeclaration(JspParser p, int id) {
|
||||
super(p, id);
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
@InternalApi
|
||||
@Deprecated
|
||||
public void setName(String name) {
|
||||
void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
|
||||
@ -4,34 +4,22 @@
|
||||
|
||||
package net.sourceforge.pmd.lang.jsp.ast;
|
||||
|
||||
import net.sourceforge.pmd.annotation.InternalApi;
|
||||
|
||||
public class ASTDoctypeDeclaration extends AbstractJspNode {
|
||||
public final class ASTDoctypeDeclaration extends AbstractJspNode {
|
||||
|
||||
/**
|
||||
* Name of the document type. Cannot be null.
|
||||
*/
|
||||
private String name;
|
||||
|
||||
@InternalApi
|
||||
@Deprecated
|
||||
public ASTDoctypeDeclaration(int id) {
|
||||
ASTDoctypeDeclaration(int id) {
|
||||
super(id);
|
||||
}
|
||||
|
||||
@InternalApi
|
||||
@Deprecated
|
||||
public ASTDoctypeDeclaration(JspParser p, int id) {
|
||||
super(p, id);
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
@InternalApi
|
||||
@Deprecated
|
||||
public void setName(String name) {
|
||||
void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
|
||||
@ -4,9 +4,7 @@
|
||||
|
||||
package net.sourceforge.pmd.lang.jsp.ast;
|
||||
|
||||
import net.sourceforge.pmd.annotation.InternalApi;
|
||||
|
||||
public class ASTDoctypeExternalId extends AbstractJspNode {
|
||||
public final class ASTDoctypeExternalId extends AbstractJspNode {
|
||||
|
||||
/**
|
||||
* URI of the external entity. Cannot be null.
|
||||
@ -18,18 +16,10 @@ public class ASTDoctypeExternalId extends AbstractJspNode {
|
||||
*/
|
||||
private String publicId;
|
||||
|
||||
@InternalApi
|
||||
@Deprecated
|
||||
public ASTDoctypeExternalId(int id) {
|
||||
ASTDoctypeExternalId(int id) {
|
||||
super(id);
|
||||
}
|
||||
|
||||
@InternalApi
|
||||
@Deprecated
|
||||
public ASTDoctypeExternalId(JspParser p, int id) {
|
||||
super(p, id);
|
||||
}
|
||||
|
||||
public boolean isHasPublicId() {
|
||||
return null != publicId;
|
||||
}
|
||||
@ -38,9 +28,7 @@ public class ASTDoctypeExternalId extends AbstractJspNode {
|
||||
return uri;
|
||||
}
|
||||
|
||||
@InternalApi
|
||||
@Deprecated
|
||||
public void setUri(String uri) {
|
||||
void setUri(String uri) {
|
||||
this.uri = uri;
|
||||
}
|
||||
|
||||
@ -52,9 +40,7 @@ public class ASTDoctypeExternalId extends AbstractJspNode {
|
||||
return null == publicId ? "" : publicId;
|
||||
}
|
||||
|
||||
@InternalApi
|
||||
@Deprecated
|
||||
public void setPublicId(String publicId) {
|
||||
void setPublicId(String publicId) {
|
||||
this.publicId = publicId;
|
||||
}
|
||||
|
||||
|
||||
@ -4,21 +4,12 @@
|
||||
|
||||
package net.sourceforge.pmd.lang.jsp.ast;
|
||||
|
||||
import net.sourceforge.pmd.annotation.InternalApi;
|
||||
public final class ASTElExpression extends AbstractJspNode {
|
||||
|
||||
public class ASTElExpression extends AbstractJspNode {
|
||||
@InternalApi
|
||||
@Deprecated
|
||||
public ASTElExpression(int id) {
|
||||
ASTElExpression(int id) {
|
||||
super(id);
|
||||
}
|
||||
|
||||
@InternalApi
|
||||
@Deprecated
|
||||
public ASTElExpression(JspParser p, int id) {
|
||||
super(p, id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object jjtAccept(JspParserVisitor visitor, Object data) {
|
||||
return visitor.visit(this, data);
|
||||
|
||||
@ -4,9 +4,7 @@
|
||||
|
||||
package net.sourceforge.pmd.lang.jsp.ast;
|
||||
|
||||
import net.sourceforge.pmd.annotation.InternalApi;
|
||||
|
||||
public class ASTElement extends AbstractJspNode {
|
||||
public final class ASTElement extends AbstractJspNode {
|
||||
|
||||
/**
|
||||
* Name of the element-tag. Cannot be null.
|
||||
@ -24,18 +22,10 @@ public class ASTElement extends AbstractJspNode {
|
||||
*/
|
||||
private boolean unclosed;
|
||||
|
||||
@InternalApi
|
||||
@Deprecated
|
||||
public ASTElement(int id) {
|
||||
ASTElement(int id) {
|
||||
super(id);
|
||||
}
|
||||
|
||||
@InternalApi
|
||||
@Deprecated
|
||||
public ASTElement(JspParser p, int id) {
|
||||
super(p, id);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return boolean - true if the element has a namespace-prefix, false
|
||||
* otherwise
|
||||
@ -67,9 +57,7 @@ public class ASTElement extends AbstractJspNode {
|
||||
return name;
|
||||
}
|
||||
|
||||
@InternalApi
|
||||
@Deprecated
|
||||
public void setName(String name) {
|
||||
void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
@ -81,15 +69,11 @@ public class ASTElement extends AbstractJspNode {
|
||||
return unclosed;
|
||||
}
|
||||
|
||||
@InternalApi
|
||||
@Deprecated
|
||||
public void setUnclosed(boolean unclosed) {
|
||||
void setUnclosed(boolean unclosed) {
|
||||
this.unclosed = unclosed;
|
||||
}
|
||||
|
||||
@InternalApi
|
||||
@Deprecated
|
||||
public void setEmpty(boolean empty) {
|
||||
void setEmpty(boolean empty) {
|
||||
this.empty = empty;
|
||||
}
|
||||
|
||||
|
||||
@ -4,21 +4,12 @@
|
||||
|
||||
package net.sourceforge.pmd.lang.jsp.ast;
|
||||
|
||||
import net.sourceforge.pmd.annotation.InternalApi;
|
||||
public final class ASTHtmlScript extends AbstractJspNode {
|
||||
|
||||
public class ASTHtmlScript extends AbstractJspNode {
|
||||
@InternalApi
|
||||
@Deprecated
|
||||
public ASTHtmlScript(int id) {
|
||||
ASTHtmlScript(int id) {
|
||||
super(id);
|
||||
}
|
||||
|
||||
@InternalApi
|
||||
@Deprecated
|
||||
public ASTHtmlScript(JspParser p, int id) {
|
||||
super(p, id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object jjtAccept(JspParserVisitor visitor, Object data) {
|
||||
return visitor.visit(this, data);
|
||||
|
||||
@ -4,21 +4,12 @@
|
||||
|
||||
package net.sourceforge.pmd.lang.jsp.ast;
|
||||
|
||||
import net.sourceforge.pmd.annotation.InternalApi;
|
||||
public final class ASTJspComment extends AbstractJspNode {
|
||||
|
||||
public class ASTJspComment extends AbstractJspNode {
|
||||
@InternalApi
|
||||
@Deprecated
|
||||
public ASTJspComment(int id) {
|
||||
ASTJspComment(int id) {
|
||||
super(id);
|
||||
}
|
||||
|
||||
@InternalApi
|
||||
@Deprecated
|
||||
public ASTJspComment(JspParser p, int id) {
|
||||
super(p, id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object jjtAccept(JspParserVisitor visitor, Object data) {
|
||||
return visitor.visit(this, data);
|
||||
|
||||
@ -4,21 +4,11 @@
|
||||
|
||||
package net.sourceforge.pmd.lang.jsp.ast;
|
||||
|
||||
import net.sourceforge.pmd.annotation.InternalApi;
|
||||
|
||||
public class ASTJspDeclaration extends AbstractJspNode {
|
||||
@InternalApi
|
||||
@Deprecated
|
||||
public ASTJspDeclaration(int id) {
|
||||
public final class ASTJspDeclaration extends AbstractJspNode {
|
||||
ASTJspDeclaration(int id) {
|
||||
super(id);
|
||||
}
|
||||
|
||||
@InternalApi
|
||||
@Deprecated
|
||||
public ASTJspDeclaration(JspParser p, int id) {
|
||||
super(p, id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object jjtAccept(JspParserVisitor visitor, Object data) {
|
||||
return visitor.visit(this, data);
|
||||
|
||||
@ -4,21 +4,12 @@
|
||||
|
||||
package net.sourceforge.pmd.lang.jsp.ast;
|
||||
|
||||
import net.sourceforge.pmd.annotation.InternalApi;
|
||||
public final class ASTJspDeclarations extends AbstractJspNode {
|
||||
|
||||
public class ASTJspDeclarations extends AbstractJspNode {
|
||||
@InternalApi
|
||||
@Deprecated
|
||||
public ASTJspDeclarations(int id) {
|
||||
ASTJspDeclarations(int id) {
|
||||
super(id);
|
||||
}
|
||||
|
||||
@InternalApi
|
||||
@Deprecated
|
||||
public ASTJspDeclarations(JspParser p, int id) {
|
||||
super(p, id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object jjtAccept(JspParserVisitor visitor, Object data) {
|
||||
return visitor.visit(this, data);
|
||||
|
||||
@ -4,34 +4,22 @@
|
||||
|
||||
package net.sourceforge.pmd.lang.jsp.ast;
|
||||
|
||||
import net.sourceforge.pmd.annotation.InternalApi;
|
||||
|
||||
public class ASTJspDirective extends AbstractJspNode {
|
||||
public final class ASTJspDirective extends AbstractJspNode {
|
||||
|
||||
/**
|
||||
* Name of the element-tag. Cannot be null.
|
||||
*/
|
||||
private String name;
|
||||
|
||||
@InternalApi
|
||||
@Deprecated
|
||||
public ASTJspDirective(int id) {
|
||||
ASTJspDirective(int id) {
|
||||
super(id);
|
||||
}
|
||||
|
||||
@InternalApi
|
||||
@Deprecated
|
||||
public ASTJspDirective(JspParser p, int id) {
|
||||
super(p, id);
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
@InternalApi
|
||||
@Deprecated
|
||||
public void setName(String name) {
|
||||
void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
|
||||
@ -4,32 +4,20 @@
|
||||
|
||||
package net.sourceforge.pmd.lang.jsp.ast;
|
||||
|
||||
import net.sourceforge.pmd.annotation.InternalApi;
|
||||
|
||||
public class ASTJspDirectiveAttribute extends AbstractJspNode {
|
||||
public final class ASTJspDirectiveAttribute extends AbstractJspNode {
|
||||
|
||||
private String name;
|
||||
private String value;
|
||||
|
||||
@InternalApi
|
||||
@Deprecated
|
||||
public ASTJspDirectiveAttribute(int id) {
|
||||
ASTJspDirectiveAttribute(int id) {
|
||||
super(id);
|
||||
}
|
||||
|
||||
@InternalApi
|
||||
@Deprecated
|
||||
public ASTJspDirectiveAttribute(JspParser p, int id) {
|
||||
super(p, id);
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
@InternalApi
|
||||
@Deprecated
|
||||
public void setName(String name) {
|
||||
void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
@ -37,9 +25,7 @@ public class ASTJspDirectiveAttribute extends AbstractJspNode {
|
||||
return value;
|
||||
}
|
||||
|
||||
@InternalApi
|
||||
@Deprecated
|
||||
public void setValue(String value) {
|
||||
void setValue(String value) {
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
|
||||
@ -4,21 +4,12 @@
|
||||
|
||||
package net.sourceforge.pmd.lang.jsp.ast;
|
||||
|
||||
import net.sourceforge.pmd.annotation.InternalApi;
|
||||
public final class ASTJspDocument extends AbstractJspNode {
|
||||
|
||||
public class ASTJspDocument extends AbstractJspNode {
|
||||
@InternalApi
|
||||
@Deprecated
|
||||
public ASTJspDocument(int id) {
|
||||
ASTJspDocument(int id) {
|
||||
super(id);
|
||||
}
|
||||
|
||||
@InternalApi
|
||||
@Deprecated
|
||||
public ASTJspDocument(JspParser p, int id) {
|
||||
super(p, id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object jjtAccept(JspParserVisitor visitor, Object data) {
|
||||
return visitor.visit(this, data);
|
||||
|
||||
@ -4,21 +4,12 @@
|
||||
|
||||
package net.sourceforge.pmd.lang.jsp.ast;
|
||||
|
||||
import net.sourceforge.pmd.annotation.InternalApi;
|
||||
public final class ASTJspExpression extends AbstractJspNode {
|
||||
|
||||
public class ASTJspExpression extends AbstractJspNode {
|
||||
@InternalApi
|
||||
@Deprecated
|
||||
public ASTJspExpression(int id) {
|
||||
ASTJspExpression(int id) {
|
||||
super(id);
|
||||
}
|
||||
|
||||
@InternalApi
|
||||
@Deprecated
|
||||
public ASTJspExpression(JspParser p, int id) {
|
||||
super(p, id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object jjtAccept(JspParserVisitor visitor, Object data) {
|
||||
return visitor.visit(this, data);
|
||||
|
||||
@ -4,21 +4,12 @@
|
||||
|
||||
package net.sourceforge.pmd.lang.jsp.ast;
|
||||
|
||||
import net.sourceforge.pmd.annotation.InternalApi;
|
||||
public final class ASTJspExpressionInAttribute extends AbstractJspNode {
|
||||
|
||||
public class ASTJspExpressionInAttribute extends AbstractJspNode {
|
||||
@InternalApi
|
||||
@Deprecated
|
||||
public ASTJspExpressionInAttribute(int id) {
|
||||
ASTJspExpressionInAttribute(int id) {
|
||||
super(id);
|
||||
}
|
||||
|
||||
@InternalApi
|
||||
@Deprecated
|
||||
public ASTJspExpressionInAttribute(JspParser p, int id) {
|
||||
super(p, id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object jjtAccept(JspParserVisitor visitor, Object data) {
|
||||
return visitor.visit(this, data);
|
||||
|
||||
@ -4,21 +4,12 @@
|
||||
|
||||
package net.sourceforge.pmd.lang.jsp.ast;
|
||||
|
||||
import net.sourceforge.pmd.annotation.InternalApi;
|
||||
public final class ASTJspScriptlet extends AbstractJspNode {
|
||||
|
||||
public class ASTJspScriptlet extends AbstractJspNode {
|
||||
@InternalApi
|
||||
@Deprecated
|
||||
public ASTJspScriptlet(int id) {
|
||||
ASTJspScriptlet(int id) {
|
||||
super(id);
|
||||
}
|
||||
|
||||
@InternalApi
|
||||
@Deprecated
|
||||
public ASTJspScriptlet(JspParser p, int id) {
|
||||
super(p, id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object jjtAccept(JspParserVisitor visitor, Object data) {
|
||||
return visitor.visit(this, data);
|
||||
|
||||
@ -4,21 +4,12 @@
|
||||
|
||||
package net.sourceforge.pmd.lang.jsp.ast;
|
||||
|
||||
import net.sourceforge.pmd.annotation.InternalApi;
|
||||
public final class ASTText extends AbstractJspNode {
|
||||
|
||||
public class ASTText extends AbstractJspNode {
|
||||
@InternalApi
|
||||
@Deprecated
|
||||
public ASTText(int id) {
|
||||
ASTText(int id) {
|
||||
super(id);
|
||||
}
|
||||
|
||||
@InternalApi
|
||||
@Deprecated
|
||||
public ASTText(JspParser p, int id) {
|
||||
super(p, id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object jjtAccept(JspParserVisitor visitor, Object data) {
|
||||
return visitor.visit(this, data);
|
||||
|
||||
@ -4,21 +4,12 @@
|
||||
|
||||
package net.sourceforge.pmd.lang.jsp.ast;
|
||||
|
||||
import net.sourceforge.pmd.annotation.InternalApi;
|
||||
public final class ASTUnparsedText extends AbstractJspNode {
|
||||
|
||||
public class ASTUnparsedText extends AbstractJspNode {
|
||||
@InternalApi
|
||||
@Deprecated
|
||||
public ASTUnparsedText(int id) {
|
||||
ASTUnparsedText(int id) {
|
||||
super(id);
|
||||
}
|
||||
|
||||
@InternalApi
|
||||
@Deprecated
|
||||
public ASTUnparsedText(JspParser p, int id) {
|
||||
super(p, id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object jjtAccept(JspParserVisitor visitor, Object data) {
|
||||
return visitor.visit(this, data);
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user