Author: jboynes
Date: Sun Feb 3 00:56:19 2013
New Revision: 1441847
URL: http://svn.apache.org/viewvc?rev=1441847&view=rev
Log:
rename method to make purpose clearer
Modified:
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/LocaleUtil.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/ParseDateTag.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/ParseNumberTag.java
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/fmt/ParseDateTag.java
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/fmt/ParseNumberTag.java
Modified:
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/LocaleUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/LocaleUtil.java?rev=1441847&r1=1441846&r2=1441847&view=diff
==============================================================================
---
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/LocaleUtil.java
(original)
+++
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/LocaleUtil.java
Sun Feb 3 00:56:19 2013
@@ -43,7 +43,7 @@ public class LocaleUtil {
* @param stringOrLocale locale represented as an instance of Locale or as
a String
* @return the locale represented by the parameter, or null if the
parameter is undefined
*/
- public static Locale parseLocale(Object stringOrLocale) {
+ public static Locale parseLocaleAttributeValue(Object stringOrLocale) {
if (stringOrLocale instanceof Locale) {
return (Locale) stringOrLocale;
} else if (stringOrLocale instanceof String) {
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=1441847&r1=1441846&r2=1441847&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
Sun Feb 3 00:56:19 2013
@@ -76,7 +76,7 @@ public class ParseDateTag extends ParseD
// 'parseLocale' attribute
public void setParseLocale(Object loc) throws JspTagException {
- Locale locale = LocaleUtil.parseLocale(loc);
+ Locale locale = LocaleUtil.parseLocaleAttributeValue(loc);
if (loc != null) {
this.parseLocale = locale;
}
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=1441847&r1=1441846&r2=1441847&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
Sun Feb 3 00:56:19 2013
@@ -58,7 +58,7 @@ public class ParseNumberTag extends Pars
// 'parseLocale' attribute
public void setParseLocale(Object loc) throws JspTagException {
- Locale locale = LocaleUtil.parseLocale(loc);
+ Locale locale = LocaleUtil.parseLocaleAttributeValue(loc);
if (loc != null) {
this.parseLocale = locale;
}
Modified:
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/fmt/ParseDateTag.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/fmt/ParseDateTag.java?rev=1441847&r1=1441846&r2=1441847&view=diff
==============================================================================
---
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/fmt/ParseDateTag.java
(original)
+++
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/fmt/ParseDateTag.java
Sun Feb 3 00:56:19 2013
@@ -191,7 +191,7 @@ public class ParseDateTag extends ParseD
if (parseLocale_ != null) {
Object obj = ExpressionEvaluatorManager.evaluate(
"parseLocale", parseLocale_, Object.class, this,
pageContext);
- Locale locale = LocaleUtil.parseLocale(obj);
+ Locale locale = LocaleUtil.parseLocaleAttributeValue(obj);
if (locale != null) {
this.parseLocale = locale;
}
Modified:
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/fmt/ParseNumberTag.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/fmt/ParseNumberTag.java?rev=1441847&r1=1441846&r2=1441847&view=diff
==============================================================================
---
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/fmt/ParseNumberTag.java
(original)
+++
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/fmt/ParseNumberTag.java
Sun Feb 3 00:56:19 2013
@@ -161,7 +161,7 @@ public class ParseNumberTag extends Pars
if (parseLocale_ != null) {
obj = ExpressionEvaluatorManager.evaluate(
"parseLocale", parseLocale_, Object.class, this,
pageContext);
- Locale locale = LocaleUtil.parseLocale(obj);
+ Locale locale = LocaleUtil.parseLocaleAttributeValue(obj);
if (locale != null) {
this.parseLocale = locale;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
