Author: remm
Date: Tue Sep 19 03:43:54 2006
New Revision: 447804
URL: http://svn.apache.org/viewvc?view=rev&rev=447804
Log:
- Fix spelling.
- Fix getVersion method.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Compiler.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JspConfig.java
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Compiler.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Compiler.java?view=diff&rev=447804&r1=447803&r2=447804
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Compiler.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Compiler.java Tue Sep
19 03:43:54 2006
@@ -129,9 +129,9 @@
if (jspProperty.getIncludeCoda() != null) {
pageInfo.setIncludeCoda(jspProperty.getIncludeCoda());
}
- if (jspProperty.isDefferedSyntaxAllowedAsLitteral() != null) {
+ if (jspProperty.isDeferedSyntaxAllowedAsLitteral() != null) {
pageInfo.setDeferredSyntaxAllowedAsLiteral(JspUtil.booleanValue(jspProperty
- .isDefferedSyntaxAllowedAsLitteral()));
+ .isDeferedSyntaxAllowedAsLitteral()));
}
if (jspProperty.isTrimDirectiveWhitespaces() != null) {
pageInfo.setTrimDirectiveWhitespaces(JspUtil.booleanValue(jspProperty
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JspConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JspConfig.java?view=diff&rev=447804&r1=447803&r2=447804
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JspConfig.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JspConfig.java Tue Sep
19 03:43:54 2006
@@ -52,7 +52,7 @@
private String defaultIsXml = null; // unspecified
private String defaultIsELIgnored = null; // unspecified
private String defaultIsScriptingInvalid = null;
- private String defaultDefferedSyntaxAllowedAsLitteral = null;
+ private String defaultDeferedSyntaxAllowedAsLitteral = null;
private String defaultTrimDirectiveWhitespaces = null;
private JspProperty defaultJspProperty;
@@ -61,15 +61,14 @@
}
private double getVersion(TreeNode webApp) {
- if (webApp == null) {
- String v = webApp.findAttribute("version");
- if (v != null) {
- try {
- return Double.parseDouble(v);
- } catch (Exception e) {}
+ String v = webApp.findAttribute("version");
+ if (v != null) {
+ try {
+ return Double.parseDouble(v);
+ } catch (NumberFormatException e) {
}
}
- return 2.4;
+ return 2.3;
}
private void processWebDotXml(ServletContext ctxt) throws JasperException {
@@ -114,7 +113,7 @@
String isXml = null;
Vector includePrelude = new Vector();
Vector includeCoda = new Vector();
- String defferedSyntaxAllowedAsLitteral = null;
+ String deferedSyntaxAllowedAsLitteral = null;
String trimDirectiveWhitespaces = null;
while (list.hasNext()) {
@@ -137,7 +136,7 @@
else if ("include-coda".equals(tname))
includeCoda.addElement(element.getBody());
else if
("deferred-syntax-allowed-as-literal".equals(tname))
- defferedSyntaxAllowedAsLitteral = element.getBody();
+ deferedSyntaxAllowedAsLitteral = element.getBody();
else if ("trim-directive-whitespaces".equals(tname))
trimDirectiveWhitespaces = element.getBody();
}
@@ -195,7 +194,7 @@
pageEncoding,
includePrelude,
includeCoda,
- defferedSyntaxAllowedAsLitteral,
+ deferedSyntaxAllowedAsLitteral,
trimDirectiveWhitespaces);
JspPropertyGroup propertyGroup =
new JspPropertyGroup(path, extension, property);
@@ -221,7 +220,7 @@
defaultJspProperty = new JspProperty(defaultIsXml,
defaultIsELIgnored,
defaultIsScriptingInvalid,
- null, null, null, defaultDefferedSyntaxAllowedAsLitteral,
+ null, null, null, defaultDeferedSyntaxAllowedAsLitteral,
defaultTrimDirectiveWhitespaces);
initialized = true;
}
@@ -296,7 +295,7 @@
JspPropertyGroup elIgnoredMatch = null;
JspPropertyGroup scriptingInvalidMatch = null;
JspPropertyGroup pageEncodingMatch = null;
- JspPropertyGroup defferedSyntaxAllowedAsLitteralMatch = null;
+ JspPropertyGroup deferedSyntaxAllowedAsLitteralMatch = null;
JspPropertyGroup trimDirectiveWhitespacesMatch = null;
Iterator iter = jspProperties.iterator();
@@ -352,9 +351,9 @@
if (jp.getPageEncoding() != null) {
pageEncodingMatch = selectProperty(pageEncodingMatch, jpg);
}
- if (jp.isDefferedSyntaxAllowedAsLitteral() != null) {
- defferedSyntaxAllowedAsLitteralMatch =
- selectProperty(defferedSyntaxAllowedAsLitteralMatch, jpg);
+ if (jp.isDeferedSyntaxAllowedAsLitteral() != null) {
+ deferedSyntaxAllowedAsLitteralMatch =
+ selectProperty(deferedSyntaxAllowedAsLitteralMatch, jpg);
}
if (jp.isTrimDirectiveWhitespaces() != null) {
trimDirectiveWhitespacesMatch =
@@ -367,7 +366,7 @@
String isELIgnored = defaultIsELIgnored;
String isScriptingInvalid = defaultIsScriptingInvalid;
String pageEncoding = null;
- String isDefferedSyntaxAllowedAsLitteral =
defaultDefferedSyntaxAllowedAsLitteral;
+ String isDeferedSyntaxAllowedAsLitteral =
defaultDeferedSyntaxAllowedAsLitteral;
String isTrimDirectiveWhitespaces = defaultTrimDirectiveWhitespaces;
if (isXmlMatch != null) {
@@ -383,9 +382,9 @@
if (pageEncodingMatch != null) {
pageEncoding =
pageEncodingMatch.getJspProperty().getPageEncoding();
}
- if (defferedSyntaxAllowedAsLitteralMatch != null) {
- isDefferedSyntaxAllowedAsLitteral =
-
defferedSyntaxAllowedAsLitteralMatch.getJspProperty().isDefferedSyntaxAllowedAsLitteral();
+ if (deferedSyntaxAllowedAsLitteralMatch != null) {
+ isDeferedSyntaxAllowedAsLitteral =
+
deferedSyntaxAllowedAsLitteralMatch.getJspProperty().isDeferedSyntaxAllowedAsLitteral();
}
if (trimDirectiveWhitespacesMatch != null) {
isTrimDirectiveWhitespaces =
@@ -394,7 +393,7 @@
return new JspProperty(isXml, isELIgnored, isScriptingInvalid,
pageEncoding, includePreludes, includeCodas,
- isDefferedSyntaxAllowedAsLitteral, isTrimDirectiveWhitespaces);
+ isDeferedSyntaxAllowedAsLitteral, isTrimDirectiveWhitespaces);
}
/**
@@ -477,13 +476,13 @@
private String pageEncoding;
private Vector includePrelude;
private Vector includeCoda;
- private String defferedSyntaxAllowedAsLitteral;
+ private String deferedSyntaxAllowedAsLitteral;
private String trimDirectiveWhitespaces;
public JspProperty(String isXml, String elIgnored,
String scriptingInvalid, String pageEncoding,
Vector includePrelude, Vector includeCoda,
- String defferedSyntaxAllowedAsLitteral,
+ String deferedSyntaxAllowedAsLitteral,
String trimDirectiveWhitespaces) {
this.isXml = isXml;
@@ -492,7 +491,7 @@
this.pageEncoding = pageEncoding;
this.includePrelude = includePrelude;
this.includeCoda = includeCoda;
- this.defferedSyntaxAllowedAsLitteral =
defferedSyntaxAllowedAsLitteral;
+ this.deferedSyntaxAllowedAsLitteral =
deferedSyntaxAllowedAsLitteral;
this.trimDirectiveWhitespaces = trimDirectiveWhitespaces;
}
@@ -520,8 +519,8 @@
return includeCoda;
}
- public String isDefferedSyntaxAllowedAsLitteral() {
- return defferedSyntaxAllowedAsLitteral;
+ public String isDeferedSyntaxAllowedAsLitteral() {
+ return deferedSyntaxAllowedAsLitteral;
}
public String isTrimDirectiveWhitespaces() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
