rleland 02/03/29 13:49:09 Modified: src/share/org/apache/struts/taglib/nested/html NestedCheckboxTag.java NestedErrorsTag.java NestedFormTag.java NestedHiddenTag.java NestedImageTag.java NestedLinkTag.java NestedMessagesTag.java NestedMultiboxTag.java NestedOptionsCollectionTag.java NestedOptionsTag.java NestedPasswordTag.java NestedRadioTag.java NestedSelectTag.java NestedSubmitTag.java NestedTextTag.java NestedTextareaTag.java Log: Explicitly include classes used by tag so UML Tool can resolve names. Yes it is stupid, but free Tool. SilverRun JD 1.1 Revision Changes Path 1.3 +14 -12 jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedCheckboxTag.java Index: NestedCheckboxTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedCheckboxTag.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- NestedCheckboxTag.java 22 Jan 2002 03:30:50 -0000 1.2 +++ NestedCheckboxTag.java 29 Mar 2002 21:49:09 -0000 1.3 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedCheckboxTag.java,v 1.2 2002/01/22 03:30:50 arron Exp $ - * $Revision: 1.2 $ - * $Date: 2002/01/22 03:30:50 $ + * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedCheckboxTag.java,v 1.3 2002/03/29 21:49:09 rleland Exp $ + * $Revision: 1.3 $ + * $Date: 2002/03/29 21:49:09 $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -59,7 +59,9 @@ */ package org.apache.struts.taglib.nested.html; -import org.apache.struts.taglib.nested.*; +import org.apache.struts.taglib.nested.NestedNameSupport; +import org.apache.struts.taglib.nested.NestedPropertyHelper; +import org.apache.struts.taglib.nested.NestedReference; import javax.servlet.jsp.*; import javax.servlet.jsp.tagext.*; import org.apache.struts.taglib.html.CheckboxTag; @@ -68,10 +70,10 @@ * NestedCheckboxTag. * @author Arron Bates * @since Struts 1.1 - * @version $Revision: 1.2 $ $Date: 2002/01/22 03:30:50 $ + * @version $Revision: 1.3 $ $Date: 2002/03/29 21:49:09 $ */ -public class NestedCheckboxTag extends CheckboxTag implements NestedNameSupport { - +public class NestedCheckboxTag extends CheckboxTag implements org.apache.struts.taglib.nested.NestedNameSupport { + /** * Overriding method of the heart of the matter. Gets the relative property * and leaves the rest up to the original tag implementation. Sweet. @@ -79,20 +81,20 @@ * This is in the hands of the super class. */ public int doStartTag() throws JspException { - + /* singleton tag implementations will need the original property to be set before running */ super.setProperty(originalProperty); - + /* let the NestedHelper set the properties it can */ isNesting = true; NestedPropertyHelper.setNestedProperties(this); isNesting = false; - + /* do the tag */ return super.doStartTag(); } - + /** this is overridden so that properties being set by the JSP page aren't * written over by those needed by the extension. If the tag instance is * re-used by the JSP, the tag can set the property back to that set by the @@ -108,7 +110,7 @@ originalProperty = newProperty; } } - + /* hold original property */ private String originalProperty = null; private boolean isNesting = false; 1.2 +9 -7 jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedErrorsTag.java Index: NestedErrorsTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedErrorsTag.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- NestedErrorsTag.java 19 Mar 2002 06:45:11 -0000 1.1 +++ NestedErrorsTag.java 29 Mar 2002 21:49:09 -0000 1.2 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedErrorsTag.java,v 1.1 2002/03/19 06:45:11 dwinterfeldt Exp $ - * $Revision: 1.1 $ - * $Date: 2002/03/19 06:45:11 $ + * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedErrorsTag.java,v 1.2 2002/03/29 21:49:09 rleland Exp $ + * $Revision: 1.2 $ + * $Date: 2002/03/29 21:49:09 $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -59,7 +59,9 @@ */ package org.apache.struts.taglib.nested.html; -import org.apache.struts.taglib.nested.*; +import org.apache.struts.taglib.nested.NestedPropertySupport; +import org.apache.struts.taglib.nested.NestedPropertyHelper; +import org.apache.struts.taglib.nested.NestedReference; import javax.servlet.jsp.*; import javax.servlet.jsp.tagext.*; import org.apache.struts.taglib.html.ErrorsTag; @@ -69,7 +71,7 @@ * @author Arron Bates * @author David Winterfeldt * @since Struts 1.1 - * @version $Revision: 1.1 $ $Date: 2002/03/19 06:45:11 $ + * @version $Revision: 1.2 $ $Date: 2002/03/29 21:49:09 $ */ public class NestedErrorsTag extends ErrorsTag implements NestedPropertySupport { @@ -92,7 +94,7 @@ /* do the tag */ return super.doStartTag(); } - + /** this is overridden so that properties being set by the JSP page aren't * written over by those needed by the extension. If the tag instance is * re-used by the JSP, the tag can set the property back to that set by the @@ -108,7 +110,7 @@ originalProperty = newProperty; } } - + /* hold original property */ private String originalProperty = null; private boolean isNesting = false; 1.5 +14 -12 jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedFormTag.java Index: NestedFormTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedFormTag.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- NestedFormTag.java 19 Mar 2002 23:29:23 -0000 1.4 +++ NestedFormTag.java 29 Mar 2002 21:49:09 -0000 1.5 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedFormTag.java,v 1.4 2002/03/19 23:29:23 arron Exp $ - * $Revision: 1.4 $ - * $Date: 2002/03/19 23:29:23 $ + * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedFormTag.java,v 1.5 2002/03/29 21:49:09 rleland Exp $ + * $Revision: 1.5 $ + * $Date: 2002/03/29 21:49:09 $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -59,7 +59,9 @@ */ package org.apache.struts.taglib.nested.html; -import org.apache.struts.taglib.nested.*; +import org.apache.struts.taglib.nested.NestedParentSupport; +import org.apache.struts.taglib.nested.NestedPropertyHelper; +import org.apache.struts.taglib.nested.NestedReference; import javax.servlet.jsp.*; import javax.servlet.jsp.tagext.*; import javax.servlet.http.HttpSession; @@ -69,7 +71,7 @@ * NestedFormTag. * @author Arron Bates * @since Struts 1.1 - * @version $Revision: 1.4 $ $Date: 2002/03/19 23:29:23 $ + * @version $Revision: 1.5 $ $Date: 2002/03/29 21:49:09 $ */ public class NestedFormTag extends FormTag implements NestedParentSupport { @@ -80,13 +82,13 @@ public String getNestedProperty() { return ""; } - + public String getProperty() { return ""; } - + public void setProperty(String newProperty) {} - + /** * Overriding to allow the chance to set the details of the system, so that @@ -96,16 +98,16 @@ public int doStartTag() throws JspException { /* store original result */ int temp = super.doStartTag(); - + /* set the details */ HttpSession session = (HttpSession)pageContext.getSession(); NestedReference nr = new NestedReference(getName(), getNestedProperty()); NestedPropertyHelper.setIncludeReference(session, nr); - + /* continue */ return temp; } - + /** * This is only overriden to clean up the include reference * @return int JSP continuation directive. @@ -117,7 +119,7 @@ /* all done. clean up */ HttpSession session = (HttpSession)pageContext.getSession(); NestedPropertyHelper.setIncludeReference(session, null); - + /* return super result */ return temp; } 1.3 +13 -11 jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedHiddenTag.java Index: NestedHiddenTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedHiddenTag.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- NestedHiddenTag.java 22 Jan 2002 03:30:50 -0000 1.2 +++ NestedHiddenTag.java 29 Mar 2002 21:49:09 -0000 1.3 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedHiddenTag.java,v 1.2 2002/01/22 03:30:50 arron Exp $ - * $Revision: 1.2 $ - * $Date: 2002/01/22 03:30:50 $ + * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedHiddenTag.java,v 1.3 2002/03/29 21:49:09 rleland Exp $ + * $Revision: 1.3 $ + * $Date: 2002/03/29 21:49:09 $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -59,7 +59,9 @@ */ package org.apache.struts.taglib.nested.html; -import org.apache.struts.taglib.nested.*; +import org.apache.struts.taglib.nested.NestedNameSupport; +import org.apache.struts.taglib.nested.NestedPropertyHelper; +import org.apache.struts.taglib.nested.NestedReference; import javax.servlet.jsp.*; import javax.servlet.jsp.tagext.*; import org.apache.struts.taglib.html.HiddenTag; @@ -68,10 +70,10 @@ * NestedHiddenTag. * @author Arron Bates * @since Struts 1.1 - * @version $Revision: 1.2 $ $Date: 2002/01/22 03:30:50 $ + * @version $Revision: 1.3 $ $Date: 2002/03/29 21:49:09 $ */ public class NestedHiddenTag extends HiddenTag implements NestedNameSupport { - + /** * Overriding method of the heart of the matter. Gets the relative property * and leaves the rest up to the original tag implementation. Sweet. @@ -79,20 +81,20 @@ * This is in the hands of the super class. */ public int doStartTag() throws JspException { - + /* singleton tag implementations will need the original property to be set before running */ super.setProperty(originalProperty); - + /* let the NestedHelper set the properties it can */ isNesting = true; NestedPropertyHelper.setNestedProperties(this); isNesting = false; - + /* do the tag */ return super.doStartTag(); } - + /** this is overridden so that properties being set by the JSP page aren't * written over by those needed by the extension. If the tag instance is * re-used by the JSP, the tag can set the property back to that set by the @@ -108,7 +110,7 @@ originalProperty = newProperty; } } - + /* hold original property */ private String originalProperty = null; private boolean isNesting = false; 1.3 +12 -10 jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedImageTag.java Index: NestedImageTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedImageTag.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- NestedImageTag.java 22 Jan 2002 03:30:50 -0000 1.2 +++ NestedImageTag.java 29 Mar 2002 21:49:09 -0000 1.3 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedImageTag.java,v 1.2 2002/01/22 03:30:50 arron Exp $ - * $Revision: 1.2 $ - * $Date: 2002/01/22 03:30:50 $ + * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedImageTag.java,v 1.3 2002/03/29 21:49:09 rleland Exp $ + * $Revision: 1.3 $ + * $Date: 2002/03/29 21:49:09 $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -59,7 +59,9 @@ */ package org.apache.struts.taglib.nested.html; -import org.apache.struts.taglib.nested.*; +import org.apache.struts.taglib.nested.NestedPropertySupport; +import org.apache.struts.taglib.nested.NestedPropertyHelper; +import org.apache.struts.taglib.nested.NestedReference; import javax.servlet.jsp.*; import javax.servlet.jsp.tagext.*; import org.apache.struts.taglib.html.ImageTag; @@ -68,7 +70,7 @@ * NestedMultiboxTag. * @author Arron Bates * @since Struts 1.1 - * @version $Revision: 1.2 $ $Date: 2002/01/22 03:30:50 $ + * @version $Revision: 1.3 $ $Date: 2002/03/29 21:49:09 $ */ public class NestedImageTag extends ImageTag implements NestedPropertySupport { @@ -79,20 +81,20 @@ * This is in the hands of the super class. */ public int doStartTag() throws JspException { - + /* singleton tag implementations will need the original property to be set before running */ super.setProperty(originalProperty); - + /* let the NestedHelper set the properties it can */ isNesting = true; NestedPropertyHelper.setNestedProperties(this); isNesting = false; - + /* do the tag */ return super.doStartTag(); } - + /** this is overridden so that properties being set by the JSP page aren't * written over by those needed by the extension. If the tag instance is * re-used by the JSP, the tag can set the property back to that set by the @@ -108,7 +110,7 @@ originalProperty = newProperty; } } - + /* hold original property */ private String originalProperty = null; private boolean isNesting = false; 1.5 +20 -18 jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedLinkTag.java Index: NestedLinkTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedLinkTag.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- NestedLinkTag.java 20 Feb 2002 04:01:57 -0000 1.4 +++ NestedLinkTag.java 29 Mar 2002 21:49:09 -0000 1.5 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedLinkTag.java,v 1.4 2002/02/20 04:01:57 arron Exp $ - * $Revision: 1.4 $ - * $Date: 2002/02/20 04:01:57 $ + * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedLinkTag.java,v 1.5 2002/03/29 21:49:09 rleland Exp $ + * $Revision: 1.5 $ + * $Date: 2002/03/29 21:49:09 $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -59,7 +59,9 @@ */ package org.apache.struts.taglib.nested.html; -import org.apache.struts.taglib.nested.*; +import org.apache.struts.taglib.nested.NestedNameSupport; +import org.apache.struts.taglib.nested.NestedPropertyHelper; +import org.apache.struts.taglib.nested.NestedReference; import javax.servlet.jsp.*; import javax.servlet.jsp.tagext.*; import org.apache.struts.taglib.html.LinkTag; @@ -68,10 +70,10 @@ * NestedLinkTag. * @author Arron Bates * @since Struts 1.1 - * @version $Revision: 1.4 $ $Date: 2002/02/20 04:01:57 $ + * @version $Revision: 1.5 $ $Date: 2002/03/29 21:49:09 $ */ public class NestedLinkTag extends LinkTag implements NestedNameSupport { - + /** * Overriding method of the heart of the matter. Gets the relative property * and leaves the rest up to the original tag implementation. Sweet. @@ -79,23 +81,23 @@ * This is in the hands of the super class. */ public int doStartTag() throws JspException { - + /* decide the incoming options. Always two there are */ boolean doProperty = (origProperty != null && origProperty.length() > 0); boolean doParam = (origParam != null && origParam.length() > 0); - + /* if paramId is the way, set the name according to our bean */ if (getParamName() == null || "".equals(getParamName().trim())) { if (doParam) { setParamName(NestedPropertyHelper.getNestedNameProperty(this)); } } - + /* set name */ if (doProperty) { super.setName(NestedPropertyHelper.getNestedNameProperty(this)); } - + /* singleton tag implementations will need the original property to be set before running */ if (doProperty) { @@ -104,27 +106,27 @@ if (doParam) { super.setParamProperty(origParam); } - + /* let the NestedHelper set the properties it can */ isNesting = true; Tag pTag = NestedPropertyHelper.getNestingParentTag(this); - /* set the nested property value */ + /* set the nested property value */ if (doProperty) { setProperty(NestedPropertyHelper.getNestedProperty(getProperty(), pTag)); } - + /* set the nested version of the paramId */ if (doParam) { setParamProperty(NestedPropertyHelper.getNestedProperty(getParamProperty(),pTag)); } - + isNesting = false; - + /* do the tag */ return super.doStartTag(); } - + /** this is overridden so that properties being set by the JSP page aren't * written over by those needed by the extension. If the tag instance is * re-used by the JSP, the tag can set the property back to that set by the @@ -140,7 +142,7 @@ origProperty = newProperty; } } - + /** For the same reasons as the above method, we have to remember this * property to keep things correct here also. * @@ -154,7 +156,7 @@ origParam = newParamProperty; } } - + /* hold original property */ private String origProperty = null; private String origParam = null; 1.2 +11 -9 jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedMessagesTag.java Index: NestedMessagesTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedMessagesTag.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- NestedMessagesTag.java 19 Mar 2002 06:45:11 -0000 1.1 +++ NestedMessagesTag.java 29 Mar 2002 21:49:09 -0000 1.2 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedMessagesTag.java,v 1.1 2002/03/19 06:45:11 dwinterfeldt Exp $ - * $Revision: 1.1 $ - * $Date: 2002/03/19 06:45:11 $ + * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedMessagesTag.java,v 1.2 2002/03/29 21:49:09 rleland Exp $ + * $Revision: 1.2 $ + * $Date: 2002/03/29 21:49:09 $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -59,7 +59,9 @@ */ package org.apache.struts.taglib.nested.html; -import org.apache.struts.taglib.nested.*; +import org.apache.struts.taglib.nested.NestedPropertySupport; +import org.apache.struts.taglib.nested.NestedPropertyHelper; +import org.apache.struts.taglib.nested.NestedReference; import javax.servlet.jsp.*; import javax.servlet.jsp.tagext.*; import org.apache.struts.taglib.html.MessagesTag; @@ -69,10 +71,10 @@ * @author Arron Bates * @author David Winterfeldt * @since Struts 1.1 - * @version $Revision: 1.1 $ $Date: 2002/03/19 06:45:11 $ + * @version $Revision: 1.2 $ $Date: 2002/03/29 21:49:09 $ */ public class NestedMessagesTag extends MessagesTag implements NestedPropertySupport { - + /** * Overriding method of the heart of the matter. Gets the relative property * and leaves the rest up to the original tag implementation. Sweet. @@ -80,7 +82,7 @@ * This is in the hands of the super class. */ public int doStartTag() throws JspException { - + /* singleton tag implementations will need the original property to be set before running */ super.setProperty(originalProperty); @@ -93,7 +95,7 @@ /* do the tag */ return super.doStartTag(); } - + /** this is overridden so that properties being set by the JSP page aren't * written over by those needed by the extension. If the tag instance is * re-used by the JSP, the tag can set the property back to that set by the @@ -109,7 +111,7 @@ originalProperty = newProperty; } } - + /* hold original property */ private String originalProperty = null; private boolean isNesting = false; 1.3 +12 -10 jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedMultiboxTag.java Index: NestedMultiboxTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedMultiboxTag.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- NestedMultiboxTag.java 22 Jan 2002 03:30:50 -0000 1.2 +++ NestedMultiboxTag.java 29 Mar 2002 21:49:09 -0000 1.3 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedMultiboxTag.java,v 1.2 2002/01/22 03:30:50 arron Exp $ - * $Revision: 1.2 $ - * $Date: 2002/01/22 03:30:50 $ + * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedMultiboxTag.java,v 1.3 2002/03/29 21:49:09 rleland Exp $ + * $Revision: 1.3 $ + * $Date: 2002/03/29 21:49:09 $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -59,7 +59,9 @@ */ package org.apache.struts.taglib.nested.html; -import org.apache.struts.taglib.nested.*; +import org.apache.struts.taglib.nested.NestedNameSupport; +import org.apache.struts.taglib.nested.NestedPropertyHelper; +import org.apache.struts.taglib.nested.NestedReference; import javax.servlet.jsp.*; import javax.servlet.jsp.tagext.*; import org.apache.struts.taglib.html.MultiboxTag; @@ -68,7 +70,7 @@ * NestedMultiboxTag. * @author Arron Bates * @since Struts 1.1 - * @version $Revision: 1.2 $ $Date: 2002/01/22 03:30:50 $ + * @version $Revision: 1.3 $ $Date: 2002/03/29 21:49:09 $ */ public class NestedMultiboxTag extends MultiboxTag implements NestedNameSupport { @@ -79,20 +81,20 @@ * This is in the hands of the super class. */ public int doStartTag() throws JspException { - + /* singleton tag implementations will need the original property to be set before running */ super.setProperty(originalProperty); - + /* let the NestedHelper set the properties it can */ isNesting = true; NestedPropertyHelper.setNestedProperties(this); isNesting = false; - + /* do the tag */ return super.doStartTag(); } - + /** this is overridden so that properties being set by the JSP page aren't * written over by those needed by the extension. If the tag instance is * re-used by the JSP, the tag can set the property back to that set by the @@ -108,7 +110,7 @@ originalProperty = newProperty; } } - + /* hold original property */ private String originalProperty = null; private boolean isNesting = false; 1.2 +12 -10 jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedOptionsCollectionTag.java Index: NestedOptionsCollectionTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedOptionsCollectionTag.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- NestedOptionsCollectionTag.java 24 Feb 2002 17:21:50 -0000 1.1 +++ NestedOptionsCollectionTag.java 29 Mar 2002 21:49:09 -0000 1.2 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedOptionsCollectionTag.java,v 1.1 2002/02/24 17:21:50 arron Exp $ - * $Revision: 1.1 $ - * $Date: 2002/02/24 17:21:50 $ + * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedOptionsCollectionTag.java,v 1.2 2002/03/29 21:49:09 rleland Exp $ + * $Revision: 1.2 $ + * $Date: 2002/03/29 21:49:09 $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -59,7 +59,9 @@ */ package org.apache.struts.taglib.nested.html; -import org.apache.struts.taglib.nested.*; +import org.apache.struts.taglib.nested.NestedPropertySupport; +import org.apache.struts.taglib.nested.NestedPropertyHelper; +import org.apache.struts.taglib.nested.NestedReference; import javax.servlet.jsp.*; import javax.servlet.jsp.tagext.*; import org.apache.struts.taglib.html.OptionsCollectionTag; @@ -68,7 +70,7 @@ * NestedOptionsCollectionTag. * @author Arron Bates * @since Struts 1.1 - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ */ public class NestedOptionsCollectionTag extends OptionsCollectionTag implements NestedPropertySupport { @@ -80,20 +82,20 @@ * This is in the hands of the super class. */ public int doStartTag() throws JspException { - + /* singleton tag implementations will need the original property to be set before running */ super.setProperty(originalProperty); - + /* let the NestedHelper set the properties it can */ isNesting = true; NestedPropertyHelper.setNestedProperties(this); isNesting = false; - + /* do the tag */ return super.doStartTag(); } - + /** this is overridden so that properties being set by the JSP page aren't * written over by those needed by the extension. If the tag instance is * re-used by the JSP, the tag can set the property back to that set by the @@ -109,7 +111,7 @@ originalProperty = newProperty; } } - + /* hold original property */ private String originalProperty = null; private boolean isNesting = false; 1.4 +7 -5 jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedOptionsTag.java Index: NestedOptionsTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedOptionsTag.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- NestedOptionsTag.java 22 Jan 2002 03:30:50 -0000 1.3 +++ NestedOptionsTag.java 29 Mar 2002 21:49:09 -0000 1.4 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedOptionsTag.java,v 1.3 2002/01/22 03:30:50 arron Exp $ - * $Revision: 1.3 $ - * $Date: 2002/01/22 03:30:50 $ + * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedOptionsTag.java,v 1.4 2002/03/29 21:49:09 rleland Exp $ + * $Revision: 1.4 $ + * $Date: 2002/03/29 21:49:09 $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -59,7 +59,9 @@ */ package org.apache.struts.taglib.nested.html; -import org.apache.struts.taglib.nested.*; +import org.apache.struts.taglib.nested.NestedNameSupport; +import org.apache.struts.taglib.nested.NestedPropertyHelper; +import org.apache.struts.taglib.nested.NestedReference; import javax.servlet.jsp.*; import javax.servlet.jsp.tagext.*; import org.apache.struts.taglib.html.OptionsTag; @@ -68,7 +70,7 @@ * NestedOptionsTag. * @author Arron Bates * @since Struts 1.1 - * @version $Revision: 1.3 $ $Date: 2002/01/22 03:30:50 $ + * @version $Revision: 1.4 $ $Date: 2002/03/29 21:49:09 $ */ public class NestedOptionsTag extends OptionsTag implements NestedNameSupport { 1.3 +12 -10 jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedPasswordTag.java Index: NestedPasswordTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedPasswordTag.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- NestedPasswordTag.java 22 Jan 2002 03:30:50 -0000 1.2 +++ NestedPasswordTag.java 29 Mar 2002 21:49:09 -0000 1.3 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedPasswordTag.java,v 1.2 2002/01/22 03:30:50 arron Exp $ - * $Revision: 1.2 $ - * $Date: 2002/01/22 03:30:50 $ + * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedPasswordTag.java,v 1.3 2002/03/29 21:49:09 rleland Exp $ + * $Revision: 1.3 $ + * $Date: 2002/03/29 21:49:09 $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -59,7 +59,9 @@ */ package org.apache.struts.taglib.nested.html; -import org.apache.struts.taglib.nested.*; +import org.apache.struts.taglib.nested.NestedNameSupport; +import org.apache.struts.taglib.nested.NestedPropertyHelper; +import org.apache.struts.taglib.nested.NestedReference; import javax.servlet.jsp.*; import javax.servlet.jsp.tagext.*; import org.apache.struts.taglib.html.PasswordTag; @@ -68,7 +70,7 @@ * NestedPasswordTag. * @author Arron Bates * @since Struts 1.1 - * @version $Revision: 1.2 $ $Date: 2002/01/22 03:30:50 $ + * @version $Revision: 1.3 $ $Date: 2002/03/29 21:49:09 $ */ public class NestedPasswordTag extends PasswordTag implements NestedNameSupport { @@ -79,20 +81,20 @@ * This is in the hands of the super class. */ public int doStartTag() throws JspException { - + /* singleton tag implementations will need the original property to be set before running */ super.setProperty(originalProperty); - + /* let the NestedHelper set the properties it can */ isNesting = true; NestedPropertyHelper.setNestedProperties(this); isNesting = false; - + /* do the tag */ return super.doStartTag(); } - + /** this is overridden so that properties being set by the JSP page aren't * written over by those needed by the extension. If the tag instance is * re-used by the JSP, the tag can set the property back to that set by the @@ -108,7 +110,7 @@ originalProperty = newProperty; } } - + /* hold original property */ private String originalProperty = null; private boolean isNesting = false; 1.3 +12 -10 jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedRadioTag.java Index: NestedRadioTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedRadioTag.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- NestedRadioTag.java 22 Jan 2002 03:30:50 -0000 1.2 +++ NestedRadioTag.java 29 Mar 2002 21:49:09 -0000 1.3 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedRadioTag.java,v 1.2 2002/01/22 03:30:50 arron Exp $ - * $Revision: 1.2 $ - * $Date: 2002/01/22 03:30:50 $ + * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedRadioTag.java,v 1.3 2002/03/29 21:49:09 rleland Exp $ + * $Revision: 1.3 $ + * $Date: 2002/03/29 21:49:09 $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -59,7 +59,9 @@ */ package org.apache.struts.taglib.nested.html; -import org.apache.struts.taglib.nested.*; +import org.apache.struts.taglib.nested.NestedNameSupport; +import org.apache.struts.taglib.nested.NestedPropertyHelper; +import org.apache.struts.taglib.nested.NestedReference; import javax.servlet.jsp.*; import javax.servlet.jsp.tagext.*; import org.apache.struts.taglib.html.RadioTag; @@ -68,7 +70,7 @@ * NestedRadioTag. * @author Arron Bates * @since Struts 1.1 - * @version $Revision: 1.2 $ $Date: 2002/01/22 03:30:50 $ + * @version $Revision: 1.3 $ $Date: 2002/03/29 21:49:09 $ */ public class NestedRadioTag extends RadioTag implements NestedNameSupport { @@ -79,20 +81,20 @@ * This is in the hands of the super class. */ public int doStartTag() throws JspException { - + /* singleton tag implementations will need the original property to be set before running */ super.setProperty(originalProperty); - + /* let the NestedHelper set the properties it can */ isNesting = true; NestedPropertyHelper.setNestedProperties(this); isNesting = false; - + /* do the tag */ return super.doStartTag(); } - + /** this is overridden so that properties being set by the JSP page aren't * written over by those needed by the extension. If the tag instance is * re-used by the JSP, the tag can set the property back to that set by the @@ -108,7 +110,7 @@ originalProperty = newProperty; } } - + /* hold original property */ private String originalProperty = null; private boolean isNesting = false; 1.3 +12 -10 jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedSelectTag.java Index: NestedSelectTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedSelectTag.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- NestedSelectTag.java 22 Jan 2002 03:30:50 -0000 1.2 +++ NestedSelectTag.java 29 Mar 2002 21:49:09 -0000 1.3 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedSelectTag.java,v 1.2 2002/01/22 03:30:50 arron Exp $ - * $Revision: 1.2 $ - * $Date: 2002/01/22 03:30:50 $ + * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedSelectTag.java,v 1.3 2002/03/29 21:49:09 rleland Exp $ + * $Revision: 1.3 $ + * $Date: 2002/03/29 21:49:09 $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -59,7 +59,9 @@ */ package org.apache.struts.taglib.nested.html; -import org.apache.struts.taglib.nested.*; +import org.apache.struts.taglib.nested.NestedNameSupport; +import org.apache.struts.taglib.nested.NestedPropertyHelper; +import org.apache.struts.taglib.nested.NestedReference; import javax.servlet.jsp.*; import javax.servlet.jsp.tagext.*; import org.apache.struts.taglib.html.SelectTag; @@ -68,7 +70,7 @@ * NestedSelectTag. * @author Arron Bates * @since Struts 1.1 - * @version $Revision: 1.2 $ $Date: 2002/01/22 03:30:50 $ + * @version $Revision: 1.3 $ $Date: 2002/03/29 21:49:09 $ */ public class NestedSelectTag extends SelectTag implements NestedNameSupport { @@ -79,20 +81,20 @@ * This is in the hands of the super class. */ public int doStartTag() throws JspException { - + /* singleton tag implementations will need the original property to be set before running */ super.setProperty(originalProperty); - + /* let the NestedHelper set the properties it can */ isNesting = true; NestedPropertyHelper.setNestedProperties(this); isNesting = false; - + /* do the tag */ return super.doStartTag(); } - + /** this is overridden so that properties being set by the JSP page aren't * written over by those needed by the extension. If the tag instance is * re-used by the JSP, the tag can set the property back to that set by the @@ -108,7 +110,7 @@ originalProperty = newProperty; } } - + /* hold original property */ private String originalProperty = null; private boolean isNesting = false; 1.3 +12 -10 jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedSubmitTag.java Index: NestedSubmitTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedSubmitTag.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- NestedSubmitTag.java 22 Jan 2002 03:30:50 -0000 1.2 +++ NestedSubmitTag.java 29 Mar 2002 21:49:09 -0000 1.3 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedSubmitTag.java,v 1.2 2002/01/22 03:30:50 arron Exp $ - * $Revision: 1.2 $ - * $Date: 2002/01/22 03:30:50 $ + * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedSubmitTag.java,v 1.3 2002/03/29 21:49:09 rleland Exp $ + * $Revision: 1.3 $ + * $Date: 2002/03/29 21:49:09 $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -59,7 +59,9 @@ */ package org.apache.struts.taglib.nested.html; -import org.apache.struts.taglib.nested.*; +import org.apache.struts.taglib.nested.NestedPropertySupport; +import org.apache.struts.taglib.nested.NestedPropertyHelper; +import org.apache.struts.taglib.nested.NestedReference; import javax.servlet.jsp.*; import javax.servlet.jsp.tagext.*; import org.apache.struts.taglib.html.SubmitTag; @@ -68,7 +70,7 @@ * NestedSubmitTag. * @author Arron Bates * @since Struts 1.1 - * @version $Revision: 1.2 $ $Date: 2002/01/22 03:30:50 $ + * @version $Revision: 1.3 $ $Date: 2002/03/29 21:49:09 $ */ public class NestedSubmitTag extends SubmitTag implements NestedPropertySupport { @@ -79,20 +81,20 @@ * This is in the hands of the super class. */ public int doStartTag() throws JspException { - + /* singleton tag implementations will need the original property to be set before running */ super.setProperty(originalProperty); - + /* let the NestedHelper set the properties it can */ isNesting = true; NestedPropertyHelper.setNestedProperties(this); isNesting = false; - + /* do the tag */ return super.doStartTag(); } - + /** this is overridden so that properties being set by the JSP page aren't * written over by those needed by the extension. If the tag instance is * re-used by the JSP, the tag can set the property back to that set by the @@ -108,7 +110,7 @@ originalProperty = newProperty; } } - + /* hold original property */ private String originalProperty = null; private boolean isNesting = false; 1.3 +12 -10 jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedTextTag.java Index: NestedTextTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedTextTag.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- NestedTextTag.java 22 Jan 2002 03:30:50 -0000 1.2 +++ NestedTextTag.java 29 Mar 2002 21:49:09 -0000 1.3 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedTextTag.java,v 1.2 2002/01/22 03:30:50 arron Exp $ - * $Revision: 1.2 $ - * $Date: 2002/01/22 03:30:50 $ + * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedTextTag.java,v 1.3 2002/03/29 21:49:09 rleland Exp $ + * $Revision: 1.3 $ + * $Date: 2002/03/29 21:49:09 $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -59,7 +59,9 @@ */ package org.apache.struts.taglib.nested.html; -import org.apache.struts.taglib.nested.*; +import org.apache.struts.taglib.nested.NestedNameSupport; +import org.apache.struts.taglib.nested.NestedPropertyHelper; +import org.apache.struts.taglib.nested.NestedReference; import javax.servlet.jsp.*; import javax.servlet.jsp.tagext.*; import org.apache.struts.taglib.html.TextTag; @@ -68,7 +70,7 @@ * NestedTextTag. * @author Arron Bates * @since Struts 1.1 - * @version $Revision: 1.2 $ $Date: 2002/01/22 03:30:50 $ + * @version $Revision: 1.3 $ $Date: 2002/03/29 21:49:09 $ */ public class NestedTextTag extends TextTag implements NestedNameSupport { @@ -79,20 +81,20 @@ * This is in the hands of the super class. */ public int doStartTag() throws JspException { - + /* singleton tag implementations will need the original property to be set before running */ super.setProperty(originalProperty); - + /* let the NestedHelper set the properties it can */ isNesting = true; NestedPropertyHelper.setNestedProperties(this); isNesting = false; - + /* do the tag */ return super.doStartTag(); } - + /** this is overridden so that properties being set by the JSP page aren't * written over by those needed by the extension. If the tag instance is * re-used by the JSP, the tag can set the property back to that set by the @@ -108,7 +110,7 @@ originalProperty = newProperty; } } - + /* hold original property */ private String originalProperty = null; private boolean isNesting = false; 1.3 +12 -10 jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedTextareaTag.java Index: NestedTextareaTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedTextareaTag.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- NestedTextareaTag.java 22 Jan 2002 03:30:50 -0000 1.2 +++ NestedTextareaTag.java 29 Mar 2002 21:49:09 -0000 1.3 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedTextareaTag.java,v 1.2 2002/01/22 03:30:50 arron Exp $ - * $Revision: 1.2 $ - * $Date: 2002/01/22 03:30:50 $ + * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedTextareaTag.java,v 1.3 2002/03/29 21:49:09 rleland Exp $ + * $Revision: 1.3 $ + * $Date: 2002/03/29 21:49:09 $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -59,7 +59,9 @@ */ package org.apache.struts.taglib.nested.html; -import org.apache.struts.taglib.nested.*; +import org.apache.struts.taglib.nested.NestedNameSupport; +import org.apache.struts.taglib.nested.NestedPropertyHelper; +import org.apache.struts.taglib.nested.NestedReference; import javax.servlet.jsp.*; import javax.servlet.jsp.tagext.*; import org.apache.struts.taglib.html.TextareaTag; @@ -68,7 +70,7 @@ * NestedTextareaTag. * @author Arron Bates * @since Struts 1.1 - * @version $Revision: 1.2 $ $Date: 2002/01/22 03:30:50 $ + * @version $Revision: 1.3 $ $Date: 2002/03/29 21:49:09 $ */ public class NestedTextareaTag extends TextareaTag implements NestedNameSupport { @@ -79,20 +81,20 @@ * This is in the hands of the super class. */ public int doStartTag() throws JspException { - + /* singleton tag implementations will need the original property to be set before running */ super.setProperty(originalProperty); - + /* let the NestedHelper set the properties it can */ isNesting = true; NestedPropertyHelper.setNestedProperties(this); isNesting = false; - + /* do the tag */ return super.doStartTag(); } - + /** this is overridden so that properties being set by the JSP page aren't * written over by those needed by the extension. If the tag instance is * re-used by the JSP, the tag can set the property back to that set by the @@ -108,7 +110,7 @@ originalProperty = newProperty; } } - + /* hold original property */ private String originalProperty = null; private boolean isNesting = false;
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>