husted 2002/06/24 17:53:41 Modified: src/share/org/apache/struts/taglib/logic NotEmptyTag.java MessagesPresentTag.java MessagesNotPresentTag.java EmptyTag.java Log: Update JavaDocs for Struts 1.1 Revision Changes Path 1.2 +5 -4 jakarta-struts/src/share/org/apache/struts/taglib/logic/NotEmptyTag.java Index: NotEmptyTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/logic/NotEmptyTag.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- NotEmptyTag.java 8 Jul 2001 04:15:13 -0000 1.1 +++ NotEmptyTag.java 25 Jun 2002 00:53:41 -0000 1.2 @@ -72,6 +72,7 @@ * * @author Martin Cooper * @version $Revision$ $Date$ + * @since Struts 1.1 */ public class NotEmptyTag extends EmptyTag { 1.3 +13 -11 jakarta-struts/src/share/org/apache/struts/taglib/logic/MessagesPresentTag.java Index: MessagesPresentTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/logic/MessagesPresentTag.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- MessagesPresentTag.java 16 Oct 2001 17:05:36 -0000 1.2 +++ MessagesPresentTag.java 25 Jun 2002 00:53:41 -0000 1.3 @@ -66,12 +66,14 @@ /** - * Evalute to <code>true</code> if an <code>ActionMessages</code> class or a - * class that can be converted to an <code>ActionMessages</code> class is in - * request scope under the specified key and there is at least one message in the + * Evalute to <code>true</code> if an <code>ActionMessages</code> class or a + * class that can be converted to an <code>ActionMessages</code> class is in + * request scope under the specified key and there is at least one message in the * class or for the property specified. * * @author David Winterfeldt + * @version $Revision$ $Date$ + * @since Struts 1.1 */ public class MessagesPresentTag extends ConditionalTagBase { @@ -82,7 +84,7 @@ */ protected String message = null; - + public MessagesPresentTag() { name = Action.ERROR_KEY; } @@ -94,7 +96,7 @@ public void setMessage(String message) { this.message = message; } - + /** * Evaluate the condition that is being tested by this particular tag, * and return <code>true</code> if the nested body content of this tag @@ -112,7 +114,7 @@ /** * Evaluate the condition that is being tested by this particular tag, - * and return <code>true</code> if there is at least one message in the + * and return <code>true</code> if there is at least one message in the * class or for the property specified. * This method must be implemented by concrete subclasses. * @@ -121,8 +123,8 @@ * @exception JspException if a JSP exception occurs */ protected boolean condition(boolean desired) throws JspException { - ActionMessages am = null; - + ActionMessages am = null; + if (message != null && "true".equalsIgnoreCase(message)) name = Action.MESSAGE_KEY; @@ -130,11 +132,11 @@ boolean bMessages = false; try { - // Definitely know it should be an error so + // Definitely know it should be an error so // use method to retrieve errors. if (Action.ERROR_KEY.equals(name)) am = RequestUtils.getActionErrors(pageContext, name); - else + else am = RequestUtils.getActionMessages(pageContext, name); } catch(JspException e) { RequestUtils.saveException(pageContext, e); @@ -147,7 +149,7 @@ iterator = am.get(); else iterator = am.get(property); - + if (iterator.hasNext()) bMessages = true; 1.2 +2 -0 jakarta-struts/src/share/org/apache/struts/taglib/logic/MessagesNotPresentTag.java Index: MessagesNotPresentTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/logic/MessagesNotPresentTag.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- MessagesNotPresentTag.java 16 Oct 2001 15:52:12 -0000 1.1 +++ MessagesNotPresentTag.java 25 Jun 2002 00:53:41 -0000 1.2 @@ -65,6 +65,8 @@ * is not present for this request. * * @author David Winterfeldt + * @version $Revision$ $Date$ + * @since Struts 1.1 */ public class MessagesNotPresentTag extends MessagesPresentTag { 1.3 +5 -4 jakarta-struts/src/share/org/apache/struts/taglib/logic/EmptyTag.java Index: EmptyTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/logic/EmptyTag.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- EmptyTag.java 13 May 2002 02:54:00 -0000 1.2 +++ EmptyTag.java 25 Jun 2002 00:53:41 -0000 1.3 @@ -73,6 +73,7 @@ * * @author Martin Cooper * @version $Revision$ $Date$ + * @since Struts 1.1 */ public class EmptyTag extends ConditionalTagBase {
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>