You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2008/01/04 22:47:29 UTC
svn commit: r609019 -
/tomcat/trunk/java/org/apache/jasper/compiler/Parser.java
Author: markt
Date: Fri Jan 4 13:47:28 2008
New Revision: 609019
URL: http://svn.apache.org/viewvc?rev=609019&view=rev
Log:
No functional change. Remove unused code. Lines <= 80 chars
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/Parser.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/Parser.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Parser.java?rev=609019&r1=609018&r2=609019&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/Parser.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Parser.java Fri Jan 4 13:47:28 2008
@@ -51,8 +51,6 @@
private JspReader reader;
- private String currentFile;
-
private Mark start;
private ErrorDispatcher err;
@@ -69,11 +67,14 @@
// Virtual body content types, to make parsing a little easier.
// These are not accessible from outside the parser.
- private static final String JAVAX_BODY_CONTENT_PARAM = "JAVAX_BODY_CONTENT_PARAM";
+ private static final String JAVAX_BODY_CONTENT_PARAM =
+ "JAVAX_BODY_CONTENT_PARAM";
- private static final String JAVAX_BODY_CONTENT_PLUGIN = "JAVAX_BODY_CONTENT_PLUGIN";
+ private static final String JAVAX_BODY_CONTENT_PLUGIN =
+ "JAVAX_BODY_CONTENT_PLUGIN";
- private static final String JAVAX_BODY_CONTENT_TEMPLATE_TEXT = "JAVAX_BODY_CONTENT_TEMPLATE_TEXT";
+ private static final String JAVAX_BODY_CONTENT_TEMPLATE_TEXT =
+ "JAVAX_BODY_CONTENT_TEMPLATE_TEXT";
/**
* The constructor
@@ -85,7 +86,6 @@
this.pageInfo = pc.getCompiler().getPageInfo();
this.err = pc.getCompiler().getErrorDispatcher();
this.reader = reader;
- this.currentFile = reader.mark().getFile();
this.scriptlessCount = 0;
this.isTagFile = isTagFile;
this.directivesOnly = directivesOnly;
@@ -108,7 +108,8 @@
public static Node.Nodes parse(ParserController pc, JspReader reader,
Node parent, boolean isTagFile, boolean directivesOnly,
URL jarFileUrl, String pageEnc, String jspConfigPageEnc,
- boolean isDefaultPageEncoding, boolean isBomPresent) throws JasperException {
+ boolean isDefaultPageEncoding, boolean isBomPresent)
+ throws JasperException {
Parser parser = new Parser(pc, reader, isTagFile, directivesOnly,
jarFileUrl);
@@ -169,7 +170,8 @@
* around Eq. It is added to be backward compatible with Tomcat, and with
* other xml parsers.
*/
- private boolean parseAttribute(AttributesImpl attrs) throws JasperException {
+ private boolean parseAttribute(AttributesImpl attrs)
+ throws JasperException {
// Get the qualified name
String qName = parseName();
@@ -417,8 +419,8 @@
}
if (impl == null) {
String[] location = ctxt.getTldLocation(uri);
- impl = new TagLibraryInfoImpl(ctxt, parserController, pageInfo,
- prefix, uri, location, err);
+ impl = new TagLibraryInfoImpl(ctxt, parserController,
+ pageInfo, prefix, uri, location, err);
if (ctxt.getOptions().isCaching()) {
ctxt.getOptions().getCache().put(uri, impl);
}
@@ -433,7 +435,8 @@
if (pageInfo.getTaglib(urnTagdir) == null) {
pageInfo.addTaglib(urnTagdir,
new ImplicitTagLibraryInfo(ctxt,
- parserController, pageInfo, prefix, tagdir, err));
+ parserController, pageInfo, prefix,
+ tagdir, err));
}
pageInfo.addPrefixMapping(prefix, urnTagdir);
}
@@ -599,8 +602,8 @@
}
/*
- * Parses a variable directive with the following syntax: PageDirective ::= (
- * S Attribute)*
+ * Parses a variable directive with the following syntax:
+ * PageDirective ::= ( S Attribute)*
*/
private void parseVariableDirective(Node parent) throws JasperException {
Attributes attrs = parseAttributes();
@@ -738,7 +741,8 @@
* ELExpressionBody (following "${" to first unquoted "}") // XXX add formal
* production and confirm implementation against it, // once it's decided
*/
- private void parseELExpression(Node parent, char type) throws JasperException {
+ private void parseELExpression(Node parent, char type)
+ throws JasperException {
start = reader.mark();
Mark last = null;
boolean singleQuoted = false, doubleQuoted = false;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org