craigmcc 01/04/28 17:38:05 Modified: src/share/org/apache/struts/taglib/html BaseFieldTag.java ImgTag.java LinkTag.java OptionsTag.java RewriteTag.java Log: Remove obsolete "import" statements. Revision Changes Path 1.7 +4 -35 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.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- BaseFieldTag.java 2001/04/18 23:51:30 1.6 +++ BaseFieldTag.java 2001/04/29 00:38:04 1.7 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/BaseFieldTag.java,v 1.6 2001/04/18 23:51:30 craigmcc Exp $ - * $Revision: 1.6 $ - * $Date: 2001/04/18 23:51:30 $ + * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/BaseFieldTag.java,v 1.7 2001/04/29 00:38:04 craigmcc Exp $ + * $Revision: 1.7 $ + * $Date: 2001/04/29 00:38:04 $ * * ==================================================================== * @@ -71,7 +71,6 @@ import javax.servlet.jsp.tagext.TagSupport; import org.apache.struts.upload.FormFile; import org.apache.struts.util.MessageResources; -import org.apache.struts.util.PropertyUtils; import org.apache.struts.util.RequestUtils; import org.apache.struts.util.ResponseUtils; @@ -80,7 +79,7 @@ * Convenience base class for the various input tags for text fields. * * @author Craig R. McClanahan - * @version $Revision: 1.6 $ $Date: 2001/04/18 23:51:30 $ + * @version $Revision: 1.7 $ $Date: 2001/04/29 00:38:04 $ */ public abstract class BaseFieldTag extends BaseInputTag { @@ -186,36 +185,6 @@ if (value != null) { results.append(ResponseUtils.filter(value)); } else if (redisplay || !"password".equals(type)) { - /* - Object bean = pageContext.findAttribute(name); - if (bean == null) - throw new JspException - (messages.getMessage("getter.bean", name)); - try { - String value = ""; - Object objvalue = PropertyUtils.getProperty(bean, property); - if ((objvalue != null) && - !(objvalue instanceof FormFile)) { - value = objvalue.toString(); - } - if (value == null) { - value = ""; - } - results.append(ResponseUtils.filter(value)); - } catch (IllegalAccessException e) { - throw new JspException - (messages.getMessage("getter.access", property, name)); - } catch (InvocationTargetException e) { - Throwable t = e.getTargetException(); - t.printStackTrace(); - throw new JspException - (messages.getMessage("getter.result", - property, t.toString())); - } catch (NoSuchMethodException e) { - throw new JspException - (messages.getMessage("getter.method", property, name)); - } - */ Object value = RequestUtils.lookup(pageContext, name, property, null); if (value == null) 1.10 +4 -6 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.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ImgTag.java 2001/04/19 21:13:58 1.9 +++ ImgTag.java 2001/04/29 00:38:04 1.10 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/ImgTag.java,v 1.9 2001/04/19 21:13:58 craigmcc Exp $ - * $Revision: 1.9 $ - * $Date: 2001/04/19 21:13:58 $ + * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/ImgTag.java,v 1.10 2001/04/29 00:38:04 craigmcc Exp $ + * $Revision: 1.10 $ + * $Date: 2001/04/29 00:38:04 $ * * ==================================================================== * @@ -75,9 +75,7 @@ import javax.servlet.jsp.JspWriter; import javax.servlet.jsp.PageContext; import org.apache.struts.action.Action; -import org.apache.struts.util.BeanUtils; import org.apache.struts.util.MessageResources; -import org.apache.struts.util.PropertyUtils; import org.apache.struts.util.RequestUtils; import org.apache.struts.util.ResponseUtils; @@ -97,7 +95,7 @@ * * @author Michael Westbay * @author Craig McClanahan - * @version $Revision: 1.9 $ + * @version $Revision: 1.10 $ */ public class ImgTag extends BaseHandlerTag { 1.10 +4 -5 jakarta-struts/src/share/org/apache/struts/taglib/html/LinkTag.java Index: LinkTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/LinkTag.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- LinkTag.java 2001/04/18 22:41:26 1.9 +++ LinkTag.java 2001/04/29 00:38:04 1.10 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/LinkTag.java,v 1.9 2001/04/18 22:41:26 craigmcc Exp $ - * $Revision: 1.9 $ - * $Date: 2001/04/18 22:41:26 $ + * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/LinkTag.java,v 1.10 2001/04/29 00:38:04 craigmcc Exp $ + * $Revision: 1.10 $ + * $Date: 2001/04/29 00:38:04 $ * * ==================================================================== * @@ -78,7 +78,6 @@ import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionForwards; import org.apache.struts.util.MessageResources; -import org.apache.struts.util.PropertyUtils; import org.apache.struts.util.RequestUtils; import org.apache.struts.util.ResponseUtils; @@ -87,7 +86,7 @@ * Generate a URL-encoded hyperlink to the specified URI. * * @author Craig R. McClanahan - * @version $Revision: 1.9 $ $Date: 2001/04/18 22:41:26 $ + * @version $Revision: 1.10 $ $Date: 2001/04/29 00:38:04 $ */ public class LinkTag extends BaseHandlerTag { 1.7 +0 -1 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.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- OptionsTag.java 2001/04/19 21:20:34 1.6 +++ OptionsTag.java 2001/04/29 00:38:04 1.7 @@ -63,7 +63,6 @@ import javax.servlet.jsp.JspWriter; import javax.servlet.jsp.PageContext; import javax.servlet.jsp.tagext.TagSupport; -import org.apache.struts.util.BeanUtils; import org.apache.struts.util.IteratorAdapter; import org.apache.struts.util.MessageResources; import org.apache.struts.util.PropertyUtils; 1.4 +4 -5 jakarta-struts/src/share/org/apache/struts/taglib/html/RewriteTag.java Index: RewriteTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/RewriteTag.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- RewriteTag.java 2001/04/18 23:51:32 1.3 +++ RewriteTag.java 2001/04/29 00:38:04 1.4 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/RewriteTag.java,v 1.3 2001/04/18 23:51:32 craigmcc Exp $ - * $Revision: 1.3 $ - * $Date: 2001/04/18 23:51:32 $ + * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/RewriteTag.java,v 1.4 2001/04/29 00:38:04 craigmcc Exp $ + * $Revision: 1.4 $ + * $Date: 2001/04/29 00:38:04 $ * * ==================================================================== * @@ -77,7 +77,6 @@ import org.apache.struts.action.Action; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionForwards; -import org.apache.struts.util.BeanUtils; import org.apache.struts.util.MessageResources; import org.apache.struts.util.ResponseUtils; @@ -86,7 +85,7 @@ * Generate a URL-encoded URI as a string. * * @author Craig R. McClanahan - * @version $Revision: 1.3 $ $Date: 2001/04/18 23:51:32 $ + * @version $Revision: 1.4 $ $Date: 2001/04/29 00:38:04 $ */ public class RewriteTag extends LinkTag {