dgraham 2003/07/25 18:17:56
Modified: src/share/org/apache/struts/taglib/html
JavascriptValidatorTag.java HtmlTag.java
src/share/org/apache/struts/util RequestUtils.java
src/share/org/apache/struts/taglib/bean WriteTag.java
src/share/org/apache/struts/taglib TagUtils.java
Log:
Moved RequestUtils.retrieveUserLocale() to TagUtils.getUserLocale().
Revision Changes Path
1.33 +6 -5
jakarta-struts/src/share/org/apache/struts/taglib/html/JavascriptValidatorTag.java
Index: JavascriptValidatorTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/JavascriptValidatorTag.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- JavascriptValidatorTag.java 25 Jul 2003 23:46:27 -0000 1.32
+++ JavascriptValidatorTag.java 26 Jul 2003 01:17:55 -0000 1.33
@@ -82,6 +82,7 @@
import org.apache.commons.validator.Var;
import org.apache.struts.Globals;
import org.apache.struts.config.ModuleConfig;
+import org.apache.struts.taglib.TagUtils;
import org.apache.struts.util.MessageResources;
import org.apache.struts.util.RequestUtils;
import org.apache.struts.validator.Resources;
@@ -366,7 +367,7 @@
ValidatorPlugIn.VALIDATOR_KEY + config.getPrefix(),
PageContext.APPLICATION_SCOPE);
- Locale locale = RequestUtils.retrieveUserLocale(this.pageContext, null);
+ Locale locale = TagUtils.getInstance().getUserLocale(this.pageContext,
null);
Form form = resources.get(locale, formName);
if (form != null) {
1.16 +7 -7
jakarta-struts/src/share/org/apache/struts/taglib/html/HtmlTag.java
Index: HtmlTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/HtmlTag.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- HtmlTag.java 12 Jul 2003 00:35:08 -0000 1.15
+++ HtmlTag.java 26 Jul 2003 01:17:55 -0000 1.16
@@ -70,8 +70,8 @@
import javax.servlet.jsp.tagext.TagSupport;
import org.apache.struts.Globals;
+import org.apache.struts.taglib.TagUtils;
import org.apache.struts.util.MessageResources;
-import org.apache.struts.util.RequestUtils;
import org.apache.struts.util.ResponseUtils;
/**
@@ -177,7 +177,7 @@
language = this.getCurrentLocale().getLanguage();
} else {
Locale currentLocale =
- RequestUtils.retrieveUserLocale(pageContext, Globals.LOCALE_KEY);
+ TagUtils.getInstance().getUserLocale(pageContext,
Globals.LOCALE_KEY);
language = currentLocale.getLanguage();
country = currentLocale.getCountry();
@@ -258,7 +258,7 @@
*/
protected Locale getCurrentLocale() {
- Locale userLocale = RequestUtils.retrieveUserLocale(pageContext,
Globals.LOCALE_KEY);
+ Locale userLocale = TagUtils.getInstance().getUserLocale(pageContext,
Globals.LOCALE_KEY);
// Store a new current Locale, if requested
if (this.locale) {
1.117 +7 -5
jakarta-struts/src/share/org/apache/struts/util/RequestUtils.java
Index: RequestUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/RequestUtils.java,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- RequestUtils.java 26 Jul 2003 01:11:43 -0000 1.116
+++ RequestUtils.java 26 Jul 2003 01:17:55 -0000 1.117
@@ -949,9 +949,11 @@
* @param locale Name of the session attribute for our user's Locale. If this
is
* <code>null</code>, the default locale key is used for the lookup.
* @return current user locale
+ * @deprecated Use TagUtils.getUserLocale() instead. This will be removed
+ * after Struts 1.2.
*/
public static Locale retrieveUserLocale(PageContext pageContext, String locale)
{
- return getUserLocale((HttpServletRequest) pageContext.getRequest(), locale);
+ return TagUtils.getInstance().getUserLocale(pageContext, locale);
}
/**
1.24 +6 -5
jakarta-struts/src/share/org/apache/struts/taglib/bean/WriteTag.java
Index: WriteTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/bean/WriteTag.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- WriteTag.java 16 Jul 2003 05:13:10 -0000 1.23
+++ WriteTag.java 26 Jul 2003 01:17:55 -0000 1.24
@@ -72,6 +72,7 @@
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.TagSupport;
+import org.apache.struts.taglib.TagUtils;
import org.apache.struts.util.MessageResources;
import org.apache.struts.util.RequestUtils;
import org.apache.struts.util.ResponseUtils;
@@ -324,7 +325,7 @@
protected String formatValue(Object valueToFormat) throws JspException {
Format format = null;
Object value = valueToFormat;
- Locale locale = RequestUtils.retrieveUserLocale(pageContext,
this.localeKey);
+ Locale locale = TagUtils.getInstance().getUserLocale(pageContext,
this.localeKey);
boolean formatStrFromResources = false;
String formatString = formatStr;
1.4 +21 -4 jakarta-struts/src/share/org/apache/struts/taglib/TagUtils.java
Index: TagUtils.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/TagUtils.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TagUtils.java 26 Jul 2003 01:11:43 -0000 1.3
+++ TagUtils.java 26 Jul 2003 01:17:55 -0000 1.4
@@ -62,8 +62,10 @@
package org.apache.struts.taglib;
import java.util.HashMap;
+import java.util.Locale;
import java.util.Map;
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.PageContext;
@@ -72,6 +74,7 @@
import org.apache.struts.action.ActionError;
import org.apache.struts.action.ActionErrors;
import org.apache.struts.util.MessageResources;
+import org.apache.struts.util.RequestUtils;
/**
* Provides helper methods for JSP tags.
@@ -197,6 +200,20 @@
}
return scope.intValue();
+ }
+
+ /**
+ * Look up and return current user locale, based on the specified parameters.
+ *
+ * @param pageContext The PageContext associated with this request
+ * @param locale Name of the session attribute for our user's Locale. If this
is
+ * <code>null</code>, the default locale key is used for the lookup.
+ * @return current user locale
+ */
+ public Locale getUserLocale(PageContext pageContext, String locale) {
+ return RequestUtils.getUserLocale(
+ (HttpServletRequest) pageContext.getRequest(),
+ locale);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
