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/14 07:16:53 UTC
cvs commit: jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/rt/fmt SetLocaleTag.java
luehe 02/04/13 22:16:53
Modified: standard/src/org/apache/taglibs/standard/tag/common/fmt
SetLocaleSupport.java
standard/src/org/apache/taglibs/standard/tag/el/fmt
SetLocaleTag.java
standard/src/org/apache/taglibs/standard/tag/rt/fmt
SetLocaleTag.java
Log:
<fmt:setLocale> now supports 'value' of type java.util.Locale (in addition to String)
Revision Changes Path
1.2 +11 -3 jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/fmt/SetLocaleSupport.java
Index: SetLocaleSupport.java
===================================================================
RCS file: /home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/fmt/SetLocaleSupport.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SetLocaleSupport.java 12 Apr 2002 19:16:49 -0000 1.1
+++ SetLocaleSupport.java 14 Apr 2002 05:16:53 -0000 1.2
@@ -83,7 +83,7 @@
//*********************************************************************
// Protected state
- protected String value; // 'value' attribute
+ protected Object value; // 'value' attribute
protected String variant; // 'variant' attribute
@@ -120,11 +120,19 @@
public int doEndTag() throws JspException {
Locale locale = null;
- if ((value == null) || "".equals(value)) {
+
+ if (value == null) {
locale = Locale.getDefault();
+ } else if (value instanceof String) {
+ if (((String) value).trim().equals("")) {
+ locale = Locale.getDefault();
+ } else {
+ locale = parseLocale((String) value, variant);
+ }
} else {
- locale = parseLocale(value, variant);
+ locale = (Locale) value;
}
+
Config.set(pageContext, Config.FMT_LOCALE, locale,
Util.getScope(scope));
setResponseLocale(pageContext, locale);
1.2 +3 -9 jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/el/fmt/SetLocaleTag.java
Index: SetLocaleTag.java
===================================================================
RCS file: /home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/el/fmt/SetLocaleTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SetLocaleTag.java 12 Apr 2002 19:16:50 -0000 1.1
+++ SetLocaleTag.java 14 Apr 2002 05:16:53 -0000 1.2
@@ -136,18 +136,12 @@
// Evaluates expressions as necessary
private void evaluateExpressions() throws JspException {
- /*
- * Note: we don't check for type mismatches here; we assume
- * the expression evaluator will return the expected type
- * (by virtue of knowledge we give it about what that type is).
- * A ClassCastException here is truly unexpected, so we let it
- * propagate up.
- */
// 'value' attribute (mandatory)
- value = (String) ExpressionEvaluatorManager.evaluate(
- "value", value_, String.class, this, pageContext);
+ value = ExpressionEvaluatorManager.evaluate(
+ "value", value_, Object.class, this, pageContext);
+ // 'variant' attribute (optional)
if (variant_ != null) {
variant = (String) ExpressionEvaluatorManager.evaluate(
"variant", variant_, String.class, this, pageContext);
1.2 +1 -1 jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/rt/fmt/SetLocaleTag.java
Index: SetLocaleTag.java
===================================================================
RCS file: /home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/rt/fmt/SetLocaleTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SetLocaleTag.java 12 Apr 2002 19:16:50 -0000 1.1
+++ SetLocaleTag.java 14 Apr 2002 05:16:53 -0000 1.2
@@ -73,7 +73,7 @@
// Accessor methods
// for tag attribute
- public void setValue(String value) throws JspTagException {
+ public void setValue(Object value) throws JspTagException {
this.value = value;
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>