dgraham 2003/07/26 12:11:57
Modified: src/share/org/apache/struts/taglib/html ImageTag.java
BaseHandlerTag.java ImgTag.java OptionTag.java
MessagesTag.java
src/share/org/apache/struts/taglib/bean WriteTag.java
Log:
Use TagUtils.message() instead of RequestUtils.
Revision Changes Path
1.26 +28 -13
jakarta-struts/src/share/org/apache/struts/taglib/html/ImageTag.java
Index: ImageTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/ImageTag.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ImageTag.java 16 Nov 2002 06:05:21 -0000 1.25
+++ ImageTag.java 26 Jul 2003 19:11:57 -0000 1.26
@@ -66,10 +66,12 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.jsp.JspException;
+
+import org.apache.struts.Globals;
import org.apache.struts.config.ModuleConfig;
+import org.apache.struts.taglib.TagUtils;
import org.apache.struts.util.RequestUtils;
import org.apache.struts.util.ResponseUtils;
-import org.apache.struts.Globals;
/**
@@ -333,13 +335,22 @@
HttpServletRequest request =
(HttpServletRequest) pageContext.getRequest();
if (config == null) {
- return (request.getContextPath() +
- RequestUtils.message(pageContext, getBundle(),
- getLocale(), this.pageKey));
+ return (
+ request.getContextPath()
+ + TagUtils.getInstance().message(
+ pageContext,
+ getBundle(),
+ getLocale(),
+ this.pageKey));
} else {
- return (request.getContextPath() + config.getPrefix() +
- RequestUtils.message(pageContext, getBundle(),
- getLocale(), this.pageKey));
+ return (
+ request.getContextPath()
+ + config.getPrefix()
+ + TagUtils.getInstance().message(
+ pageContext,
+ getBundle(),
+ getLocale(),
+ this.pageKey));
}
}
@@ -361,8 +372,12 @@
RequestUtils.saveException(pageContext, e);
throw e;
}
- return (RequestUtils.message(pageContext, getBundle(),
- getLocale(), this.srcKey));
+
+ return TagUtils.getInstance().message(
+ pageContext,
+ getBundle(),
+ getLocale(),
+ this.srcKey);
}
1.31 +5 -5
jakarta-struts/src/share/org/apache/struts/taglib/html/BaseHandlerTag.java
Index: BaseHandlerTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/BaseHandlerTag.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- BaseHandlerTag.java 26 Jul 2003 18:51:34 -0000 1.30
+++ BaseHandlerTag.java 26 Jul 2003 19:11:57 -0000 1.31
@@ -574,7 +574,7 @@
}
} else {
if (key != null) {
- return RequestUtils.message(
+ return TagUtils.getInstance().message(
pageContext,
getBundle(),
getLocale(),
1.29 +20 -7
jakarta-struts/src/share/org/apache/struts/taglib/html/ImgTag.java
Index: ImgTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/ImgTag.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ImgTag.java 26 Jul 2003 17:22:27 -0000 1.28
+++ ImgTag.java 26 Jul 2003 19:11:57 -0000 1.29
@@ -548,12 +548,20 @@
if (config == null) {
return (
request.getContextPath()
- + RequestUtils.message(pageContext, getBundle(),
getLocale(), this.pageKey));
+ + TagUtils.getInstance().message(
+ pageContext,
+ getBundle(),
+ getLocale(),
+ this.pageKey));
} else {
return (
request.getContextPath()
+ config.getPrefix()
- + RequestUtils.message(pageContext, getBundle(),
getLocale(), this.pageKey));
+ + TagUtils.getInstance().message(
+ pageContext,
+ getBundle(),
+ getLocale(),
+ this.pageKey));
}
}
@@ -573,7 +581,12 @@
RequestUtils.saveException(pageContext, e);
throw e;
}
- return (RequestUtils.message(pageContext, getBundle(), getLocale(),
this.srcKey));
+
+ return TagUtils.getInstance().message(
+ pageContext,
+ getBundle(),
+ getLocale(),
+ this.srcKey);
}
1.20 +7 -5
jakarta-struts/src/share/org/apache/struts/taglib/html/OptionTag.java
Index: OptionTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/OptionTag.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- OptionTag.java 21 Jun 2003 03:12:48 -0000 1.19
+++ OptionTag.java 26 Jul 2003 19:11:57 -0000 1.20
@@ -67,6 +67,7 @@
import javax.servlet.jsp.tagext.BodyTagSupport;
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;
@@ -357,7 +358,8 @@
String optionText = this.text;
if ((optionText == null) && (this.key != null)) {
- optionText = RequestUtils.message(pageContext, bundle, locale, key);
+ optionText =
+ TagUtils.getInstance().message(pageContext, bundle, locale, key);
}
// no body text and no key to lookup so display the value
1.17 +21 -15
jakarta-struts/src/share/org/apache/struts/taglib/html/MessagesTag.java
Index: MessagesTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/MessagesTag.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- MessagesTag.java 20 Jun 2003 03:25:59 -0000 1.16
+++ MessagesTag.java 26 Jul 2003 19:11:57 -0000 1.17
@@ -70,6 +70,7 @@
import org.apache.struts.Globals;
import org.apache.struts.action.ActionMessage;
import org.apache.struts.action.ActionMessages;
+import org.apache.struts.taglib.TagUtils;
import org.apache.struts.util.MessageResources;
import org.apache.struts.util.RequestUtils;
import org.apache.struts.util.ResponseUtils;
@@ -252,7 +253,7 @@
ActionMessage report = (ActionMessage) this.iterator.next();
String msg =
- RequestUtils.message(
+ TagUtils.getInstance().message(
pageContext,
bundle,
locale,
@@ -275,7 +276,7 @@
if (header != null && header.length() > 0) {
String headerMessage =
- RequestUtils.message(pageContext, bundle, locale, header);
+ TagUtils.getInstance().message(pageContext, bundle, locale, header);
if (headerMessage != null) {
ResponseUtils.write(pageContext, headerMessage);
@@ -304,10 +305,14 @@
// Decide whether to iterate or quit
if (iterator.hasNext()) {
- ActionMessage report = (ActionMessage)iterator.next();
- String msg = RequestUtils.message(pageContext, bundle,
- locale, report.getKey(),
- report.getValues());
+ ActionMessage report = (ActionMessage) iterator.next();
+ String msg =
+ TagUtils.getInstance().message(
+ pageContext,
+ bundle,
+ locale,
+ report.getKey(),
+ report.getValues());
pageContext.setAttribute(id, msg);
@@ -326,15 +331,16 @@
*/
public int doEndTag() throws JspException {
if (processed && footer != null && footer.length() > 0) {
- String footerMessage = RequestUtils.message(pageContext, bundle,
- locale, footer);
+
+ String footerMessage =
+ TagUtils.getInstance().message(pageContext, bundle, locale, footer);
+
if (footerMessage != null) {
- // Print the results to our output writer
ResponseUtils.write(pageContext, footerMessage);
}
}
- // Continue processing this page
- return (EVAL_PAGE);
+
+ return EVAL_PAGE;
}
1.26 +5 -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.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- WriteTag.java 26 Jul 2003 17:22:27 -0000 1.25
+++ WriteTag.java 26 Jul 2003 19:11:57 -0000 1.26
@@ -298,7 +298,7 @@
*/
protected String retrieveFormatString(String formatKey) throws JspException {
String result =
- RequestUtils.message(
+ TagUtils.getInstance().message(
pageContext,
this.bundle,
this.localeKey,
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
