rleland 2003/07/26 23:54:28
Modified: src/share/org/apache/struts/taglib/bean IncludeTag.java
MessageTag.java PageTag.java ParameterTag.java
ResourceTag.java SizeTag.java StrutsTag.java
WriteTag.java
Log:
Update tags to use TagUtils. methods..
Revision Changes Path
1.22 +1 -1
jakarta-struts/src/share/org/apache/struts/taglib/bean/IncludeTag.java
Index: IncludeTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/bean/IncludeTag.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- IncludeTag.java 27 Jul 2003 06:30:09 -0000 1.21
+++ IncludeTag.java 27 Jul 2003 06:54:28 -0000 1.22
@@ -220,7 +220,7 @@
URL url = null;
try {
urlString =
- RequestUtils.computeURL(pageContext, forward, href, page, params,
anchor, false);
+ TagUtils.getInstance().computeURL(pageContext, forward, href, page,
null,params, anchor, false);
if (urlString.indexOf(':') < 0) {
HttpServletRequest request = (HttpServletRequest)
pageContext.getRequest();
url = new URL(RequestUtils.requestURL(request), urlString);
1.15 +6 -7
jakarta-struts/src/share/org/apache/struts/taglib/bean/MessageTag.java
Index: MessageTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/bean/MessageTag.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- MessageTag.java 26 Jul 2003 19:12:41 -0000 1.14
+++ MessageTag.java 27 Jul 2003 06:54:28 -0000 1.15
@@ -69,7 +69,6 @@
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;
/**
@@ -257,7 +256,7 @@
if (value != null && !(value instanceof String)) {
JspException e =
new JspException(messages.getMessage("message.property", key));
- RequestUtils.saveException(pageContext, e);
+ TagUtils.getInstance().saveException(pageContext, e);
throw e;
}
key = (String) value;
@@ -279,7 +278,7 @@
JspException e =
new JspException(
messages.getMessage("message.message", "\"" + key + "\""));
- RequestUtils.saveException(pageContext, e);
+ TagUtils.getInstance().saveException(pageContext, e);
throw e;
}
1.8 +6 -6
jakarta-struts/src/share/org/apache/struts/taglib/bean/PageTag.java
Index: PageTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/bean/PageTag.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- PageTag.java 22 Sep 2002 06:32:46 -0000 1.7
+++ PageTag.java 27 Jul 2003 06:54:28 -0000 1.8
@@ -66,7 +66,7 @@
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.TagSupport;
import org.apache.struts.util.MessageResources;
-import org.apache.struts.util.RequestUtils;
+import org.apache.struts.taglib.TagUtils;
/**
@@ -146,7 +146,7 @@
else {
JspException e = new JspException
(messages.getMessage("page.selector", property));
- RequestUtils.saveException(pageContext, e);
+ TagUtils.getInstance().saveException(pageContext, e);
throw e;
}
1.10 +7 -7
jakarta-struts/src/share/org/apache/struts/taglib/bean/ParameterTag.java
Index: ParameterTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/bean/ParameterTag.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ParameterTag.java 14 Jul 2003 00:00:14 -0000 1.9
+++ ParameterTag.java 27 Jul 2003 06:54:28 -0000 1.10
@@ -65,7 +65,7 @@
import javax.servlet.jsp.tagext.TagSupport;
import org.apache.struts.util.MessageResources;
-import org.apache.struts.util.RequestUtils;
+import org.apache.struts.taglib.TagUtils;
/**
* Define a scripting variable based on the value(s) of the specified
@@ -159,7 +159,7 @@
if (value == null) {
JspException e =
new JspException(messages.getMessage("parameter.get", name));
- RequestUtils.saveException(pageContext, e);
+ TagUtils.getInstance().saveException(pageContext, e);
throw e;
}
@@ -178,7 +178,7 @@
if ((values == null) || (values.length == 0)) {
JspException e =
new JspException(messages.getMessage("parameter.get", name));
- RequestUtils.saveException(pageContext, e);
+ TagUtils.getInstance().saveException(pageContext, e);
throw e;
}
1.13 +7 -7
jakarta-struts/src/share/org/apache/struts/taglib/bean/ResourceTag.java
Index: ResourceTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/bean/ResourceTag.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ResourceTag.java 14 Jul 2003 00:02:29 -0000 1.12
+++ ResourceTag.java 27 Jul 2003 06:54:28 -0000 1.13
@@ -69,7 +69,7 @@
import javax.servlet.jsp.tagext.TagSupport;
import org.apache.struts.util.MessageResources;
-import org.apache.struts.util.RequestUtils;
+import org.apache.struts.taglib.TagUtils;
/**
* Define a scripting variable based on the contents of the specified
@@ -151,7 +151,7 @@
if (stream == null) {
JspException e =
new JspException(messages.getMessage("resource.get", name));
- RequestUtils.saveException(pageContext, e);
+ TagUtils.getInstance().saveException(pageContext, e);
throw e;
}
@@ -178,7 +178,7 @@
pageContext.setAttribute(id, sb.toString());
} catch (IOException e) {
- RequestUtils.saveException(pageContext, e);
+ TagUtils.getInstance().saveException(pageContext, e);
throw new JspException(messages.getMessage("resource.get", name));
}
1.6 +7 -8
jakarta-struts/src/share/org/apache/struts/taglib/bean/SizeTag.java
Index: SizeTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/bean/SizeTag.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SizeTag.java 26 Jul 2003 17:22:27 -0000 1.5
+++ SizeTag.java 27 Jul 2003 06:54:28 -0000 1.6
@@ -70,7 +70,6 @@
import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.TagSupport;
import org.apache.struts.util.MessageResources;
-import org.apache.struts.util.RequestUtils;
import org.apache.struts.taglib.TagUtils;
@@ -186,7 +185,7 @@
// attribute.
JspException e = new JspException
(messages.getMessage("size.noCollectionOrName"));
- RequestUtils.saveException(pageContext, e);
+ TagUtils.getInstance().saveException(pageContext, e);
throw e;
}
@@ -198,7 +197,7 @@
if (value == null) {
JspException e = new JspException
(messages.getMessage("size.collection"));
- RequestUtils.saveException(pageContext, e);
+ TagUtils.getInstance().saveException(pageContext, e);
throw e;
} else if (value.getClass().isArray()) {
size = Array.getLength(value);
@@ -209,7 +208,7 @@
} else {
JspException e = new JspException
(messages.getMessage("size.collection"));
- RequestUtils.saveException(pageContext, e);
+ TagUtils.getInstance().saveException(pageContext, e);
throw e;
}
1.15 +6 -7
jakarta-struts/src/share/org/apache/struts/taglib/bean/StrutsTag.java
Index: StrutsTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/bean/StrutsTag.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- StrutsTag.java 26 Jul 2003 01:22:31 -0000 1.14
+++ StrutsTag.java 27 Jul 2003 06:54:28 -0000 1.15
@@ -69,7 +69,6 @@
import org.apache.struts.config.ModuleConfig;
import org.apache.struts.taglib.TagUtils;
import org.apache.struts.util.MessageResources;
-import org.apache.struts.util.RequestUtils;
/**
@@ -173,7 +172,7 @@
if (n != 1) {
JspException e = new JspException
(messages.getMessage("struts.selector"));
- RequestUtils.saveException(pageContext, e);
+ TagUtils.getInstance().saveException(pageContext, e);
throw e;
}
@@ -196,7 +195,7 @@
if (object == null) {
JspException e = new JspException
(messages.getMessage("struts.missing", selector));
- RequestUtils.saveException(pageContext, e);
+ TagUtils.getInstance().saveException(pageContext, e);
throw e;
}
1.27 +5 -6
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.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- WriteTag.java 26 Jul 2003 19:11:57 -0000 1.26
+++ WriteTag.java 27 Jul 2003 06:54:28 -0000 1.27
@@ -74,7 +74,6 @@
import org.apache.struts.taglib.TagUtils;
import org.apache.struts.util.MessageResources;
-import org.apache.struts.util.RequestUtils;
import org.apache.struts.util.ResponseUtils;
/**
@@ -381,7 +380,7 @@
JspException ex =
new JspException(
messages.getMessage("write.format", formatString));
- RequestUtils.saveException(pageContext, ex);
+ TagUtils.getInstance().saveException(pageContext, ex);
throw ex;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
