craigmcc 01/05/19 18:19:14 Modified: src/share/org/apache/struts/taglib BaseFieldTag.java CheckboxTag.java EnumerateTag.java FormTag.java GetPropertyTag.java HtmlPropertyTag.java IfPropertyEqualsTag.java IfPropertyNotEqualsTag.java IterateTag.java Link1Tag.java LinkTag.java Options1Tag.java OptionsTag.java ParameterTag.java PropertyTag.java RadioTag.java SelectTag.java TextareaTag.java Log: Update to reflect the changes in BeanUtils. No functionality changes. Revision Changes Path 1.13 +8 -7 jakarta-struts/src/share/org/apache/struts/taglib/BaseFieldTag.java Index: BaseFieldTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/BaseFieldTag.java,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- BaseFieldTag.java 2001/02/14 00:00:40 1.12 +++ BaseFieldTag.java 2001/05/20 01:19:00 1.13 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/BaseFieldTag.java,v 1.12 2001/02/14 00:00:40 craigmcc Exp $ - * $Revision: 1.12 $ - * $Date: 2001/02/14 00:00:40 $ + * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/BaseFieldTag.java,v 1.13 2001/05/20 01:19:00 craigmcc Exp $ + * $Revision: 1.13 $ + * $Date: 2001/05/20 01:19:00 $ * * ==================================================================== * @@ -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; /** * Convenience base class for the various input tags for text fields. * * @author Craig R. McClanahan - * @version $Revision: 1.12 $ $Date: 2001/02/14 00:00:40 $ + * @version $Revision: 1.13 $ $Date: 2001/05/20 01:19:00 $ */ public abstract class BaseFieldTag extends BaseInputTag { @@ -167,17 +168,17 @@ } results.append(" value=\""); if (value != null) { - results.append(BeanUtils.filter(value)); + results.append(ResponseUtils.filter(value)); } else { Object bean = pageContext.findAttribute(name); if (bean == null) throw new JspException (messages.getMessage("getter.bean", name)); try { - String value = BeanUtils.getScalarProperty(bean, property); + String value = BeanUtils.getSimpleProperty(bean, property); 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.10 +5 -5 jakarta-struts/src/share/org/apache/struts/taglib/CheckboxTag.java Index: CheckboxTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/CheckboxTag.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- CheckboxTag.java 2000/08/14 04:42:50 1.9 +++ CheckboxTag.java 2001/05/20 01:19:00 1.10 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/CheckboxTag.java,v 1.9 2000/08/14 04:42:50 craigmcc Exp $ - * $Revision: 1.9 $ - * $Date: 2000/08/14 04:42:50 $ + * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/CheckboxTag.java,v 1.10 2001/05/20 01:19:00 craigmcc Exp $ + * $Revision: 1.10 $ + * $Date: 2001/05/20 01:19:00 $ * * ==================================================================== * @@ -76,7 +76,7 @@ * Tag for input fields of type "checkbox". * * @author Craig R. McClanahan - * @version $Revision: 1.9 $ $Date: 2000/08/14 04:42:50 $ + * @version $Revision: 1.10 $ $Date: 2001/05/20 01:19:00 $ */ public final class CheckboxTag extends BaseHandlerTag { @@ -198,7 +198,7 @@ throw new JspException (messages.getMessage("getter.bean", name)); try { - value = BeanUtils.getScalarProperty(bean, property); + value = BeanUtils.getSimpleProperty(bean, property); if (value == null) value = ""; } catch (IllegalAccessException e) { 1.10 +6 -5 jakarta-struts/src/share/org/apache/struts/taglib/EnumerateTag.java Index: EnumerateTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/EnumerateTag.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- EnumerateTag.java 2000/08/27 05:21:19 1.9 +++ EnumerateTag.java 2001/05/20 01:19:01 1.10 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/EnumerateTag.java,v 1.9 2000/08/27 05:21:19 craigmcc Exp $ - * $Revision: 1.9 $ - * $Date: 2000/08/27 05:21:19 $ + * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/EnumerateTag.java,v 1.10 2001/05/20 01:19:01 craigmcc Exp $ + * $Revision: 1.10 $ + * $Date: 2001/05/20 01:19:01 $ * * ==================================================================== * @@ -74,6 +74,7 @@ import javax.servlet.jsp.tagext.BodyTagSupport; import org.apache.struts.util.BeanUtils; import org.apache.struts.util.MessageResources; +import org.apache.struts.util.PropertyUtils; /** @@ -84,7 +85,7 @@ * <b>FIXME</b> - Should support Java2 collection classes as well! * * @author Craig R. McClanahan - * @version $Revision: 1.9 $ $Date: 2000/08/27 05:21:19 $ + * @version $Revision: 1.10 $ $Date: 2001/05/20 01:19:01 $ */ public final class EnumerateTag extends BodyTagSupport { @@ -318,7 +319,7 @@ if (property == null) collection = bean; else { - collection = BeanUtils.getPropertyValue(bean, property); + collection = PropertyUtils.getProperty(bean, property); } if (collection == null) throw new JspException 1.11 +6 -5 jakarta-struts/src/share/org/apache/struts/taglib/FormTag.java Index: FormTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/FormTag.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- FormTag.java 2001/04/18 23:10:23 1.10 +++ FormTag.java 2001/05/20 01:19:01 1.11 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/FormTag.java,v 1.10 2001/04/18 23:10:23 craigmcc Exp $ - * $Revision: 1.10 $ - * $Date: 2001/04/18 23:10:23 $ + * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/FormTag.java,v 1.11 2001/05/20 01:19:01 craigmcc Exp $ + * $Revision: 1.11 $ + * $Date: 2001/05/20 01:19:01 $ * * ==================================================================== * @@ -71,6 +71,7 @@ import javax.servlet.jsp.tagext.TagSupport; import org.apache.struts.util.BeanUtils; import org.apache.struts.util.MessageResources; +import org.apache.struts.util.ResponseUtils; /** @@ -78,7 +79,7 @@ * properties correspond to the various fields of the form. * * @author Craig R. McClanahan - * @version $Revision: 1.10 $ $Date: 2001/04/18 23:10:23 $ + * @version $Revision: 1.11 $ $Date: 2001/05/20 01:19:01 $ */ public final class FormTag extends TagSupport { @@ -471,7 +472,7 @@ results.append("\""); if (action != null) { results.append(" action=\""); - results.append(response.encodeURL(BeanUtils.filter(action))); + results.append(response.encodeURL(ResponseUtils.filter(action))); results.append("\""); } if (styleClass != null) { 1.7 +6 -5 jakarta-struts/src/share/org/apache/struts/taglib/GetPropertyTag.java Index: GetPropertyTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/GetPropertyTag.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- GetPropertyTag.java 2000/08/14 04:42:50 1.6 +++ GetPropertyTag.java 2001/05/20 01:19:02 1.7 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/GetPropertyTag.java,v 1.6 2000/08/14 04:42:50 craigmcc Exp $ - * $Revision: 1.6 $ - * $Date: 2000/08/14 04:42:50 $ + * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/GetPropertyTag.java,v 1.7 2001/05/20 01:19:02 craigmcc Exp $ + * $Revision: 1.7 $ + * $Date: 2001/05/20 01:19:02 $ * * ==================================================================== * @@ -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.PropertyUtils; /** * Expose the value of a bean property as a scripting variable. * * @author Craig R. McClanahan - * @version $Revision: 1.6 $ $Date: 2000/08/14 04:42:50 $ + * @version $Revision: 1.7 $ $Date: 2001/05/20 01:19:02 $ */ public class GetPropertyTag extends TagSupport { @@ -198,7 +199,7 @@ if (bean == null) throw new JspException (messages.getMessage("getter.bean", name)); - value = BeanUtils.getPropertyValue(bean, property); + value = PropertyUtils.getProperty(bean, property); if (value == null) throw new JspException (messages.getMessage("getter.property", property)); 1.5 +8 -6 jakarta-struts/src/share/org/apache/struts/taglib/HtmlPropertyTag.java Index: HtmlPropertyTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/HtmlPropertyTag.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- HtmlPropertyTag.java 2000/08/14 04:42:51 1.4 +++ HtmlPropertyTag.java 2001/05/20 01:19:02 1.5 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/HtmlPropertyTag.java,v 1.4 2000/08/14 04:42:51 craigmcc Exp $ - * $Revision: 1.4 $ - * $Date: 2000/08/14 04:42:51 $ + * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/HtmlPropertyTag.java,v 1.5 2001/05/20 01:19:02 craigmcc Exp $ + * $Revision: 1.5 $ + * $Date: 2001/05/20 01:19:02 $ * * ==================================================================== * @@ -71,6 +71,8 @@ import javax.servlet.jsp.tagext.TagSupport; import org.apache.struts.util.BeanUtils; import org.apache.struts.util.MessageResources; +import org.apache.struts.util.PropertyUtils; +import org.apache.struts.util.ResponseUtils; /** @@ -79,7 +81,7 @@ * HTML-related characters do not cause difficulties. * * @author Craig R. McClanahan - * @version $Revision: 1.4 $ $Date: 2000/08/14 04:42:51 $ + * @version $Revision: 1.5 $ $Date: 2001/05/20 01:19:02 $ */ public final class HtmlPropertyTag extends TagSupport { @@ -188,7 +190,7 @@ Class paramTypes[] = new Class[0]; Object value = null; try { - value = BeanUtils.getPropertyValue(bean, property); + value = PropertyUtils.getProperty(bean, property); if (value == null) value = ""; } catch (IllegalAccessException e) { @@ -207,7 +209,7 @@ // Print this property value to our output writer, suitably encoded JspWriter writer = pageContext.getOut(); try { - writer.print(BeanUtils.filter(value.toString())); + writer.print(ResponseUtils.filter(value.toString())); } catch (IOException e) { throw new JspException (messages.getMessage("common.io", e.toString())); 1.5 +5 -5 jakarta-struts/src/share/org/apache/struts/taglib/IfPropertyEqualsTag.java Index: IfPropertyEqualsTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/IfPropertyEqualsTag.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- IfPropertyEqualsTag.java 2000/08/14 04:42:51 1.4 +++ IfPropertyEqualsTag.java 2001/05/20 01:19:02 1.5 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/IfPropertyEqualsTag.java,v 1.4 2000/08/14 04:42:51 craigmcc Exp $ - * $Revision: 1.4 $ - * $Date: 2000/08/14 04:42:51 $ + * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/IfPropertyEqualsTag.java,v 1.5 2001/05/20 01:19:02 craigmcc Exp $ + * $Revision: 1.5 $ + * $Date: 2001/05/20 01:19:02 $ * * ==================================================================== * @@ -76,7 +76,7 @@ * of the specified attribute (in any scope) has the specified value. * * @author Arun M. Thomas <[EMAIL PROTECTED]> - * @version $Revision: 1.4 $ $Date: 2000/08/14 04:42:51 $ + * @version $Revision: 1.5 $ $Date: 2001/05/20 01:19:02 $ */ public class IfPropertyEqualsTag extends BaseAttributeTag { @@ -168,7 +168,7 @@ if (bean != null) { String value = null; try { - value = BeanUtils.getScalarProperty(bean, property); + value = BeanUtils.getSimpleProperty(bean, property); if (value == null) value = ""; } catch (IllegalAccessException e) { 1.5 +5 -5 jakarta-struts/src/share/org/apache/struts/taglib/IfPropertyNotEqualsTag.java Index: IfPropertyNotEqualsTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/IfPropertyNotEqualsTag.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- IfPropertyNotEqualsTag.java 2000/08/14 04:42:51 1.4 +++ IfPropertyNotEqualsTag.java 2001/05/20 01:19:03 1.5 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/IfPropertyNotEqualsTag.java,v 1.4 2000/08/14 04:42:51 craigmcc Exp $ - * $Revision: 1.4 $ - * $Date: 2000/08/14 04:42:51 $ + * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/IfPropertyNotEqualsTag.java,v 1.5 2001/05/20 01:19:03 craigmcc Exp $ + * $Revision: 1.5 $ + * $Date: 2001/05/20 01:19:03 $ * * ==================================================================== * @@ -76,7 +76,7 @@ * of the specified attribute (in any scope) has the specified value. * * @author Arun M. Thomas <[EMAIL PROTECTED]> - * @version $Revision: 1.4 $ $Date: 2000/08/14 04:42:51 $ + * @version $Revision: 1.5 $ $Date: 2001/05/20 01:19:03 $ */ public class IfPropertyNotEqualsTag extends BaseAttributeTag { @@ -168,7 +168,7 @@ if (bean != null) { String value = null; try { - value = BeanUtils.getScalarProperty(bean, property); + value = BeanUtils.getSimpleProperty(bean, property); if (value == null) value = ""; } catch (IllegalAccessException e) { 1.11 +6 -5 jakarta-struts/src/share/org/apache/struts/taglib/IterateTag.java Index: IterateTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/IterateTag.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- IterateTag.java 2000/08/27 05:21:19 1.10 +++ IterateTag.java 2001/05/20 01:19:03 1.11 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/IterateTag.java,v 1.10 2000/08/27 05:21:19 craigmcc Exp $ - * $Revision: 1.10 $ - * $Date: 2000/08/27 05:21:19 $ + * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/IterateTag.java,v 1.11 2001/05/20 01:19:03 craigmcc Exp $ + * $Revision: 1.11 $ + * $Date: 2001/05/20 01:19:03 $ * * ==================================================================== * @@ -75,6 +75,7 @@ import javax.servlet.jsp.tagext.BodyTagSupport; import org.apache.struts.util.BeanUtils; import org.apache.struts.util.MessageResources; +import org.apache.struts.util.PropertyUtils; /** @@ -87,7 +88,7 @@ * <b>NOTE</b> - This tag requires a Java2 (JDK 1.2 or later) platform. * * @author Craig R. McClanahan - * @version $Revision: 1.10 $ $Date: 2000/08/27 05:21:19 $ + * @version $Revision: 1.11 $ $Date: 2001/05/20 01:19:03 $ */ public final class IterateTag extends BodyTagSupport { @@ -321,7 +322,7 @@ if (property == null) collection = bean; else - collection = BeanUtils.getPropertyValue(bean, property); + collection = PropertyUtils.getProperty(bean, property); if (collection == null) throw new JspException (messages.getMessage("getter.property", property)); 1.9 +8 -6 jakarta-struts/src/share/org/apache/struts/taglib/Link1Tag.java Index: Link1Tag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/Link1Tag.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- Link1Tag.java 2000/08/14 04:42:51 1.8 +++ Link1Tag.java 2001/05/20 01:19:03 1.9 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/Link1Tag.java,v 1.8 2000/08/14 04:42:51 craigmcc Exp $ - * $Revision: 1.8 $ - * $Date: 2000/08/14 04:42:51 $ + * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/Link1Tag.java,v 1.9 2001/05/20 01:19:03 craigmcc Exp $ + * $Revision: 1.9 $ + * $Date: 2001/05/20 01:19:03 $ * * ==================================================================== * @@ -78,6 +78,8 @@ import org.apache.struts.action.ActionForwards; import org.apache.struts.util.BeanUtils; import org.apache.struts.util.MessageResources; +import org.apache.struts.util.PropertyUtils; +import org.apache.struts.util.ResponseUtils; /** @@ -86,7 +88,7 @@ * a Map, so that it works on JDK 1.1 platforms. * * @author Craig R. McClanahan - * @version $Revision: 1.8 $ $Date: 2000/08/14 04:42:51 $ + * @version $Revision: 1.9 $ $Date: 2001/05/20 01:19:03 $ */ public class Link1Tag extends TagSupport { @@ -268,7 +270,7 @@ HttpServletResponse response = (HttpServletResponse) pageContext.getResponse(); StringBuffer results = new StringBuffer("<a href=\""); - results.append(response.encodeURL(BeanUtils.filter(hyperlink()))); + results.append(response.encodeURL(ResponseUtils.filter(hyperlink()))); results.append("\""); if (target != null) { results.append(" target=\""); @@ -383,7 +385,7 @@ } else { try { dictionary = - (Dictionary) BeanUtils.getPropertyValue(bean, property); + (Dictionary) PropertyUtils.getProperty(bean, property); if (dictionary == null) throw new JspException (messages.getMessage("getter.property", property)); 1.12 +8 -6 jakarta-struts/src/share/org/apache/struts/taglib/LinkTag.java Index: LinkTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/LinkTag.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- LinkTag.java 2000/08/14 04:42:51 1.11 +++ LinkTag.java 2001/05/20 01:19:04 1.12 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/LinkTag.java,v 1.11 2000/08/14 04:42:51 craigmcc Exp $ - * $Revision: 1.11 $ - * $Date: 2000/08/14 04:42:51 $ + * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/LinkTag.java,v 1.12 2001/05/20 01:19:04 craigmcc Exp $ + * $Revision: 1.12 $ + * $Date: 2001/05/20 01:19:04 $ * * ==================================================================== * @@ -79,13 +79,15 @@ import org.apache.struts.action.ActionForwards; import org.apache.struts.util.BeanUtils; import org.apache.struts.util.MessageResources; +import org.apache.struts.util.PropertyUtils; +import org.apache.struts.util.ResponseUtils; /** * Generate a URL-encoded hyperlink to the specified URI. * * @author Craig R. McClanahan - * @version $Revision: 1.11 $ $Date: 2000/08/14 04:42:51 $ + * @version $Revision: 1.12 $ $Date: 2001/05/20 01:19:04 $ */ public class LinkTag extends TagSupport { @@ -267,7 +269,7 @@ HttpServletResponse response = (HttpServletResponse) pageContext.getResponse(); StringBuffer results = new StringBuffer("<a href=\""); - results.append(response.encodeURL(BeanUtils.filter(hyperlink()))); + results.append(response.encodeURL(ResponseUtils.filter(hyperlink()))); results.append("\""); if (target != null) { results.append(" target=\""); @@ -381,7 +383,7 @@ } } else { try { - map = (Map) BeanUtils.getPropertyValue(bean, property); + map = (Map) PropertyUtils.getProperty(bean, property); if (map == null) throw new JspException (messages.getMessage("getter.property", property)); 1.4 +2 -2 jakarta-struts/src/share/org/apache/struts/taglib/Options1Tag.java Index: Options1Tag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/Options1Tag.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Options1Tag.java 2000/08/14 04:42:51 1.3 +++ Options1Tag.java 2001/05/20 01:19:04 1.4 @@ -65,9 +65,9 @@ import javax.servlet.jsp.tagext.TagSupport; import org.apache.struts.util.BeanUtils; import org.apache.struts.util.MessageResources; +import org.apache.struts.util.PropertyUtils; - import java.util.Dictionary; import java.util.Enumeration; import java.util.Vector; @@ -256,7 +256,7 @@ Object collection = bean; if (property != null) { try { - collection = BeanUtils.getPropertyValue(bean, property); + collection = PropertyUtils.getProperty(bean, property); } catch (IllegalAccessException e) { throw new JspException (messages.getMessage("getter.access", property, name)); 1.5 +2 -1 jakarta-struts/src/share/org/apache/struts/taglib/OptionsTag.java Index: OptionsTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/OptionsTag.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- OptionsTag.java 2000/08/14 04:42:51 1.4 +++ OptionsTag.java 2001/05/20 01:19:04 1.5 @@ -65,6 +65,7 @@ import javax.servlet.jsp.tagext.TagSupport; import org.apache.struts.util.BeanUtils; import org.apache.struts.util.MessageResources; +import org.apache.struts.util.PropertyUtils; import java.util.Arrays; import java.util.Collection; @@ -252,7 +253,7 @@ Object collection = bean; if (property != null) { try { - collection = BeanUtils.getPropertyValue(bean, property); + collection = PropertyUtils.getProperty(bean, property); } catch (IllegalAccessException e) { throw new JspException (messages.getMessage("getter.access", property, name)); 1.5 +6 -5 jakarta-struts/src/share/org/apache/struts/taglib/ParameterTag.java Index: ParameterTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/ParameterTag.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ParameterTag.java 2000/08/01 20:03:35 1.4 +++ ParameterTag.java 2001/05/20 01:19:05 1.5 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/ParameterTag.java,v 1.4 2000/08/01 20:03:35 craigmcc Exp $ - * $Revision: 1.4 $ - * $Date: 2000/08/01 20:03:35 $ + * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/ParameterTag.java,v 1.5 2001/05/20 01:19:05 craigmcc Exp $ + * $Revision: 1.5 $ + * $Date: 2001/05/20 01:19:05 $ * * ==================================================================== * @@ -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; /** * Display the value of the specified query parameter as read-only HTML text. * * @author Craig R. McClanahan - * @version $Revision: 1.4 $ $Date: 2000/08/01 20:03:35 $ + * @version $Revision: 1.5 $ $Date: 2001/05/20 01:19:05 $ */ public class ParameterTag extends TagSupport { @@ -145,7 +146,7 @@ // Print this value to our output writer JspWriter writer = pageContext.getOut(); try { - writer.print(BeanUtils.filter(value)); + writer.print(ResponseUtils.filter(value)); } catch (IOException e) { throw new JspException (messages.getMessage("common.io", e.toString())); 1.9 +8 -7 jakarta-struts/src/share/org/apache/struts/taglib/PropertyTag.java Index: PropertyTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/PropertyTag.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- PropertyTag.java 2000/08/14 04:42:51 1.8 +++ PropertyTag.java 2001/05/20 01:19:05 1.9 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/PropertyTag.java,v 1.8 2000/08/14 04:42:51 craigmcc Exp $ - * $Revision: 1.8 $ - * $Date: 2000/08/14 04:42:51 $ + * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/PropertyTag.java,v 1.9 2001/05/20 01:19:05 craigmcc Exp $ + * $Revision: 1.9 $ + * $Date: 2001/05/20 01:19:05 $ * * ==================================================================== * @@ -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; /** * Display the value of the specified bean property as read-only HTML text. * * @author Craig R. McClanahan - * @version $Revision: 1.8 $ $Date: 2000/08/14 04:42:51 $ + * @version $Revision: 1.9 $ $Date: 2001/05/20 01:19:05 $ */ public class PropertyTag extends BaseInputTag { @@ -113,17 +114,17 @@ // Create an appropriate HTML element based on our parameters StringBuffer results = new StringBuffer(); if (value != null) { - results.append(BeanUtils.filter(value)); + results.append(ResponseUtils.filter(value)); } else { Object bean = pageContext.findAttribute(name); if (bean == null) throw new JspException (messages.getMessage("getter.bean", name)); try { - String value = BeanUtils.getScalarProperty(bean, property); + String value = BeanUtils.getSimpleProperty(bean, property); 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.11 +5 -5 jakarta-struts/src/share/org/apache/struts/taglib/RadioTag.java Index: RadioTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/RadioTag.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- RadioTag.java 2000/08/14 04:42:51 1.10 +++ RadioTag.java 2001/05/20 01:19:06 1.11 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/RadioTag.java,v 1.10 2000/08/14 04:42:51 craigmcc Exp $ - * $Revision: 1.10 $ - * $Date: 2000/08/14 04:42:51 $ + * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/RadioTag.java,v 1.11 2001/05/20 01:19:06 craigmcc Exp $ + * $Revision: 1.11 $ + * $Date: 2001/05/20 01:19:06 $ * * ==================================================================== * @@ -76,7 +76,7 @@ * Tag for input fields of type "radio". * * @author Craig R. McClanahan - * @version $Revision: 1.10 $ $Date: 2000/08/14 04:42:51 $ + * @version $Revision: 1.11 $ $Date: 2001/05/20 01:19:06 $ */ public final class RadioTag extends BaseHandlerTag { @@ -183,7 +183,7 @@ throw new JspException (messages.getMessage("getter.bean", name)); try { - current = BeanUtils.getScalarProperty(bean, property); + current = BeanUtils.getSimpleProperty(bean, property); if (current == null) current = ""; } catch (IllegalAccessException e) { 1.12 +5 -5 jakarta-struts/src/share/org/apache/struts/taglib/SelectTag.java Index: SelectTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/SelectTag.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- SelectTag.java 2000/08/14 04:42:52 1.11 +++ SelectTag.java 2001/05/20 01:19:06 1.12 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/SelectTag.java,v 1.11 2000/08/14 04:42:52 craigmcc Exp $ - * $Revision: 1.11 $ - * $Date: 2000/08/14 04:42:52 $ + * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/SelectTag.java,v 1.12 2001/05/20 01:19:06 craigmcc Exp $ + * $Revision: 1.12 $ + * $Date: 2001/05/20 01:19:06 $ * * ==================================================================== * @@ -79,7 +79,7 @@ * inside a form tag. * * @author Craig R. McClanahan - * @version $Revision: 1.11 $ $Date: 2000/08/14 04:42:52 $ + * @version $Revision: 1.12 $ $Date: 2001/05/20 01:19:06 $ */ public final class SelectTag extends BaseHandlerTag { @@ -273,7 +273,7 @@ throw new JspException (messages.getMessage("getter.bean", name)); try { - match = BeanUtils.getScalarProperty(bean, property); + match = BeanUtils.getSimpleProperty(bean, property); if (match == null) match = ""; } catch (IllegalAccessException e) { 1.15 +8 -7 jakarta-struts/src/share/org/apache/struts/taglib/TextareaTag.java Index: TextareaTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/TextareaTag.java,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- TextareaTag.java 2000/10/13 16:14:06 1.14 +++ TextareaTag.java 2001/05/20 01:19:07 1.15 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/TextareaTag.java,v 1.14 2000/10/13 16:14:06 craigmcc Exp $ - * $Revision: 1.14 $ - * $Date: 2000/10/13 16:14:06 $ + * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/TextareaTag.java,v 1.15 2001/05/20 01:19:07 craigmcc Exp $ + * $Revision: 1.15 $ + * $Date: 2001/05/20 01:19:07 $ * * ==================================================================== * @@ -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.14 $ $Date: 2000/10/13 16:14:06 $ + * @version $Revision: 1.15 $ $Date: 2001/05/20 01:19:07 $ */ public class TextareaTag extends BaseInputTag { @@ -139,17 +140,17 @@ 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) throw new JspException (messages.getMessage("getter.bean", name)); try { - String value = BeanUtils.getScalarProperty(bean, property); + String value = BeanUtils.getSimpleProperty(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));