You are viewing a plain text version of this content. The canonical link for it is here.
Posted to taglibs-dev@jakarta.apache.org by lu...@apache.org on 2002/04/04 01:18:04 UTC
cvs commit: jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/rt/fmt ParseDateTag.java ParseNumberTag.java
luehe 02/04/03 15:18:04
Modified: standard/src/org/apache/taglibs/standard/tag/el/fmt
ParseDateTag.java ParseNumberTag.java
standard/src/org/apache/taglibs/standard/tag/rt/fmt
ParseDateTag.java ParseNumberTag.java
Log:
The 'parseLocale' attribute in the <fmt:parseXXX> actions now supports java.util.Locale in addition to String
Revision Changes Path
1.9 +11 -5 jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/el/fmt/ParseDateTag.java
Index: ParseDateTag.java
===================================================================
RCS file: /home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/el/fmt/ParseDateTag.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ParseDateTag.java 28 Mar 2002 01:24:07 -0000 1.8
+++ ParseDateTag.java 3 Apr 2002 23:18:03 -0000 1.9
@@ -214,11 +214,17 @@
// 'parseLocale' attribute
if (parseLocale_ != null) {
- String pl = (String) ExpressionUtil.evalNotNull(
- "parseDate", "parseLocale", parseLocale_, String.class, this,
- pageContext);
- if ((pl != null) && !"".equals(pl)) {
- parseLocale = LocaleSupport.parseLocale(pl);
+ Object obj = ExpressionEvaluatorManager.evaluate(
+ "parseLocale", parseLocale_, Object.class, this, pageContext);
+ if (obj != null) {
+ if (obj instanceof Locale) {
+ parseLocale = (Locale) obj;
+ } else {
+ String localeStr = (String) obj;
+ if (!"".equals(localeStr)) {
+ parseLocale = LocaleSupport.parseLocale(localeStr);
+ }
+ }
}
}
}
1.7 +11 -5 jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/el/fmt/ParseNumberTag.java
Index: ParseNumberTag.java
===================================================================
RCS file: /home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/el/fmt/ParseNumberTag.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ParseNumberTag.java 28 Mar 2002 01:24:07 -0000 1.6
+++ ParseNumberTag.java 3 Apr 2002 23:18:03 -0000 1.7
@@ -186,11 +186,17 @@
// 'parseLocale' attribute
if (parseLocale_ != null) {
- obj = ExpressionUtil.evalNotNull(
- "parseNumber", "parseLocale", parseLocale_, String.class, this,
- pageContext);
- if ((obj != null) && !"".equals((String) obj)) {
- parseLocale = LocaleSupport.parseLocale((String) obj);
+ obj = ExpressionEvaluatorManager.evaluate(
+ "parseLocale", parseLocale_, Object.class, this, pageContext);
+ if (obj != null) {
+ if (obj instanceof Locale) {
+ parseLocale = (Locale) obj;
+ } else {
+ String localeStr = (String) obj;
+ if (!"".equals(localeStr)) {
+ parseLocale = LocaleSupport.parseLocale(localeStr);
+ }
+ }
}
}
1.8 +9 -3 jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/rt/fmt/ParseDateTag.java
Index: ParseDateTag.java
===================================================================
RCS file: /home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/rt/fmt/ParseDateTag.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ParseDateTag.java 28 Mar 2002 01:24:07 -0000 1.7
+++ ParseDateTag.java 3 Apr 2002 23:18:04 -0000 1.8
@@ -103,9 +103,15 @@
}
// 'parseLocale' attribute
- public void setParseLocale(String parseLocale) throws JspTagException {
- if (! "".equals(parseLocale)) {
- this.parseLocale = LocaleSupport.parseLocale(parseLocale);
+ 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 = LocaleSupport.parseLocale((String) loc);
+ }
+ }
}
}
}
1.6 +7 -3 jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/rt/fmt/ParseNumberTag.java
Index: ParseNumberTag.java
===================================================================
RCS file: /home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/rt/fmt/ParseNumberTag.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ParseNumberTag.java 28 Mar 2002 01:24:07 -0000 1.5
+++ ParseNumberTag.java 3 Apr 2002 23:18:04 -0000 1.6
@@ -88,9 +88,13 @@
}
// 'parseLocale' attribute
- public void setParseLocale(String parseLocale) throws JspTagException {
- if (! "".equals(parseLocale)) {
- this.parseLocale = LocaleSupport.parseLocale(parseLocale);
+ public void setParseLocale(Object loc) throws JspTagException {
+ if (loc instanceof Locale) {
+ this.parseLocale = (Locale) loc;
+ } else {
+ if (!"".equals((String) loc)) {
+ this.parseLocale = LocaleSupport.parseLocale((String) loc);
+ }
}
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>