craigmcc 01/05/04 14:49:34 Modified: src/exercise-taglib/org/apache/struts/webapp/exercise TestBean.java web/exercise-taglib logic-compare.jsp Log: Add examples for using <logic:equal> and <logic:notEqual> on boolean properties. Revision Changes Path 1.2 +18 -4 jakarta-struts/src/exercise-taglib/org/apache/struts/webapp/exercise/TestBean.java Index: TestBean.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/exercise-taglib/org/apache/struts/webapp/exercise/TestBean.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- TestBean.java 2001/04/11 01:55:37 1.1 +++ TestBean.java 2001/05/04 21:49:27 1.2 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-struts/src/exercise-taglib/org/apache/struts/webapp/exercise/TestBean.java,v 1.1 2001/04/11 01:55:37 rleland Exp $ - * $Revision: 1.1 $ - * $Date: 2001/04/11 01:55:37 $ + * $Header: /home/cvs/jakarta-struts/src/exercise-taglib/org/apache/struts/webapp/exercise/TestBean.java,v 1.2 2001/05/04 21:49:27 craigmcc Exp $ + * $Revision: 1.2 $ + * $Date: 2001/05/04 21:49:27 $ * * ==================================================================== * @@ -72,7 +72,7 @@ * General purpose test bean for Struts custom tag tests. * * @author Craig R. McClanahan - * @version $Revision: 1.1 $ $Date: 2001/04/11 01:55:37 $ + * @version $Revision: 1.2 $ $Date: 2001/05/04 21:49:27 $ */ public class TestBean extends ActionForm { @@ -82,7 +82,7 @@ /** - * A boolean property. + * A boolean property whose initial value is true. */ private boolean booleanProperty = true; @@ -106,6 +106,20 @@ public void setDoubleProperty(double doubleProperty) { this.doubleProperty = doubleProperty; + } + + + /** + * A boolean property whose initial value is false + */ + private boolean falseProperty = false; + + public boolean getFalseProperty() { + return (falseProperty); + } + + public void setFalseProperty(boolean falseProperty) { + this.falseProperty = falseProperty; } 1.4 +66 -0 jakarta-struts/web/exercise-taglib/logic-compare.jsp Index: logic-compare.jsp =================================================================== RCS file: /home/cvs/jakarta-struts/web/exercise-taglib/logic-compare.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- logic-compare.jsp 2001/04/11 01:56:12 1.3 +++ logic-compare.jsp 2001/05/04 21:49:31 1.4 @@ -13,6 +13,8 @@ <jsp:useBean id="bean" scope="page" class="org.apache.struts.webapp.exercise.TestBean"/> <% + String bool1 = "true"; + String bool2 = "false"; String doub1 = "321.0"; String doub2 = "111.0"; String doub3 = "333.0"; @@ -34,6 +36,70 @@ <th>Value Content </th> <th>Correct Value</th> <th>Test Result</th> + </tr> + <tr> + <td>boolean / EQ</td> + <td><bean:write name="bean" property="booleanProperty"/></td> + <td><%= bool1 %></td> + <td>equal</td> + <td> + <logic:equal name="bean" property="booleanProperty" + value="<%= bool1 %>"> + equal + </logic:equal> + <logic:notEqual name="bean" property="booleanProperty" + value="<%= bool1 %>"> + notEqual + </logic:notEqual> + </td> + </tr> + <tr> + <td>boolean / EQ</td> + <td><bean:write name="bean" property="falseProperty"/></td> + <td><%= bool2 %></td> + <td>equal</td> + <td> + <logic:equal name="bean" property="falseProperty" + value="<%= bool2 %>"> + equal + </logic:equal> + <logic:notEqual name="bean" property="falseProperty" + value="<%= bool2 %>"> + notEqual + </logic:notEqual> + </td> + </tr> + <tr> + <td>boolean / NE</td> + <td><bean:write name="bean" property="booleanProperty"/></td> + <td><%= bool2 %></td> + <td>notEqual</td> + <td> + <logic:equal name="bean" property="booleanProperty" + value="<%= bool2 %>"> + equal + </logic:equal> + <logic:notEqual name="bean" property="booleanProperty" + value="<%= bool2 %>"> + notEqual + </logic:notEqual> + </td> + </tr> + <tr> + <td>boolean / NE</td> + <td><bean:write name="bean" property="falseProperty"/></td> + <td><%= bool1 %></td> + <td>notEqual</td> + <td> + <logic:equal name="bean" property="falseProperty" + value="<%= bool1 %>"> + equal + </logic:equal> + <logic:notEqual name="bean" property="falseProperty" + value="<%= bool1 %>"> + notEqual + </logic:notEqual> + </td> </tr> <tr> <td>double / EQ</td>