craigmcc 01/04/03 12:23:15
Modified: src/share/org/apache/struts/taglib/html BaseFieldTag.java
MultiboxTag.java TextareaTag.java
Log:
Replace use of deprecated BeanUtils.filter() with ResponseUtils.filter().
Revision Changes Path
1.5 +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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BaseFieldTag.java 2001/02/14 00:39:52 1.4
+++ BaseFieldTag.java 2001/04/03 19:23:15 1.5
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/BaseFieldTag.java,v
1.4 2001/02/14 00:39:52 craigmcc Exp $
- * $Revision: 1.4 $
- * $Date: 2001/02/14 00:39:52 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/BaseFieldTag.java,v
1.5 2001/04/03 19:23:15 craigmcc Exp $
+ * $Revision: 1.5 $
+ * $Date: 2001/04/03 19:23:15 $
*
* ====================================================================
*
@@ -70,7 +70,6 @@
import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.TagSupport;
import org.apache.struts.upload.FormFile;
-import org.apache.struts.util.BeanUtils;
import org.apache.struts.util.MessageResources;
import org.apache.struts.util.PropertyUtils;
import org.apache.struts.util.RequestUtils;
@@ -81,7 +80,7 @@
* Convenience base class for the various input tags for text fields.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.4 $ $Date: 2001/02/14 00:39:52 $
+ * @version $Revision: 1.5 $ $Date: 2001/04/03 19:23:15 $
*/
public abstract class BaseFieldTag extends BaseInputTag {
@@ -185,7 +184,7 @@
}
results.append(" value=\"");
if (value != null) {
- results.append(BeanUtils.filter(value));
+ results.append(ResponseUtils.filter(value));
} else if (redisplay || !"password".equals(type)) {
/*
Object bean = pageContext.findAttribute(name);
@@ -202,7 +201,7 @@
if (value == null) {
value = "";
}
- results.append(BeanUtils.filter(value));
+ results.append(ResponseUtils.filter(value));
} catch (IllegalAccessException e) {
throw new JspException
(messages.getMessage("getter.access", property, name));
1.4 +6 -5
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MultiboxTag.java 2001/02/10 23:31:50 1.3
+++ MultiboxTag.java 2001/04/03 19:23:15 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/MultiboxTag.java,v
1.3 2001/02/10 23:31:50 craigmcc Exp $
- * $Revision: 1.3 $
- * $Date: 2001/02/10 23:31:50 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/MultiboxTag.java,v
1.4 2001/04/03 19:23:15 craigmcc Exp $
+ * $Revision: 1.4 $
+ * $Date: 2001/04/03 19:23:15 $
*
* ====================================================================
*
@@ -71,6 +71,7 @@
import org.apache.struts.action.Action;
import org.apache.struts.util.BeanUtils;
import org.apache.struts.util.MessageResources;
+import org.apache.struts.util.ResponseUtils;
/**
@@ -82,7 +83,7 @@
*
* @author Ralph Schaer
* @author Craig R. McClanahan
- * @version $Revision: 1.3 $ $Date: 2001/02/10 23:31:50 $
+ * @version $Revision: 1.4 $ $Date: 2001/04/03 19:23:15 $
*/
public class MultiboxTag extends BaseHandlerTag {
@@ -246,7 +247,7 @@
PageContext.REQUEST_SCOPE);
throw e;
}
- results.append(BeanUtils.filter(value));
+ results.append(ResponseUtils.filter(value));
results.append("\"");
Object bean = pageContext.findAttribute(name);
String values[] = null;
1.3 +7 -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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TextareaTag.java 2001/01/08 21:36:13 1.2
+++ TextareaTag.java 2001/04/03 19:23:15 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/TextareaTag.java,v
1.2 2001/01/08 21:36:13 craigmcc Exp $
- * $Revision: 1.2 $
- * $Date: 2001/01/08 21:36:13 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/TextareaTag.java,v
1.3 2001/04/03 19:23:15 craigmcc Exp $
+ * $Revision: 1.3 $
+ * $Date: 2001/04/03 19:23:15 $
*
* ====================================================================
*
@@ -71,13 +71,14 @@
import javax.servlet.jsp.tagext.TagSupport;
import org.apache.struts.util.BeanUtils;
import org.apache.struts.util.MessageResources;
+import org.apache.struts.util.ResponseUtils;
/**
* Custom tag for input fields of type "textarea".
*
* @author Craig R. McClanahan
- * @version $Revision: 1.2 $ $Date: 2001/01/08 21:36:13 $
+ * @version $Revision: 1.3 $ $Date: 2001/04/03 19:23:15 $
*/
public class TextareaTag extends BaseInputTag {
@@ -139,7 +140,7 @@
results.append(prepareStyles());
results.append(">");
if (value != null) {
- results.append(BeanUtils.filter(value));
+ results.append(ResponseUtils.filter(value));
} else {
Object bean = pageContext.findAttribute(name);
if (bean == null)
@@ -149,7 +150,7 @@
String value = BeanUtils.getProperty(bean, property);
if (value == null)
value = "";
- results.append(BeanUtils.filter((String) value));
+ results.append(ResponseUtils.filter((String) value));
} catch (IllegalAccessException e) {
throw new JspException
(messages.getMessage("getter.access", property, name));
