You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by jb...@apache.org on 2010/11/20 18:57:49 UTC
svn commit: r1037279 [6/10] - in /tomcat/taglibs/standard/trunk/impl: ./
src/main/java/org/apache/taglibs/standard/
src/main/java/org/apache/taglibs/standard/functions/
src/main/java/org/apache/taglibs/standard/tag/common/core/
src/main/java/org/apache...
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/RedirectTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/RedirectTag.java?rev=1037279&r1=1037278&r2=1037279&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/RedirectTag.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/RedirectTag.java Sat Nov 20 17:57:45 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.tag.rt.core;
@@ -34,11 +34,13 @@ public class RedirectTag extends Redirec
// Accessor methods
// for tag attribute
+
public void setUrl(String url) throws JspTagException {
this.url = url;
}
// for tag attribute
+
public void setContext(String context) throws JspTagException {
this.context = context;
}
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/SetTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/SetTag.java?rev=1037279&r1=1037278&r2=1037279&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/SetTag.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/SetTag.java Sat Nov 20 17:57:45 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.tag.rt.core;
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/UrlTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/UrlTag.java?rev=1037279&r1=1037278&r2=1037279&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/UrlTag.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/UrlTag.java Sat Nov 20 17:57:45 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.tag.rt.core;
@@ -34,11 +34,13 @@ public class UrlTag extends UrlSupport {
// Accessor methods
// for tag attribute
+
public void setValue(String value) throws JspTagException {
this.value = value;
}
// for tag attribute
+
public void setContext(String context) throws JspTagException {
this.context = context;
}
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/WhenTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/WhenTag.java?rev=1037279&r1=1037278&r2=1037279&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/WhenTag.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/WhenTag.java Sat Nov 20 17:57:45 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.tag.rt.core;
@@ -31,12 +31,14 @@ public class WhenTag extends WhenTagSupp
// Constructor and lifecycle management
// initialize inherited and local state
+
public WhenTag() {
super();
init();
}
// Releases any resources we may have (or inherit)
+
@Override
public void release() {
super.release();
@@ -63,6 +65,7 @@ public class WhenTag extends WhenTagSupp
// Accessors
// receives the tag's 'test' attribute
+
public void setTest(boolean test) {
this.test = test;
}
@@ -72,6 +75,7 @@ public class WhenTag extends WhenTagSupp
// Private utility methods
// resets internal state
+
private void init() {
test = false;
}
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/BundleTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/BundleTag.java?rev=1037279&r1=1037278&r2=1037279&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/BundleTag.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/BundleTag.java Sat Nov 20 17:57:45 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.tag.rt.fmt;
@@ -34,11 +34,13 @@ public class BundleTag extends BundleSup
// Accessor methods
// for tag attribute
+
public void setBasename(String basename) throws JspTagException {
this.basename = basename;
}
// for tag attribute
+
public void setPrefix(String prefix) throws JspTagException {
this.prefix = prefix;
}
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/FormatDateTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/FormatDateTag.java?rev=1037279&r1=1037278&r2=1037279&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/FormatDateTag.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/FormatDateTag.java Sat Nov 20 17:57:45 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.tag.rt.fmt;
@@ -36,31 +36,37 @@ public class FormatDateTag extends Forma
// Accessor methods
// 'value' attribute
+
public void setValue(Date value) throws JspTagException {
this.value = value;
}
// 'type' attribute
+
public void setType(String type) throws JspTagException {
this.type = type;
}
// 'dateStyle' attribute
+
public void setDateStyle(String dateStyle) throws JspTagException {
this.dateStyle = dateStyle;
}
// 'timeStyle' attribute
+
public void setTimeStyle(String timeStyle) throws JspTagException {
this.timeStyle = timeStyle;
}
// 'pattern' attribute
+
public void setPattern(String pattern) throws JspTagException {
this.pattern = pattern;
}
// 'timeZone' attribute
+
public void setTimeZone(Object timeZone) throws JspTagException {
this.timeZone = timeZone;
}
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/FormatNumberTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/FormatNumberTag.java?rev=1037279&r1=1037278&r2=1037279&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/FormatNumberTag.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/FormatNumberTag.java Sat Nov 20 17:57:45 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.tag.rt.fmt;
@@ -34,60 +34,70 @@ public class FormatNumberTag extends For
// Accessor methods
// 'value' attribute
+
public void setValue(Object value) throws JspTagException {
this.value = value;
- this.valueSpecified = true;
+ this.valueSpecified = true;
}
// 'type' attribute
+
public void setType(String type) throws JspTagException {
this.type = type;
}
// 'pattern' attribute
+
public void setPattern(String pattern) throws JspTagException {
this.pattern = pattern;
}
// 'currencyCode' attribute
+
public void setCurrencyCode(String currencyCode) throws JspTagException {
this.currencyCode = currencyCode;
}
// 'currencySymbol' attribute
+
public void setCurrencySymbol(String currencySymbol)
- throws JspTagException {
+ throws JspTagException {
this.currencySymbol = currencySymbol;
}
// 'groupingUsed' attribute
+
public void setGroupingUsed(boolean isGroupingUsed)
- throws JspTagException {
+ throws JspTagException {
this.isGroupingUsed = isGroupingUsed;
- this.groupingUsedSpecified = true;
+ this.groupingUsedSpecified = true;
}
// 'maxIntegerDigits' attribute
+
public void setMaxIntegerDigits(int maxDigits) throws JspTagException {
this.maxIntegerDigits = maxDigits;
- this.maxIntegerDigitsSpecified = true;
+ this.maxIntegerDigitsSpecified = true;
}
// 'minIntegerDigits' attribute
+
public void setMinIntegerDigits(int minDigits) throws JspTagException {
this.minIntegerDigits = minDigits;
- this.minIntegerDigitsSpecified = true;
+ this.minIntegerDigitsSpecified = true;
}
// 'maxFractionDigits' attribute
+
public void setMaxFractionDigits(int maxDigits) throws JspTagException {
this.maxFractionDigits = maxDigits;
- this.maxFractionDigitsSpecified = true;
+ this.maxFractionDigitsSpecified = true;
}
// 'minFractionDigits' attribute
+
public void setMinFractionDigits(int minDigits) throws JspTagException {
this.minFractionDigits = minDigits;
- this.minFractionDigitsSpecified = true;
+ this.minFractionDigitsSpecified = true;
}
}
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/MessageTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/MessageTag.java?rev=1037279&r1=1037278&r2=1037279&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/MessageTag.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/MessageTag.java Sat Nov 20 17:57:45 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.tag.rt.fmt;
@@ -35,12 +35,14 @@ public class MessageTag extends MessageS
// Accessor methods
// for tag attribute
+
public void setKey(String key) throws JspTagException {
this.keyAttrValue = key;
- this.keySpecified = true;
+ this.keySpecified = true;
}
// for tag attribute
+
public void setBundle(LocalizationContext locCtxt) throws JspTagException {
this.bundleAttrValue = locCtxt;
this.bundleSpecified = true;
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/ParamTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/ParamTag.java?rev=1037279&r1=1037278&r2=1037279&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/ParamTag.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/ParamTag.java Sat Nov 20 17:57:45 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.tag.rt.fmt;
@@ -34,8 +34,9 @@ public class ParamTag extends ParamSuppo
// Accessor methods
// for tag attribute
+
public void setValue(Object value) throws JspTagException {
this.value = value;
- this.valueSpecified = true;
+ this.valueSpecified = true;
}
}
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/ParseDateTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/ParseDateTag.java?rev=1037279&r1=1037278&r2=1037279&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/ParseDateTag.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/ParseDateTag.java Sat Nov 20 17:57:45 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.tag.rt.fmt;
@@ -37,47 +37,54 @@ public class ParseDateTag extends ParseD
// Accessor methods
// 'value' attribute
+
public void setValue(String value) throws JspTagException {
this.value = value;
- this.valueSpecified = true;
+ this.valueSpecified = true;
}
// 'type' attribute
+
public void setType(String type) throws JspTagException {
this.type = type;
}
// 'dateStyle' attribute
+
public void setDateStyle(String dateStyle) throws JspTagException {
this.dateStyle = dateStyle;
}
// 'timeStyle' attribute
+
public void setTimeStyle(String timeStyle) throws JspTagException {
this.timeStyle = timeStyle;
}
// 'pattern' attribute
+
public void setPattern(String pattern) throws JspTagException {
this.pattern = pattern;
}
// 'timeZone' attribute
+
public void setTimeZone(Object timeZone) throws JspTagException {
this.timeZone = timeZone;
}
// 'parseLocale' attribute
+
public void setParseLocale(Object loc) throws JspTagException {
- if (loc != null) {
- if (loc instanceof Locale) {
- this.parseLocale = (Locale) loc;
- } else {
- if (!"".equals((String) loc)) {
- this.parseLocale = SetLocaleSupport.parseLocale((String)
- loc);
- }
- }
- }
+ if (loc != null) {
+ if (loc instanceof Locale) {
+ this.parseLocale = (Locale) loc;
+ } else {
+ if (!"".equals((String) loc)) {
+ this.parseLocale = SetLocaleSupport.parseLocale((String)
+ loc);
+ }
+ }
+ }
}
}
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/ParseNumberTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/ParseNumberTag.java?rev=1037279&r1=1037278&r2=1037279&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/ParseNumberTag.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/ParseNumberTag.java Sat Nov 20 17:57:45 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.tag.rt.fmt;
@@ -37,38 +37,43 @@ public class ParseNumberTag extends Pars
// Accessor methods
// 'value' attribute
+
public void setValue(String value) throws JspTagException {
this.value = value;
- this.valueSpecified = true;
+ this.valueSpecified = true;
}
// 'type' attribute
+
public void setType(String type) throws JspTagException {
this.type = type;
}
// 'pattern' attribute
+
public void setPattern(String pattern) throws JspTagException {
this.pattern = pattern;
}
// 'parseLocale' attribute
+
public void setParseLocale(Object loc) throws JspTagException {
- if (loc != null) {
- if (loc instanceof Locale) {
- this.parseLocale = (Locale) loc;
- } else {
- if (!"".equals((String) loc)) {
- this.parseLocale = SetLocaleSupport.parseLocale((String)
- loc);
- }
- }
- }
+ if (loc != null) {
+ if (loc instanceof Locale) {
+ this.parseLocale = (Locale) loc;
+ } else {
+ if (!"".equals((String) loc)) {
+ this.parseLocale = SetLocaleSupport.parseLocale((String)
+ loc);
+ }
+ }
+ }
}
// 'integerOnly' attribute
+
public void setIntegerOnly(boolean isIntegerOnly) throws JspTagException {
this.isIntegerOnly = isIntegerOnly;
- this.integerOnlySpecified = true;
+ this.integerOnlySpecified = true;
}
}
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/RequestEncodingTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/RequestEncodingTag.java?rev=1037279&r1=1037278&r2=1037279&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/RequestEncodingTag.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/RequestEncodingTag.java Sat Nov 20 17:57:45 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.tag.rt.fmt;
@@ -34,6 +34,7 @@ public class RequestEncodingTag extends
// Accessor methods
// for tag attribute
+
public void setValue(String value) throws JspTagException {
this.value = value;
}
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/SetBundleTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/SetBundleTag.java?rev=1037279&r1=1037278&r2=1037279&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/SetBundleTag.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/SetBundleTag.java Sat Nov 20 17:57:45 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.tag.rt.fmt;
@@ -34,6 +34,7 @@ public class SetBundleTag extends SetBun
// Accessor methods
// for tag attribute
+
public void setBasename(String basename) throws JspTagException {
this.basename = basename;
}
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/SetLocaleTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/SetLocaleTag.java?rev=1037279&r1=1037278&r2=1037279&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/SetLocaleTag.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/SetLocaleTag.java Sat Nov 20 17:57:45 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.tag.rt.fmt;
@@ -34,11 +34,13 @@ public class SetLocaleTag extends SetLoc
// Accessor methods
// for tag attribute
+
public void setValue(Object value) throws JspTagException {
this.value = value;
}
// for tag attribute
+
public void setVariant(String variant) throws JspTagException {
this.variant = variant;
}
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/SetTimeZoneTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/SetTimeZoneTag.java?rev=1037279&r1=1037278&r2=1037279&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/SetTimeZoneTag.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/SetTimeZoneTag.java Sat Nov 20 17:57:45 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.tag.rt.fmt;
@@ -34,6 +34,7 @@ public class SetTimeZoneTag extends SetT
// Accessor methods
// for tag attribute
+
public void setValue(Object value) throws JspTagException {
this.value = value;
}
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/TimeZoneTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/TimeZoneTag.java?rev=1037279&r1=1037278&r2=1037279&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/TimeZoneTag.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/TimeZoneTag.java Sat Nov 20 17:57:45 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.tag.rt.fmt;
@@ -34,6 +34,7 @@ public class TimeZoneTag extends TimeZon
// Accessor methods
// for tag attribute
+
public void setValue(Object value) throws JspTagException {
this.value = value;
}
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/sql/DateParamTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/sql/DateParamTag.java?rev=1037279&r1=1037278&r2=1037279&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/sql/DateParamTag.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/sql/DateParamTag.java Sat Nov 20 17:57:45 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.tag.rt.sql;
import java.util.Date;
@@ -26,12 +26,12 @@ import org.apache.taglibs.standard.tag.c
* @author Justyna Horwat
*/
public class DateParamTag extends DateParamTagSupport {
-
+
public void setValue(Date value) {
- this.value = value;
+ this.value = value;
}
public void setType(String type) {
- this.type = type;
+ this.type = type;
}
}
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/sql/ParamTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/sql/ParamTag.java?rev=1037279&r1=1037278&r2=1037279&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/sql/ParamTag.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/sql/ParamTag.java Sat Nov 20 17:57:45 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.tag.rt.sql;
import org.apache.taglibs.standard.tag.common.sql.ParamTagSupport;
@@ -24,8 +24,8 @@ import org.apache.taglibs.standard.tag.c
* @author Hans Bergsten
*/
public class ParamTag extends ParamTagSupport {
-
+
public void setValue(Object value) {
- this.value = value;
+ this.value = value;
}
}
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/sql/QueryTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/sql/QueryTag.java?rev=1037279&r1=1037278&r2=1037279&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/sql/QueryTag.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/sql/QueryTag.java Sat Nov 20 17:57:45 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.tag.rt.sql;
import org.apache.taglibs.standard.tag.common.sql.QueryTagSupport;
@@ -40,10 +40,10 @@ public class QueryTag extends QueryTagSu
//*********************************************************************
// Accessor methods
-
+
public void setDataSource(Object dataSource) {
- this.rawDataSource = dataSource;
- this.dataSourceSpecified = true;
+ this.rawDataSource = dataSource;
+ this.dataSourceSpecified = true;
}
/**
@@ -60,7 +60,7 @@ public class QueryTag extends QueryTagSu
*/
public void setMaxRows(int maxRows) {
this.maxRows = maxRows;
- this.maxRowsSpecified = true;
+ this.maxRowsSpecified = true;
}
/**
@@ -70,7 +70,7 @@ public class QueryTag extends QueryTagSu
* be set using nested value elements.
*/
public void setSql(String sql) {
- this.sql = sql;
+ this.sql = sql;
}
}
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/sql/SetDataSourceTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/sql/SetDataSourceTag.java?rev=1037279&r1=1037278&r2=1037279&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/sql/SetDataSourceTag.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/sql/SetDataSourceTag.java Sat Nov 20 17:57:45 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.tag.rt.sql;
@@ -22,7 +22,6 @@ import org.apache.taglibs.standard.tag.c
/**
* <p>Tag handler for <Driver> in JSTL, used to create
* a simple DataSource for prototyping.</p>
- *
*/
public class SetDataSourceTag extends SetDataSourceTagSupport {
@@ -30,24 +29,24 @@ public class SetDataSourceTag extends Se
// Accessor methods
public void setDataSource(Object dataSource) {
- this.dataSource = dataSource;
- this.dataSourceSpecified = true;
+ this.dataSource = dataSource;
+ this.dataSourceSpecified = true;
}
public void setDriver(String driverClassName) {
- this.driverClassName = driverClassName;
+ this.driverClassName = driverClassName;
}
public void setUrl(String jdbcURL) {
- this.jdbcURL = jdbcURL;
+ this.jdbcURL = jdbcURL;
}
public void setUser(String userName) {
- this.userName = userName;
+ this.userName = userName;
}
public void setPassword(String password) {
- this.password = password;
+ this.password = password;
}
}
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/sql/TransactionTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/sql/TransactionTag.java?rev=1037279&r1=1037278&r2=1037279&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/sql/TransactionTag.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/sql/TransactionTag.java Sat Nov 20 17:57:45 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.tag.rt.sql;
import javax.servlet.jsp.JspException;
@@ -27,7 +27,7 @@ import org.apache.taglibs.standard.tag.c
*/
public class TransactionTag extends TransactionTagSupport {
private String isolationRT;
-
+
//*********************************************************************
// Accessor methods
@@ -37,8 +37,8 @@ public class TransactionTag extends Tran
* a String or a DataSource object.
*/
public void setDataSource(Object dataSource) {
- this.rawDataSource = dataSource;
- this.dataSourceSpecified = true;
+ this.rawDataSource = dataSource;
+ this.dataSourceSpecified = true;
}
/**
@@ -46,13 +46,14 @@ public class TransactionTag extends Tran
*/
@Override
public void setIsolation(String isolation) {
- this.isolationRT = isolation;
+ this.isolationRT = isolation;
}
@Override
public int doStartTag() throws JspException {
- if (isolationRT != null)
- super.setIsolation(isolationRT);
+ if (isolationRT != null) {
+ super.setIsolation(isolationRT);
+ }
return super.doStartTag();
}
}
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/sql/UpdateTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/sql/UpdateTag.java?rev=1037279&r1=1037278&r2=1037279&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/sql/UpdateTag.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/sql/UpdateTag.java Sat Nov 20 17:57:45 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.tag.rt.sql;
import org.apache.taglibs.standard.tag.common.sql.UpdateTagSupport;
@@ -28,14 +28,14 @@ public class UpdateTag extends UpdateTag
//*********************************************************************
// Accessor methods
-
+
/**
* Setter method for the SQL DataSource. DataSource can be
* a String or a DataSource object.
*/
public void setDataSource(Object dataSource) {
- this.rawDataSource = dataSource;
- this.dataSourceSpecified = true;
+ this.rawDataSource = dataSource;
+ this.dataSourceSpecified = true;
}
/**
@@ -45,6 +45,6 @@ public class UpdateTag extends UpdateTag
* be set using nested value elements.
*/
public void setSql(String sql) {
- this.sql = sql;
+ this.sql = sql;
}
}
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/xml/ExprTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/xml/ExprTag.java?rev=1037279&r1=1037278&r2=1037279&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/xml/ExprTag.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/xml/ExprTag.java Sat Nov 20 17:57:45 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.tag.rt.xml;
@@ -32,8 +32,9 @@ public class ExprTag extends ExprSupport
// Accessor methods
// for tag attribute
+
public void setEscapeXml(boolean escapeXml) {
- this.escapeXml = escapeXml;
+ this.escapeXml = escapeXml;
}
}
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/xml/ParamTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/xml/ParamTag.java?rev=1037279&r1=1037278&r2=1037279&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/xml/ParamTag.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/xml/ParamTag.java Sat Nov 20 17:57:45 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.tag.rt.xml;
@@ -34,11 +34,13 @@ public class ParamTag extends ParamSuppo
// Accessor methods
// for tag attribute
+
public void setName(String name) throws JspTagException {
this.name = name;
}
// for tag attribute
+
public void setValue(Object value) throws JspTagException {
this.value = value;
}
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/xml/ParseTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/xml/ParseTag.java?rev=1037279&r1=1037278&r2=1037279&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/xml/ParseTag.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/xml/ParseTag.java Sat Nov 20 17:57:45 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.tag.rt.xml;
@@ -36,22 +36,25 @@ public class ParseTag extends ParseSuppo
// Deprecated as of JSTL 1.1
// for tag attribute
+
public void setXml(Object xml) throws JspTagException {
this.xml = xml;
}
// 'doc' replaces 'xml' as of JSTL 1.1
+
public void setDoc(Object xml) throws JspTagException {
this.xml = xml;
}
public void setSystemId(String systemId) throws JspTagException {
- this.systemId = systemId;
+ this.systemId = systemId;
}
// for tag attribute
+
public void setFilter(XMLFilter filter) throws JspTagException {
- this.filter = filter;
+ this.filter = filter;
}
}
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/xml/TransformTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/xml/TransformTag.java?rev=1037279&r1=1037278&r2=1037279&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/xml/TransformTag.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/xml/TransformTag.java Sat Nov 20 17:57:45 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.tag.rt.xml;
@@ -36,11 +36,13 @@ public class TransformTag extends Transf
// Deprecated as of JSTL 1.1
// for tag attribute
+
public void setXml(Object xml) throws JspTagException {
setDoc(xml);
}
// 'doc' replaces 'xml' as of JSTL 1.1
+
public void setDoc(Object xml) throws JspTagException {
this.xml = xml;
this.xmlSpecified = true;
@@ -48,26 +50,31 @@ public class TransformTag extends Transf
// Deprecated as of JSTL 1.1
// for tag attribute
+
public void setXmlSystemId(String xmlSystemId) throws JspTagException {
this.xmlSystemId = xmlSystemId;
}
// 'docSystemId' replaces 'xmlSystemId' as of JSTL 1.1
+
public void setDocSystemId(String xmlSystemId) throws JspTagException {
this.xmlSystemId = xmlSystemId;
}
// for tag attribute
+
public void setXslt(Object xslt) throws JspTagException {
this.xslt = xslt;
}
// for tag attribute
+
public void setXsltSystemId(String xsltSystemId) throws JspTagException {
this.xsltSystemId = xsltSystemId;
}
// for tag attribute
+
public void setResult(Result result) throws JspTagException {
this.result = result;
}
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tei/DeclareTEI.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tei/DeclareTEI.java?rev=1037279&r1=1037278&r2=1037279&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tei/DeclareTEI.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tei/DeclareTEI.java Sat Nov 20 17:57:45 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.tei;
@@ -33,15 +33,16 @@ import javax.servlet.jsp.tagext.Variable
public class DeclareTEI extends TagExtraInfo {
// purposely inherit JavaDoc and semantics from TagExtraInfo
+
@Override
public VariableInfo[] getVariableInfo(TagData data) {
// construct the relevant VariableInfo object
VariableInfo id = new VariableInfo(
- data.getAttributeString("id"),
- data.getAttributeString("type") == null ?
- "java.lang.Object" : data.getAttributeString("type"),
- true,
- VariableInfo.AT_END);
- return new VariableInfo[] { id };
+ data.getAttributeString("id"),
+ data.getAttributeString("type") == null ?
+ "java.lang.Object" : data.getAttributeString("type"),
+ true,
+ VariableInfo.AT_END);
+ return new VariableInfo[]{id};
}
}
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tei/ForEachTEI.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tei/ForEachTEI.java?rev=1037279&r1=1037278&r2=1037279&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tei/ForEachTEI.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tei/ForEachTEI.java Sat Nov 20 17:57:45 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.tei;
@@ -37,11 +37,14 @@ public class ForEachTEI extends TagExtra
*
* - If 'items' is not specified, 'begin' and 'end' must be
*/
+
@Override
public boolean isValid(TagData us) {
- if (!Util.isSpecified(us, ITEMS))
- if (!Util.isSpecified(us, BEGIN) || !(Util.isSpecified(us, END)))
+ if (!Util.isSpecified(us, ITEMS)) {
+ if (!Util.isSpecified(us, BEGIN) || !(Util.isSpecified(us, END))) {
return false;
+ }
+ }
return true;
}
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tei/ImportTEI.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tei/ImportTEI.java?rev=1037279&r1=1037278&r2=1037279&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tei/ImportTEI.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tei/ImportTEI.java Sat Nov 20 17:57:45 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.tei;
@@ -33,9 +33,10 @@ public class ImportTEI extends TagExtraI
@Override
public boolean isValid(TagData us) {
- // don't allow both VAR and VAR_READER, together
- if (Util.isSpecified(us, VAR) && Util.isSpecified(us, VAR_READER))
- return false;
+ // don't allow both VAR and VAR_READER, together
+ if (Util.isSpecified(us, VAR) && Util.isSpecified(us, VAR_READER)) {
+ return false;
+ }
return true;
}
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tei/Util.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tei/Util.java?rev=1037279&r1=1037278&r2=1037279&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tei/Util.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tei/Util.java Sat Nov 20 17:57:45 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.tei;
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tei/XmlParseTEI.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tei/XmlParseTEI.java?rev=1037279&r1=1037278&r2=1037279&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tei/XmlParseTEI.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tei/XmlParseTEI.java Sat Nov 20 17:57:45 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.tei;
@@ -35,19 +35,23 @@ public class XmlParseTEI extends TagExtr
@Override
public boolean isValid(TagData us) {
- // must have no more than one of VAR and VAR_DOM ...
- if (Util.isSpecified(us, VAR) && Util.isSpecified(us, VAR_DOM))
- return false;
-
- // ... and must have no less than one of VAR and VAR_DOM
- if (!(Util.isSpecified(us, VAR) || Util.isSpecified(us, VAR_DOM)))
- return false;
-
- // When either 'scope' is specified, its 'var' must be specified
- if (Util.isSpecified(us, SCOPE) && !Util.isSpecified(us, VAR))
- return false;
- if (Util.isSpecified(us, SCOPE_DOM) && !Util.isSpecified(us, VAR_DOM))
- return false;
+ // must have no more than one of VAR and VAR_DOM ...
+ if (Util.isSpecified(us, VAR) && Util.isSpecified(us, VAR_DOM)) {
+ return false;
+ }
+
+ // ... and must have no less than one of VAR and VAR_DOM
+ if (!(Util.isSpecified(us, VAR) || Util.isSpecified(us, VAR_DOM))) {
+ return false;
+ }
+
+ // When either 'scope' is specified, its 'var' must be specified
+ if (Util.isSpecified(us, SCOPE) && !Util.isSpecified(us, VAR)) {
+ return false;
+ }
+ if (Util.isSpecified(us, SCOPE_DOM) && !Util.isSpecified(us, VAR_DOM)) {
+ return false;
+ }
return true;
}
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tei/XmlTransformTEI.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tei/XmlTransformTEI.java?rev=1037279&r1=1037278&r2=1037279&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tei/XmlTransformTEI.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tei/XmlTransformTEI.java Sat Nov 20 17:57:45 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.tei;
@@ -34,13 +34,15 @@ public class XmlTransformTEI extends Tag
@Override
public boolean isValid(TagData us) {
- // require XSLT
- if (!Util.isSpecified(us, XSLT))
- return false;
-
- // disallow both VAR and RESULT
- if (Util.isSpecified(us, VAR) && Util.isSpecified(us, RESULT))
- return false;
+ // require XSLT
+ if (!Util.isSpecified(us, XSLT)) {
+ return false;
+ }
+
+ // disallow both VAR and RESULT
+ if (Util.isSpecified(us, VAR) && Util.isSpecified(us, RESULT)) {
+ return false;
+ }
return true;
}
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlBaseTLV.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlBaseTLV.java?rev=1037279&r1=1037278&r2=1037279&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlBaseTLV.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlBaseTLV.java Sat Nov 20 17:57:45 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.tlv;
@@ -41,7 +41,7 @@ import org.xml.sax.helpers.DefaultHandle
/**
* <p>A base class to support SAX-based validation in JSTL.</p>
- *
+ *
* @author Shawn Bayern
*/
public abstract class JstlBaseTLV extends TagLibraryValidator {
@@ -66,19 +66,19 @@ public abstract class JstlBaseTLV extend
// attributes
protected static final String VAR = "var";
- protected static final String SCOPE = "scope";
+ protected static final String SCOPE = "scope";
//scopes
- protected static final String PAGE_SCOPE = "page";
- protected static final String REQUEST_SCOPE = "request";
- protected static final String SESSION_SCOPE = "session";
+ protected static final String PAGE_SCOPE = "page";
+ protected static final String REQUEST_SCOPE = "request";
+ protected static final String SESSION_SCOPE = "session";
protected static final String APPLICATION_SCOPE = "application";
// Relevant URIs
- protected final String JSP = "http://java.sun.com/JSP/Page";
-
+ protected final String JSP = "http://java.sun.com/JSP/Page";
+
// types of sub-classes - used on method validate()
- private static final int TYPE_UNDEFINED = 0;
+ private static final int TYPE_UNDEFINED = 0;
protected static final int TYPE_CORE = 1;
protected static final int TYPE_FMT = 2;
protected static final int TYPE_SQL = 3;
@@ -90,82 +90,84 @@ public abstract class JstlBaseTLV extend
//*********************************************************************
// Validation and configuration state (protected)
- protected String uri; // our taglib's uri (as passed by JSP container on XML View)
- protected String prefix; // our taglib's prefix
- protected Vector messageVector; // temporary error messages
- protected Map config; // configuration (Map of Sets)
- protected boolean failed; // have we failed >0 times?
- protected String lastElementId; // the last element we've seen
+ protected String uri; // our taglib's uri (as passed by JSP container on XML View)
+ protected String prefix; // our taglib's prefix
+ protected Vector messageVector; // temporary error messages
+ protected Map config; // configuration (Map of Sets)
+ protected boolean failed; // have we failed >0 times?
+ protected String lastElementId; // the last element we've seen
//*********************************************************************
// Constructor and lifecycle management
public JstlBaseTLV() {
- super();
- init();
+ super();
+ init();
}
private void init() {
- messageVector = null;
- prefix = null;
- config = null;
+ messageVector = null;
+ prefix = null;
+ config = null;
}
@Override
public void release() {
- super.release();
- init();
+ super.release();
+ init();
}
-
+
//*********************************************************************
// Validation entry point - this method is called by the sub-classes to
// do the validation.
public synchronized ValidationMessage[] validate(
- int type, String prefix, String uri, PageData page) {
- try {
- this.tlvType = type;
- this.uri = uri;
- // initialize
- messageVector = new Vector();
-
- // save the prefix
- this.prefix = prefix;
-
- // parse parameters if necessary
- try {
- if (config == null)
- configure((String) getInitParameters().get(EXP_ATT_PARAM));
- } catch (NoSuchElementException ex) {
- // parsing error
- return vmFromString(
- Resources.getMessage("TLV_PARAMETER_ERROR",
- EXP_ATT_PARAM));
- }
-
- // get a handler
- DefaultHandler h = getHandler();
-
- // parse the page
- SAXParserFactory f = SAXParserFactory.newInstance();
- f.setValidating(false);
- f.setNamespaceAware(true);
- SAXParser p = f.newSAXParser();
- p.parse(page.getInputStream(), h);
-
- if (messageVector.size() == 0)
- return null;
- else
- return vmFromVector(messageVector);
-
- } catch (SAXException ex) {
- return vmFromString(ex.toString());
- } catch (ParserConfigurationException ex) {
- return vmFromString(ex.toString());
- } catch (IOException ex) {
- return vmFromString(ex.toString());
- }
+ int type, String prefix, String uri, PageData page) {
+ try {
+ this.tlvType = type;
+ this.uri = uri;
+ // initialize
+ messageVector = new Vector();
+
+ // save the prefix
+ this.prefix = prefix;
+
+ // parse parameters if necessary
+ try {
+ if (config == null) {
+ configure((String) getInitParameters().get(EXP_ATT_PARAM));
+ }
+ } catch (NoSuchElementException ex) {
+ // parsing error
+ return vmFromString(
+ Resources.getMessage("TLV_PARAMETER_ERROR",
+ EXP_ATT_PARAM));
+ }
+
+ // get a handler
+ DefaultHandler h = getHandler();
+
+ // parse the page
+ SAXParserFactory f = SAXParserFactory.newInstance();
+ f.setValidating(false);
+ f.setNamespaceAware(true);
+ SAXParser p = f.newSAXParser();
+ p.parse(page.getInputStream(), h);
+
+ if (messageVector.size() == 0) {
+ return null;
+ } else {
+ return vmFromVector(messageVector);
+ }
+
+ } catch (SAXException ex) {
+ return vmFromString(ex.toString());
+ } catch (ParserConfigurationException ex) {
+ return vmFromString(ex.toString());
+ } catch (IOException ex) {
+ return vmFromString(ex.toString());
+ }
}
//*********************************************************************
@@ -173,24 +175,27 @@ public abstract class JstlBaseTLV extend
// delegate validation to the appropriate expression language
// TODO refactor this into EL tag specific functionality
+
@Deprecated
protected String validateExpression(
- String elem, String att, String expr) {
+ String elem, String att, String expr) {
return null;
}
// utility methods to help us match elements in our tagset
+
protected boolean isTag(String tagUri,
- String tagLn,
- String matchUri,
- String matchLn) {
- if (tagUri == null
+ String tagLn,
+ String matchUri,
+ String matchLn) {
+ if (tagUri == null
|| tagUri.length() == 0
- || tagLn == null
- || matchUri == null
- || matchLn == null)
- return false;
+ || tagLn == null
+ || matchUri == null
+ || matchLn == null) {
+ return false;
+ }
// match beginning of URI since some suffix *_rt tags can
// be nested in EL enabled tags as defined by the spec
if (tagUri.length() > matchUri.length()) {
@@ -204,27 +209,28 @@ public abstract class JstlBaseTLV extend
return isTag(tagUri, tagLn, JSP, target);
}
- private boolean isTag( int type, String tagUri, String tagLn, String target) {
- return ( this.tlvType == type && isTag(tagUri, tagLn, this.uri, target) );
+ private boolean isTag(int type, String tagUri, String tagLn, String target) {
+ return (this.tlvType == type && isTag(tagUri, tagLn, this.uri, target));
}
protected boolean isCoreTag(String tagUri, String tagLn, String target) {
- return isTag( TYPE_CORE, tagUri, tagLn, target );
+ return isTag(TYPE_CORE, tagUri, tagLn, target);
}
protected boolean isFmtTag(String tagUri, String tagLn, String target) {
- return isTag( TYPE_FMT, tagUri, tagLn, target );
+ return isTag(TYPE_FMT, tagUri, tagLn, target);
}
protected boolean isSqlTag(String tagUri, String tagLn, String target) {
- return isTag( TYPE_SQL, tagUri, tagLn, target );
+ return isTag(TYPE_SQL, tagUri, tagLn, target);
}
protected boolean isXmlTag(String tagUri, String tagLn, String target) {
- return isTag( TYPE_XML, tagUri, tagLn, target );
+ return isTag(TYPE_XML, tagUri, tagLn, target);
}
// utility method to determine if an attribute exists
+
protected boolean hasAttribute(Attributes a, String att) {
return (a.getValue(att) != null);
}
@@ -233,91 +239,105 @@ public abstract class JstlBaseTLV extend
* method to assist with failure [ as if it's not easy enough
* already :-) ]
*/
+
protected void fail(String message) {
failed = true;
messageVector.add(new ValidationMessage(lastElementId, message));
}
// returns true if the given attribute name is specified, false otherwise
+
protected boolean isSpecified(TagData data, String attributeName) {
return (data.getAttribute(attributeName) != null);
}
// returns true if the 'scope' attribute is valid
+
protected boolean hasNoInvalidScope(Attributes a) {
String scope = a.getValue(SCOPE);
- if ((scope != null)
- && !scope.equals(PAGE_SCOPE)
- && !scope.equals(REQUEST_SCOPE)
- && !scope.equals(SESSION_SCOPE)
- && !scope.equals(APPLICATION_SCOPE))
- return false;
+ if ((scope != null)
+ && !scope.equals(PAGE_SCOPE)
+ && !scope.equals(REQUEST_SCOPE)
+ && !scope.equals(SESSION_SCOPE)
+ && !scope.equals(APPLICATION_SCOPE)) {
+ return false;
+ }
return true;
}
// returns true if the 'var' attribute is empty
+
protected boolean hasEmptyVar(Attributes a) {
- if ("".equals(a.getValue(VAR)))
- return true;
- return false;
+ if ("".equals(a.getValue(VAR))) {
+ return true;
+ }
+ return false;
}
// returns true if the 'scope' attribute is present without 'var'
+
protected boolean hasDanglingScope(Attributes a) {
- return (a.getValue(SCOPE) != null && a.getValue(VAR) == null);
+ return (a.getValue(SCOPE) != null && a.getValue(VAR) == null);
}
// retrieves the local part of a QName
+
protected String getLocalPart(String qname) {
- int colon = qname.indexOf(":");
- if (colon == -1)
- return qname;
- else
- return qname.substring(colon + 1);
+ int colon = qname.indexOf(":");
+ if (colon == -1) {
+ return qname;
+ } else {
+ return qname.substring(colon + 1);
+ }
}
//*********************************************************************
// Miscellaneous utility functions
// parses our configuration parameter for element:attribute pairs
+
private void configure(String info) {
// construct our configuration map
- config = new HashMap();
+ config = new HashMap();
- // leave the map empty if we have nothing to configure
- if (info == null)
- return;
-
- // separate parameter into space-separated tokens and store them
- StringTokenizer st = new StringTokenizer(info);
- while (st.hasMoreTokens()) {
- String pair = st.nextToken();
- StringTokenizer pairTokens = new StringTokenizer(pair, ":");
- String element = pairTokens.nextToken();
- String attribute = pairTokens.nextToken();
- Object atts = config.get(element);
- if (atts == null) {
- atts = new HashSet();
- config.put(element, atts);
- }
- ((Set) atts).add(attribute);
- }
+ // leave the map empty if we have nothing to configure
+ if (info == null) {
+ return;
+ }
+
+ // separate parameter into space-separated tokens and store them
+ StringTokenizer st = new StringTokenizer(info);
+ while (st.hasMoreTokens()) {
+ String pair = st.nextToken();
+ StringTokenizer pairTokens = new StringTokenizer(pair, ":");
+ String element = pairTokens.nextToken();
+ String attribute = pairTokens.nextToken();
+ Object atts = config.get(element);
+ if (atts == null) {
+ atts = new HashSet();
+ config.put(element, atts);
+ }
+ ((Set) atts).add(attribute);
+ }
}
// constructs a ValidationMessage[] from a single String and no ID
+
static ValidationMessage[] vmFromString(String message) {
- return new ValidationMessage[] {
- new ValidationMessage(null, message)
- };
+ return new ValidationMessage[]{
+ new ValidationMessage(null, message)
+ };
}
// constructs a ValidationMessage[] from a ValidationMessage Vector
+
static ValidationMessage[] vmFromVector(Vector v) {
- ValidationMessage[] vm = new ValidationMessage[v.size()];
- for (int i = 0; i < vm.length; i++)
- vm[i] = (ValidationMessage) v.get(i);
- return vm;
+ ValidationMessage[] vm = new ValidationMessage[v.size()];
+ for (int i = 0; i < vm.length; i++) {
+ vm[i] = (ValidationMessage) v.get(i);
+ }
+ return vm;
}
}
Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlCoreTLV.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlCoreTLV.java?rev=1037279&r1=1037278&r2=1037279&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlCoreTLV.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlCoreTLV.java Sat Nov 20 17:57:45 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.tlv;
@@ -30,18 +30,18 @@ import org.xml.sax.helpers.DefaultHandle
/**
* <p>A SAX-based TagLibraryValidator for the core JSTL tag library.
* Currently implements the following checks:</p>
- *
+ * <p/>
* <ul>
- * <li>Expression syntax validation.
- * <li>Choose / when / otherwise constraints</li>
- * <li>Tag bodies that must either be empty or non-empty given
- * particular attributes. (E.g., <set> cannot have a body when
- * 'value' is specified; it *must* have a body otherwise.) For
- * these purposes, "having a body" refers to non-whitespace
- * content inside the tag.</li>
- * <li>Other minor constraints.</li>
+ * <li>Expression syntax validation.
+ * <li>Choose / when / otherwise constraints</li>
+ * <li>Tag bodies that must either be empty or non-empty given
+ * particular attributes. (E.g., <set> cannot have a body when
+ * 'value' is specified; it *must* have a body otherwise.) For
+ * these purposes, "having a body" refers to non-whitespace
+ * content inside the tag.</li>
+ * <li>Other minor constraints.</li>
* </ul>
- *
+ *
* @author Shawn Bayern
*/
public class JstlCoreTLV extends JstlBaseTLV {
@@ -92,10 +92,11 @@ public class JstlCoreTLV extends JstlBas
//*********************************************************************
// set its type and delegate validation to super-class
+
@Override
- public ValidationMessage[] validate(
- String prefix, String uri, PageData page) {
- return super.validate( TYPE_CORE, prefix, uri, page );
+ public ValidationMessage[] validate(
+ String prefix, String uri, PageData page) {
+ return super.validate(TYPE_CORE, prefix, uri, page);
}
@@ -104,229 +105,253 @@ public class JstlCoreTLV extends JstlBas
@Override
protected DefaultHandler getHandler() {
- return new Handler();
+ return new Handler();
}
//*********************************************************************
// SAX event handler
- /** The handler that provides the base of our implementation. */
+ /**
+ * The handler that provides the base of our implementation.
+ */
private class Handler extends DefaultHandler {
- // parser state
- private int depth = 0;
- private Stack chooseDepths = new Stack();
- private Stack chooseHasOtherwise = new Stack();
- private Stack chooseHasWhen = new Stack();
+ // parser state
+ private int depth = 0;
+ private Stack chooseDepths = new Stack();
+ private Stack chooseHasOtherwise = new Stack();
+ private Stack chooseHasWhen = new Stack();
private Stack urlTags = new Stack();
- private String lastElementName = null;
- private boolean bodyNecessary = false;
- private boolean bodyIllegal = false;
-
- // process under the existing context (state), then modify it
- @Override
- public void startElement(
- String ns, String ln, String qn, Attributes a) {
-
- // substitute our own parsed 'ln' if it's not provided
- if (ln == null)
- ln = getLocalPart(qn);
-
- // for simplicity, we can ignore <jsp:text> for our purposes
- // (don't bother distinguishing between it and its characters)
- if (isJspTag(ns, ln, TEXT))
- return;
-
- // check body-related constraint
- if (bodyIllegal)
- fail(Resources.getMessage("TLV_ILLEGAL_BODY", lastElementName));
-
- // validate expression syntax if we need to
- Set expAtts;
- if (qn.startsWith(prefix + ":")
- && (expAtts = (Set) config.get(ln)) != null) {
- for (int i = 0; i < a.getLength(); i++) {
- String attName = a.getLocalName(i);
- if (expAtts.contains(attName)) {
- String vMsg =
- validateExpression(
- ln,
- attName,
- a.getValue(i));
- if (vMsg != null)
- fail(vMsg);
- }
- }
- }
+ private String lastElementName = null;
+ private boolean bodyNecessary = false;
+ private boolean bodyIllegal = false;
+
+ // process under the existing context (state), then modify it
+
+ @Override
+ public void startElement(
+ String ns, String ln, String qn, Attributes a) {
+
+ // substitute our own parsed 'ln' if it's not provided
+ if (ln == null) {
+ ln = getLocalPart(qn);
+ }
+
+ // for simplicity, we can ignore <jsp:text> for our purposes
+ // (don't bother distinguishing between it and its characters)
+ if (isJspTag(ns, ln, TEXT)) {
+ return;
+ }
+
+ // check body-related constraint
+ if (bodyIllegal) {
+ fail(Resources.getMessage("TLV_ILLEGAL_BODY", lastElementName));
+ }
+
+ // validate expression syntax if we need to
+ Set expAtts;
+ if (qn.startsWith(prefix + ":")
+ && (expAtts = (Set) config.get(ln)) != null) {
+ for (int i = 0; i < a.getLength(); i++) {
+ String attName = a.getLocalName(i);
+ if (expAtts.contains(attName)) {
+ String vMsg =
+ validateExpression(
+ ln,
+ attName,
+ a.getValue(i));
+ if (vMsg != null) {
+ fail(vMsg);
+ }
+ }
+ }
+ }
// validate attributes
- if (qn.startsWith(prefix + ":") && !hasNoInvalidScope(a))
+ if (qn.startsWith(prefix + ":") && !hasNoInvalidScope(a)) {
fail(Resources.getMessage("TLV_INVALID_ATTRIBUTE",
- SCOPE, qn, a.getValue(SCOPE)));
- if (qn.startsWith(prefix + ":") && hasEmptyVar(a))
- fail(Resources.getMessage("TLV_EMPTY_VAR", qn));
- if (qn.startsWith(prefix + ":") && hasDanglingScope(a))
- fail(Resources.getMessage("TLV_DANGLING_SCOPE", qn));
-
- // check invariants for <choose>
- if (chooseChild()) {
- // mark <choose> for the first the first <when>
- if (isCoreTag(ns, ln, WHEN)) {
- chooseHasWhen.pop();
- chooseHasWhen.push(Boolean.TRUE);
- }
-
- // ensure <choose> has the right children
- if(!isCoreTag(ns, ln, WHEN) && !isCoreTag(ns, ln, OTHERWISE)) {
- fail(Resources.getMessage("TLV_ILLEGAL_CHILD_TAG",
- prefix, CHOOSE, qn));
- }
-
- // make sure <otherwise> is the last tag
- if (((Boolean) chooseHasOtherwise.peek()).booleanValue()) {
- fail(Resources.getMessage("TLV_ILLEGAL_ORDER",
- qn, prefix, OTHERWISE, CHOOSE));
- }
- if (isCoreTag(ns, ln, OTHERWISE)) {
- chooseHasOtherwise.pop();
- chooseHasOtherwise.push(Boolean.TRUE);
- }
-
- }
-
- // check constraints for <param> vis-a-vis URL-related tags
- if (isCoreTag(ns, ln, PARAM)) {
- // no <param> outside URL tags.
- if (urlTags.empty() || urlTags.peek().equals(PARAM))
- fail(Resources.getMessage("TLV_ILLEGAL_ORPHAN", PARAM));
-
- // no <param> where the most recent <import> has a reader
- if (!urlTags.empty() &&
- urlTags.peek().equals(IMPORT_WITH_READER))
- fail(Resources.getMessage("TLV_ILLEGAL_PARAM",
- prefix, PARAM, IMPORT, VAR_READER));
- } else {
- // tag ISN'T <param>, so it's illegal under non-reader <import>
- if (!urlTags.empty()
- && urlTags.peek().equals(IMPORT_WITHOUT_READER))
- fail(Resources.getMessage("TLV_ILLEGAL_CHILD_TAG",
- prefix, IMPORT, qn));
- }
-
- // now, modify state
-
- // we're a choose, so record new choose-specific state
- if (isCoreTag(ns, ln, CHOOSE)) {
- chooseDepths.push(new Integer(depth));
- chooseHasWhen.push(Boolean.FALSE);
- chooseHasOtherwise.push(Boolean.FALSE);
- }
-
- // if we're introducing a URL-related tag, record it
- if (isCoreTag(ns, ln, IMPORT)) {
- if (hasAttribute(a, VAR_READER))
- urlTags.push(IMPORT_WITH_READER);
- else
- urlTags.push(IMPORT_WITHOUT_READER);
- } else if (isCoreTag(ns, ln, PARAM))
- urlTags.push(PARAM);
- else if (isCoreTag(ns, ln, REDIRECT))
- urlTags.push(REDIRECT);
- else if (isCoreTag(ns, ln, URL))
- urlTags.push(URL);
-
- // set up a check against illegal attribute/body combinations
- bodyIllegal = false;
- bodyNecessary = false;
- if (isCoreTag(ns, ln, EXPR)) {
- if (hasAttribute(a, DEFAULT))
- bodyIllegal = true;
- } else if (isCoreTag(ns, ln, SET)) {
- if (hasAttribute(a, VALUE))
- bodyIllegal = true;
- // else
- // bodyNecessary = true;
- }
-
- // record the most recent tag (for error reporting)
- lastElementName = qn;
- lastElementId = a.getValue(JSP, "id");
-
- // we're a new element, so increase depth
- depth++;
- }
-
- @Override
- public void characters(char[] ch, int start, int length) {
-
- bodyNecessary = false; // body is no longer necessary!
-
- // ignore strings that are just whitespace
- String s = new String(ch, start, length).trim();
- if (s.equals(""))
- return;
-
- // check and update body-related constraints
- if (bodyIllegal)
- fail(Resources.getMessage("TLV_ILLEGAL_BODY", lastElementName));
- if (!urlTags.empty()
- && urlTags.peek().equals(IMPORT_WITHOUT_READER)) {
- // we're in an <import> without a Reader; nothing but
- // <param> is allowed
- fail(Resources.getMessage("TLV_ILLEGAL_BODY",
- prefix + ":" + IMPORT));
- }
-
- // make sure <choose> has no non-whitespace text
- if (chooseChild()) {
- String msg =
- Resources.getMessage("TLV_ILLEGAL_TEXT_BODY",
- prefix, CHOOSE,
- (s.length() < 7 ? s : s.substring(0,7)));
- fail(msg);
- }
- }
-
- @Override
- public void endElement(String ns, String ln, String qn) {
-
- // consistently, we ignore JSP_TEXT
- if (isJspTag(ns, ln, TEXT))
- return;
-
- // handle body-related invariant
- if (bodyNecessary)
- fail(Resources.getMessage("TLV_MISSING_BODY",
- lastElementName));
- bodyIllegal = false; // reset: we've left the tag
-
- // update <choose>-related state
- if (isCoreTag(ns, ln, CHOOSE)) {
- Boolean b = (Boolean) chooseHasWhen.pop();
- if (!b.booleanValue())
- fail(Resources.getMessage("TLV_PARENT_WITHOUT_SUBTAG",
- CHOOSE, WHEN));
- chooseDepths.pop();
- chooseHasOtherwise.pop();
- }
+ SCOPE, qn, a.getValue(SCOPE)));
+ }
+ if (qn.startsWith(prefix + ":") && hasEmptyVar(a)) {
+ fail(Resources.getMessage("TLV_EMPTY_VAR", qn));
+ }
+ if (qn.startsWith(prefix + ":") && hasDanglingScope(a)) {
+ fail(Resources.getMessage("TLV_DANGLING_SCOPE", qn));
+ }
+
+ // check invariants for <choose>
+ if (chooseChild()) {
+ // mark <choose> for the first the first <when>
+ if (isCoreTag(ns, ln, WHEN)) {
+ chooseHasWhen.pop();
+ chooseHasWhen.push(Boolean.TRUE);
+ }
+
+ // ensure <choose> has the right children
+ if (!isCoreTag(ns, ln, WHEN) && !isCoreTag(ns, ln, OTHERWISE)) {
+ fail(Resources.getMessage("TLV_ILLEGAL_CHILD_TAG",
+ prefix, CHOOSE, qn));
+ }
+
+ // make sure <otherwise> is the last tag
+ if (((Boolean) chooseHasOtherwise.peek()).booleanValue()) {
+ fail(Resources.getMessage("TLV_ILLEGAL_ORDER",
+ qn, prefix, OTHERWISE, CHOOSE));
+ }
+ if (isCoreTag(ns, ln, OTHERWISE)) {
+ chooseHasOtherwise.pop();
+ chooseHasOtherwise.push(Boolean.TRUE);
+ }
+
+ }
+
+ // check constraints for <param> vis-a-vis URL-related tags
+ if (isCoreTag(ns, ln, PARAM)) {
+ // no <param> outside URL tags.
+ if (urlTags.empty() || urlTags.peek().equals(PARAM)) {
+ fail(Resources.getMessage("TLV_ILLEGAL_ORPHAN", PARAM));
+ }
+
+ // no <param> where the most recent <import> has a reader
+ if (!urlTags.empty() &&
+ urlTags.peek().equals(IMPORT_WITH_READER)) {
+ fail(Resources.getMessage("TLV_ILLEGAL_PARAM",
+ prefix, PARAM, IMPORT, VAR_READER));
+ }
+ } else {
+ // tag ISN'T <param>, so it's illegal under non-reader <import>
+ if (!urlTags.empty()
+ && urlTags.peek().equals(IMPORT_WITHOUT_READER)) {
+ fail(Resources.getMessage("TLV_ILLEGAL_CHILD_TAG",
+ prefix, IMPORT, qn));
+ }
+ }
+
+ // now, modify state
+
+ // we're a choose, so record new choose-specific state
+ if (isCoreTag(ns, ln, CHOOSE)) {
+ chooseDepths.push(new Integer(depth));
+ chooseHasWhen.push(Boolean.FALSE);
+ chooseHasOtherwise.push(Boolean.FALSE);
+ }
+
+ // if we're introducing a URL-related tag, record it
+ if (isCoreTag(ns, ln, IMPORT)) {
+ if (hasAttribute(a, VAR_READER)) {
+ urlTags.push(IMPORT_WITH_READER);
+ } else {
+ urlTags.push(IMPORT_WITHOUT_READER);
+ }
+ } else if (isCoreTag(ns, ln, PARAM)) {
+ urlTags.push(PARAM);
+ } else if (isCoreTag(ns, ln, REDIRECT)) {
+ urlTags.push(REDIRECT);
+ } else if (isCoreTag(ns, ln, URL)) {
+ urlTags.push(URL);
+ }
+
+ // set up a check against illegal attribute/body combinations
+ bodyIllegal = false;
+ bodyNecessary = false;
+ if (isCoreTag(ns, ln, EXPR)) {
+ if (hasAttribute(a, DEFAULT)) {
+ bodyIllegal = true;
+ }
+ } else if (isCoreTag(ns, ln, SET)) {
+ if (hasAttribute(a, VALUE)) {
+ bodyIllegal = true;
+ }
+ // else
+ // bodyNecessary = true;
+ }
+
+ // record the most recent tag (for error reporting)
+ lastElementName = qn;
+ lastElementId = a.getValue(JSP, "id");
+
+ // we're a new element, so increase depth
+ depth++;
+ }
+
+ @Override
+ public void characters(char[] ch, int start, int length) {
+
+ bodyNecessary = false; // body is no longer necessary!
+
+ // ignore strings that are just whitespace
+ String s = new String(ch, start, length).trim();
+ if (s.equals("")) {
+ return;
+ }
+
+ // check and update body-related constraints
+ if (bodyIllegal) {
+ fail(Resources.getMessage("TLV_ILLEGAL_BODY", lastElementName));
+ }
+ if (!urlTags.empty()
+ && urlTags.peek().equals(IMPORT_WITHOUT_READER)) {
+ // we're in an <import> without a Reader; nothing but
+ // <param> is allowed
+ fail(Resources.getMessage("TLV_ILLEGAL_BODY",
+ prefix + ":" + IMPORT));
+ }
+
+ // make sure <choose> has no non-whitespace text
+ if (chooseChild()) {
+ String msg =
+ Resources.getMessage("TLV_ILLEGAL_TEXT_BODY",
+ prefix, CHOOSE,
+ (s.length() < 7 ? s : s.substring(0, 7)));
+ fail(msg);
+ }
+ }
+
+ @Override
+ public void endElement(String ns, String ln, String qn) {
+
+ // consistently, we ignore JSP_TEXT
+ if (isJspTag(ns, ln, TEXT)) {
+ return;
+ }
+
+ // handle body-related invariant
+ if (bodyNecessary) {
+ fail(Resources.getMessage("TLV_MISSING_BODY",
+ lastElementName));
+ }
+ bodyIllegal = false; // reset: we've left the tag
+
+ // update <choose>-related state
+ if (isCoreTag(ns, ln, CHOOSE)) {
+ Boolean b = (Boolean) chooseHasWhen.pop();
+ if (!b.booleanValue()) {
+ fail(Resources.getMessage("TLV_PARENT_WITHOUT_SUBTAG",
+ CHOOSE, WHEN));
+ }
+ chooseDepths.pop();
+ chooseHasOtherwise.pop();
+ }
- // update state related to URL tags
- if (isCoreTag(ns, ln, IMPORT)
+ // update state related to URL tags
+ if (isCoreTag(ns, ln, IMPORT)
|| isCoreTag(ns, ln, PARAM)
- || isCoreTag(ns, ln, REDIRECT)
- || isCoreTag(ns, ln, URL))
- urlTags.pop();
-
- // update our depth
- depth--;
- }
-
- // are we directly under a <choose>?
- private boolean chooseChild() {
- return (!chooseDepths.empty()
- && (depth - 1) == ((Integer) chooseDepths.peek()).intValue());
- }
+ || isCoreTag(ns, ln, REDIRECT)
+ || isCoreTag(ns, ln, URL)) {
+ urlTags.pop();
+ }
+
+ // update our depth
+ depth--;
+ }
+
+ // are we directly under a <choose>?
+
+ private boolean chooseChild() {
+ return (!chooseDepths.empty()
+ && (depth - 1) == ((Integer) chooseDepths.peek()).intValue());
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org