dgraham 2003/07/30 17:34:16
Modified: src/share/org/apache/struts/taglib/html TextareaTag.java
BaseFieldTag.java HiddenTag.java
OptionsCollectionTag.java OptionsTag.java
MultiboxTag.java
src/test/org/apache/struts/taglib/bean TestWriteTag.java
src/example/org/apache/struts/webapp/example
LinkUserTag.java LinkSubscriptionTag.java
src/share/org/apache/struts/taglib/nested
NestedWriteNestingTag.java
src/share/org/apache/struts/taglib/bean WriteTag.java
Log:
Updated classes to use new TagUtils.filter() method.
Revision Changes Path
1.16 +5 -6
jakarta-struts/src/share/org/apache/struts/taglib/html/TextareaTag.java
Index: TextareaTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/TextareaTag.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- TextareaTag.java 31 Jul 2003 00:25:39 -0000 1.15
+++ TextareaTag.java 31 Jul 2003 00:34:15 -0000 1.16
@@ -64,7 +64,6 @@
import javax.servlet.jsp.JspException;
import org.apache.struts.taglib.TagUtils;
-import org.apache.struts.util.ResponseUtils;
/**
* Custom tag for input fields of type "textarea".
@@ -166,7 +165,7 @@
data = this.lookupProperty(this.name, this.property);
}
- return (data == null) ? "" : ResponseUtils.filter(data);
+ return (data == null) ? "" : TagUtils.getInstance().filter(data);
}
/**
1.21 +6 -7
jakarta-struts/src/share/org/apache/struts/taglib/html/BaseFieldTag.java
Index: BaseFieldTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/BaseFieldTag.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- BaseFieldTag.java 31 Jul 2003 00:25:39 -0000 1.20
+++ BaseFieldTag.java 31 Jul 2003 00:34:15 -0000 1.21
@@ -64,7 +64,6 @@
import javax.servlet.jsp.JspException;
import org.apache.struts.taglib.TagUtils;
-import org.apache.struts.util.ResponseUtils;
/**
* Convenience base class for the various input tags for text fields.
@@ -190,7 +189,7 @@
results.append(" value=\"");
if (value != null) {
- results.append(ResponseUtils.filter(value));
+ results.append(TagUtils.getInstance().filter(value));
} else if (redisplay || !"password".equals(type)) {
Object value = TagUtils.getInstance().lookup(pageContext, name,
property, null);
@@ -198,7 +197,7 @@
value = "";
}
- results.append(ResponseUtils.filter(value.toString()));
+ results.append(TagUtils.getInstance().filter(value.toString()));
}
results.append("\"");
1.7 +6 -7
jakarta-struts/src/share/org/apache/struts/taglib/html/HiddenTag.java
Index: HiddenTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/HiddenTag.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- HiddenTag.java 31 Jul 2003 00:25:39 -0000 1.6
+++ HiddenTag.java 31 Jul 2003 00:34:15 -0000 1.7
@@ -64,7 +64,6 @@
import javax.servlet.jsp.JspException;
import org.apache.struts.taglib.TagUtils;
-import org.apache.struts.util.ResponseUtils;
/**
* Custom tag for input fields of type "hidden".
@@ -129,14 +128,14 @@
// * @since Struts 1.1
String results = null;
if (value != null) {
- results = ResponseUtils.filter(value);
+ results = TagUtils.getInstance().filter(value);
} else {
Object value = TagUtils.getInstance().lookup(pageContext, name,
property,
null);
if (value == null) {
results = "";
} else {
- results = ResponseUtils.filter(value.toString());
+ results = TagUtils.getInstance().filter(value.toString());
}
}
1.13 +9 -7
jakarta-struts/src/share/org/apache/struts/taglib/html/OptionsCollectionTag.java
Index: OptionsCollectionTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/OptionsCollectionTag.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- OptionsCollectionTag.java 31 Jul 2003 00:25:39 -0000 1.12
+++ OptionsCollectionTag.java 31 Jul 2003 00:34:15 -0000 1.13
@@ -73,9 +73,8 @@
import org.apache.commons.beanutils.PropertyUtils;
import org.apache.commons.collections.IteratorUtils;
-import org.apache.struts.util.MessageResources;
-import org.apache.struts.util.ResponseUtils;
import org.apache.struts.taglib.TagUtils;
+import org.apache.struts.util.MessageResources;
/**
* Tag for creating multiple <select> options from a collection. The
@@ -348,12 +347,15 @@
sb.append(styleClass);
sb.append("\"");
}
+
sb.append(">");
+
if (filter) {
- sb.append(ResponseUtils.filter(label));
+ sb.append(TagUtils.getInstance().filter(label));
} else {
sb.append(label);
}
+
sb.append("</option>\r\n");
}
1.25 +7 -5
jakarta-struts/src/share/org/apache/struts/taglib/html/OptionsTag.java
Index: OptionsTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/OptionsTag.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- OptionsTag.java 31 Jul 2003 00:19:04 -0000 1.24
+++ OptionsTag.java 31 Jul 2003 00:34:15 -0000 1.25
@@ -75,7 +75,6 @@
import org.apache.commons.collections.IteratorUtils;
import org.apache.struts.taglib.TagUtils;
import org.apache.struts.util.MessageResources;
-import org.apache.struts.util.ResponseUtils;
/**
* Tag for creating multiple <select> options from a collection. The
@@ -373,12 +372,15 @@
sb.append(styleClass);
sb.append("\"");
}
+
sb.append(">");
+
if (filter) {
- sb.append(ResponseUtils.filter(label));
+ sb.append(TagUtils.getInstance().filter(label));
} else {
sb.append(label);
}
+
sb.append("</option>\r\n");
}
1.21 +5 -6
jakarta-struts/src/share/org/apache/struts/taglib/html/MultiboxTag.java
Index: MultiboxTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/MultiboxTag.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- MultiboxTag.java 31 Jul 2003 00:19:04 -0000 1.20
+++ MultiboxTag.java 31 Jul 2003 00:34:15 -0000 1.21
@@ -70,7 +70,6 @@
import org.apache.struts.Globals;
import org.apache.struts.taglib.TagUtils;
import org.apache.struts.util.MessageResources;
-import org.apache.struts.util.ResponseUtils;
/**
* Tag for input fields of type "checkbox". This differs from CheckboxTag
@@ -228,7 +227,7 @@
pageContext.setAttribute(Globals.EXCEPTION_KEY, e,
PageContext.REQUEST_SCOPE);
throw e;
}
- results.append(ResponseUtils.filter(value));
+ results.append(TagUtils.getInstance().filter(value));
results.append("\"");
Object bean = TagUtils.getInstance().lookup(pageContext, name, null);
String values[] = null;
1.7 +5 -4
jakarta-struts/src/test/org/apache/struts/taglib/bean/TestWriteTag.java
Index: TestWriteTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/bean/TestWriteTag.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TestWriteTag.java 13 May 2003 18:21:13 -0000 1.6
+++ TestWriteTag.java 31 Jul 2003 00:34:15 -0000 1.7
@@ -69,6 +69,7 @@
import org.apache.cactus.WebResponse;
import org.apache.struts.Globals;
import org.apache.struts.taglib.SimpleBeanForTesting;
+import org.apache.struts.taglib.TagUtils;
import org.apache.struts.util.ResponseUtils;
import org.apache.commons.lang.StringUtils;
@@ -238,7 +239,7 @@
runMyTest("testWriteTagNameFilter", "");
}
public void endWriteTagNameFilter(WebResponse response){
- formatAndTest(ResponseUtils.filter("<testing&'\">"),
response.getText());
+ formatAndTest(TagUtils.getInstance().filter("<testing&'\">"),
response.getText());
}
1.7 +9 -7
jakarta-struts/src/example/org/apache/struts/webapp/example/LinkUserTag.java
Index: LinkUserTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/LinkUserTag.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- LinkUserTag.java 18 Jan 2003 19:48:56 -0000 1.6
+++ LinkUserTag.java 31 Jul 2003 00:34:15 -0000 1.7
@@ -64,14 +64,16 @@
import java.io.IOException;
+
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.JspWriter;
import javax.servlet.jsp.tagext.TagSupport;
-import org.apache.struts.util.MessageResources;
-import org.apache.struts.util.ResponseUtils;
+
import org.apache.struts.config.ModuleConfig;
+import org.apache.struts.taglib.TagUtils;
+import org.apache.struts.util.MessageResources;
/**
@@ -187,7 +189,7 @@
else
url.append("&");
url.append("username=");
- url.append(ResponseUtils.filter(user.getUsername()));
+ url.append(TagUtils.getInstance().filter(user.getUsername()));
// Generate the hyperlink start element
HttpServletResponse response =
1.6 +10 -8
jakarta-struts/src/example/org/apache/struts/webapp/example/LinkSubscriptionTag.java
Index: LinkSubscriptionTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/LinkSubscriptionTag.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- LinkSubscriptionTag.java 18 Jan 2003 19:48:56 -0000 1.5
+++ LinkSubscriptionTag.java 31 Jul 2003 00:34:15 -0000 1.6
@@ -64,14 +64,16 @@
import java.io.IOException;
+
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.JspWriter;
import javax.servlet.jsp.tagext.TagSupport;
-import org.apache.struts.util.MessageResources;
-import org.apache.struts.util.ResponseUtils;
+
import org.apache.struts.config.ModuleConfig;
+import org.apache.struts.taglib.TagUtils;
+import org.apache.struts.util.MessageResources;
/**
@@ -187,9 +189,9 @@
else
url.append("&");
url.append("username=");
- url.append(ResponseUtils.filter(subscription.getUser().getUsername()));
+
url.append(TagUtils.getInstance().filter(subscription.getUser().getUsername()));
url.append("&host=");
- url.append(ResponseUtils.filter(subscription.getHost()));
+ url.append(TagUtils.getInstance().filter(subscription.getHost()));
// Generate the hyperlink start element
HttpServletResponse response =
1.6 +5 -6
jakarta-struts/src/share/org/apache/struts/taglib/nested/NestedWriteNestingTag.java
Index: NestedWriteNestingTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/NestedWriteNestingTag.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- NestedWriteNestingTag.java 31 Jul 2003 00:25:39 -0000 1.5
+++ NestedWriteNestingTag.java 31 Jul 2003 00:34:15 -0000 1.6
@@ -64,7 +64,6 @@
import javax.servlet.jsp.tagext.BodyTagSupport;
import org.apache.struts.taglib.TagUtils;
-import org.apache.struts.util.ResponseUtils;
/**
* NestedWriteNestingTag.
@@ -123,7 +122,7 @@
/* write output, filtering if required */
if (this.filter) {
- TagUtils.getInstance().write(pageContext, ResponseUtils.filter(nesting));
+ TagUtils.getInstance().write(pageContext,
TagUtils.getInstance().filter(nesting));
} else {
TagUtils.getInstance().write(pageContext, nesting);
}
1.29 +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.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- WriteTag.java 31 Jul 2003 00:25:39 -0000 1.28
+++ WriteTag.java 31 Jul 2003 00:34:15 -0000 1.29
@@ -74,7 +74,6 @@
import org.apache.struts.taglib.TagUtils;
import org.apache.struts.util.MessageResources;
-import org.apache.struts.util.ResponseUtils;
/**
* Tag that retrieves the specified property of the specified bean, converts
@@ -278,7 +277,7 @@
// Print this property value to our output writer, suitably filtered
if (filter) {
- TagUtils.getInstance().write(pageContext, ResponseUtils.filter(output));
+ TagUtils.getInstance().write(pageContext,
TagUtils.getInstance().filter(output));
} else {
TagUtils.getInstance().write(pageContext, output);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
