You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2006/02/21 11:57:38 UTC
svn commit: r379417 [3/7] - in /tomcat/jasper/tc6.0.x/src/share/org/apache:
el/lang/ el/parser/ el/util/ jasper/compiler/ jasper/el/ jasper/resources/
jasper/runtime/
Modified: tomcat/jasper/tc6.0.x/src/share/org/apache/jasper/compiler/PageInfo.java
URL: http://svn.apache.org/viewcvs/tomcat/jasper/tc6.0.x/src/share/org/apache/jasper/compiler/PageInfo.java?rev=379417&r1=379416&r2=379417&view=diff
==============================================================================
--- tomcat/jasper/tc6.0.x/src/share/org/apache/jasper/compiler/PageInfo.java (original)
+++ tomcat/jasper/tc6.0.x/src/share/org/apache/jasper/compiler/PageInfo.java Tue Feb 21 02:57:35 2006
@@ -22,8 +22,11 @@
import java.util.List;
import java.util.Vector;
+import org.apache.el.ExpressionFactoryImpl;
import org.apache.jasper.Constants;
import org.apache.jasper.JasperException;
+
+import javax.el.ExpressionFactory;
import javax.servlet.jsp.tagext.TagLibraryInfo;
/**
@@ -63,8 +66,17 @@
private boolean scriptless = false;
private boolean scriptingInvalid = false;
+
private String isELIgnoredValue;
private boolean isELIgnored = false;
+
+ // JSP 2.1
+ private String deferredSyntaxAllowedAsLiteralValue;
+ private boolean deferredSyntaxAllowedAsLiteral = false;
+ private ExpressionFactory expressionFactory = new ExpressionFactoryImpl();
+ private String trimDirectiveWhitespacesValue;
+ private boolean trimDirectiveWhitespaces = false;
+
private String omitXmlDecl = null;
private String doctypeName = null;
private String doctypePublic = null;
@@ -605,6 +617,48 @@
isELIgnoredValue = value;
}
+
+ /*
+ * deferredSyntaxAllowedAsLiteral
+ */
+ public void setDeferredSyntaxAllowedAsLiteral(String value, Node n, ErrorDispatcher err,
+ boolean pagedir)
+ throws JasperException {
+
+ if ("true".equalsIgnoreCase(value))
+ deferredSyntaxAllowedAsLiteral = true;
+ else if ("false".equalsIgnoreCase(value))
+ deferredSyntaxAllowedAsLiteral = false;
+ else {
+ if (pagedir)
+ err.jspError(n, "jsp.error.page.invalid.deferredsyntaxallowedasliteral");
+ else
+ err.jspError(n, "jsp.error.tag.invalid.deferredsyntaxallowedasliteral");
+ }
+
+ deferredSyntaxAllowedAsLiteralValue = value;
+ }
+
+ /*
+ * trimDirectiveWhitespaces
+ */
+ public void setTrimDirectiveWhitespaces(String value, Node n, ErrorDispatcher err,
+ boolean pagedir)
+ throws JasperException {
+
+ if ("true".equalsIgnoreCase(value))
+ trimDirectiveWhitespaces = true;
+ else if ("false".equalsIgnoreCase(value))
+ trimDirectiveWhitespaces = false;
+ else {
+ if (pagedir)
+ err.jspError(n, "jsp.error.page.invalid.trimdirectivewhitespaces");
+ else
+ err.jspError(n, "jsp.error.tag.invalid.trimdirectivewhitespaces");
+ }
+
+ deferredSyntaxAllowedAsLiteralValue = value;
+ }
public void setELIgnored(boolean s) {
isELIgnored = s;
@@ -624,5 +678,33 @@
public Mark getNonCustomTagPrefix(String prefix) {
return (Mark) nonCustomTagPrefixMap.get(prefix);
+ }
+
+ public String getDeferredSyntaxAllowedAsLiteral() {
+ return deferredSyntaxAllowedAsLiteralValue;
+ }
+
+ public boolean isDeferredSyntaxAllowedAsLiteral() {
+ return deferredSyntaxAllowedAsLiteral;
+ }
+
+ public void setDeferredSyntaxAllowedAsLiteral(boolean isELDeferred) {
+ this.deferredSyntaxAllowedAsLiteral = isELDeferred;
+ }
+
+ public ExpressionFactory getExpressionFactory() {
+ return expressionFactory;
+ }
+
+ public String getTrimDirectiveWhitespaces() {
+ return trimDirectiveWhitespacesValue;
+ }
+
+ public boolean isTrimDirectiveWhitespaces() {
+ return trimDirectiveWhitespaces;
+ }
+
+ public void setTrimDirectiveWhitespaces(boolean trimDirectiveWhitespaces) {
+ this.trimDirectiveWhitespaces = trimDirectiveWhitespaces;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org