struts-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hus...@apache.org
Subject svn commit: r376788 [2/3] - /struts/el/trunk/web/exercise-taglib/
Date Fri, 10 Feb 2006 18:27:41 GMT
Modified: struts/el/trunk/web/exercise-taglib/html-messages.jsp
URL: http://svn.apache.org/viewcvs/struts/el/trunk/web/exercise-taglib/html-messages.jsp?rev=376788&r1=376787&r2=376788&view=diff
==============================================================================
--- struts/el/trunk/web/exercise-taglib/html-messages.jsp (original)
+++ struts/el/trunk/web/exercise-taglib/html-messages.jsp Fri Feb 10 10:27:39 2006
@@ -1,148 +1,155 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<%@ page language="java" import="org.apache.struts.action.*,
-                                 org.apache.struts.Globals" %>
+<%@ page language="java" import="org.apache.struts.Globals,
+                                 org.apache.struts.action.ActionMessage" %>
+<%@ page import="org.apache.struts.action.ActionMessages"%>
 <%@ taglib uri="http://struts.apache.org/tags-html-el" prefix="html-el" %>
 <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 <html>
 <head>
-<title>Test Error and Message Tags</title>
-<%
-  ActionMessages errors = new ActionMessages();
-  errors.add("property1", new ActionMessage("property1error1"));
-  errors.add("property2", new ActionMessage("property2error1"));
-  errors.add("property2", new ActionMessage("property2error2"));
-  errors.add("property2", new ActionMessage("property2error3"));
-  errors.add("property3", new ActionMessage("property3error1"));
-  errors.add("property3", new ActionMessage("property3error2"));
-  errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("globalError"));
-  request.setAttribute(Globals.ERROR_KEY, errors);
-
-  ActionMessages messages = new ActionMessages();
-  messages.add("property1", new ActionMessage("property1message1"));
-  messages.add("property2", new ActionMessage("property2message1"));
-  messages.add("property2", new ActionMessage("property2message2"));
-  messages.add("property2", new ActionMessage("property2message3"));
-  messages.add("property3", new ActionMessage("property3message1"));
-  messages.add("property3", new ActionMessage("property3message2"));
-  messages.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("globalMessage"));
-  request.setAttribute(Globals.MESSAGE_KEY, messages);
-%>
+    <title>Test Error and Message Tags</title>
+    <%
+        ActionMessages errors = new ActionMessages();
+        errors.add("property1", new ActionMessage("property1error1"));
+        errors.add("property2", new ActionMessage("property2error1"));
+        errors.add("property2", new ActionMessage("property2error2"));
+        errors.add("property2", new ActionMessage("property2error3"));
+        errors.add("property3", new ActionMessage("property3error1"));
+        errors.add("property3", new ActionMessage("property3error2"));
+        errors.add(ActionMessages.GLOBAL_MESSAGE,
+                new ActionMessage("globalError"));
+        request.setAttribute(Globals.ERROR_KEY, errors);
+
+        ActionMessages messages = new ActionMessages();
+        messages.add("property1", new ActionMessage("property1message1"));
+        messages.add("property2", new ActionMessage("property2message1"));
+        messages.add("property2", new ActionMessage("property2message2"));
+        messages.add("property2", new ActionMessage("property2message3"));
+        messages.add("property3", new ActionMessage("property3message1"));
+        messages.add("property3", new ActionMessage("property3message2"));
+        messages.add(ActionMessages.GLOBAL_MESSAGE,
+                new ActionMessage("globalMessage"));
+        request.setAttribute(Globals.MESSAGE_KEY, messages);
+    %>
 </head>
+
 <body bgcolor="white">
 
 <div align="center">
-<h1>Test Error and Message Tags</h1>
+    <h1>Test Error and Message Tags</h1>
 </div>
 
 <h3>ERRORS Tag</h3>
 
 <table border="1">
-  <tr>
-    <th>Test Type</th>
-    <th>Correct Value</th>
-    <th>Test Result</th>
-  </tr>
-  <tr>
-    <td>Errors for Property 1</td>
-    <td>
-      <table>
-        <tr><td>Property 1, Error 1</td></tr>
-      </table>
-    </td>
-    <td>
-      <html-el:errors property="property1"/>
-    </td>
-  </tr>
-  <tr>
-    <td>Errors for Property 2</td>
-    <td>
-      <table>
-        <tr><td>Property 2, Error 1</td></tr>
-        <tr><td>Property 2, Error 2</td></tr>
-        <tr><td>Property 2, Error 3</td></tr>
-      </table>
-    </td>
-    <td>
-      <html-el:errors property="property2"/>
-    </td>
-  </tr>
-  <tr>
-    <td>All Errors</td>
-    <td>
-      <table>
-        <tr><td>Property 1, Error 1</td></tr>
-        <tr><td>Property 2, Error 1</td></tr>
-        <tr><td>Property 2, Error 2</td></tr>
-        <tr><td>Property 2, Error 3</td></tr>
-        <tr><td>Property 3, Error 1</td></tr>
-        <tr><td>Property 3, Error 2</td></tr>
-        <tr><td>Global Error</td></tr>
-      </table>
-    </td>
-    <td>
-      <html-el:errors/>
-    </td>
-  </tr>
+    <tr>
+        <th>Test Type</th>
+        <th>Correct Value</th>
+        <th>Test Result</th>
+    </tr>
+    <tr>
+        <td>Errors for Property 1</td>
+        <td>
+            <table>
+                <tr><td>Property 1, Error 1</td></tr>
+            </table>
+        </td>
+        <td>
+            <html-el:errors property="property1"/>
+        </td>
+    </tr>
+    <tr>
+        <td>Errors for Property 2</td>
+        <td>
+            <table>
+                <tr><td>Property 2, Error 1</td></tr>
+                <tr><td>Property 2, Error 2</td></tr>
+                <tr><td>Property 2, Error 3</td></tr>
+            </table>
+        </td>
+        <td>
+            <html-el:errors property="property2"/>
+        </td>
+    </tr>
+    <tr>
+        <td>All Errors</td>
+        <td>
+            <table>
+                <tr><td>Property 1, Error 1</td></tr>
+                <tr><td>Property 2, Error 1</td></tr>
+                <tr><td>Property 2, Error 2</td></tr>
+                <tr><td>Property 2, Error 3</td></tr>
+                <tr><td>Property 3, Error 1</td></tr>
+                <tr><td>Property 3, Error 2</td></tr>
+                <tr><td>Global Error</td></tr>
+            </table>
+        </td>
+        <td>
+            <html-el:errors/>
+        </td>
+    </tr>
 </table>
 
 <h3>MESSAGES Tag</h3>
 
 <table border="1">
-  <tr>
-    <th>Test Type</th>
-    <th>Correct Value</th>
-    <th>Test Result</th>
-  </tr>
-  <tr>
-    <td>Messages for Property 1</td>
-    <td>
-      <table>
-        <tr><td>Property 1, Message 1</td></tr>
-      </table>
-    </td>
-    <td>
-      <html-el:messages property="property1" message="true" id="msg"
-          header="messages.header" footer="messages.footer">
-        <tr><td><c:out value="${msg}"/></td></tr>
-      </html-el:messages>
-    </td>
-  </tr>
-  <tr>
-    <td>Messages for Property 2</td>
-    <td>
-      <table>
-        <tr><td>Property 2, Message 1</td></tr>
-        <tr><td>Property 2, Message 2</td></tr>
-        <tr><td>Property 2, Message 3</td></tr>
-      </table>
-    </td>
-    <td>
-      <html-el:messages property="property2" message="true" id="msg"
-        header="messages.header" footer="messages.footer">
-        <tr><td><c:out value="${msg}"/></td></tr>
-      </html-el:messages>
-    </td>
-  </tr>
-  <tr>
-    <td>All Messages</td>
-    <td>
-      <table>
-        <tr><td>Property 1, Message 1</td></tr>
-        <tr><td>Property 2, Message 1</td></tr>
-        <tr><td>Property 2, Message 2</td></tr>
-        <tr><td>Property 2, Message 3</td></tr>
-        <tr><td>Property 3, Message 1</td></tr>
-        <tr><td>Property 3, Message 2</td></tr>
-        <tr><td>Global Message</td></tr>
-      </table>
-    </td>
-    <td>
-      <html-el:messages message="true" id="msg"
-          header="messages.header" footer="messages.footer">
-        <tr><td><c:out value="${msg}"/></td></tr>
-      </html-el:messages>
-    </td>
-  </tr>
+    <tr>
+        <th>Test Type</th>
+        <th>Correct Value</th>
+        <th>Test Result</th>
+    </tr>
+    <tr>
+        <td>Messages for Property 1</td>
+        <td>
+            <table>
+                <tr><td>Property 1, Message 1</td></tr>
+            </table>
+        </td>
+        <td>
+            <html-el:messages property="property1" message="true" id="msg"
+                              header="messages.header"
+                              footer="messages.footer">
+                <tr><td><c:out value="${msg}"/></td></tr>
+            </html-el:messages>
+        </td>
+    </tr>
+    <tr>
+        <td>Messages for Property 2</td>
+        <td>
+            <table>
+                <tr><td>Property 2, Message 1</td></tr>
+                <tr><td>Property 2, Message 2</td></tr>
+                <tr><td>Property 2, Message 3</td></tr>
+            </table>
+        </td>
+        <td>
+            <html-el:messages property="property2" message="true" id="msg"
+                              header="messages.header"
+                              footer="messages.footer">
+                <tr><td><c:out value="${msg}"/></td></tr>
+            </html-el:messages>
+        </td>
+    </tr>
+    <tr>
+        <td>All Messages</td>
+        <td>
+            <table>
+                <tr><td>Property 1, Message 1</td></tr>
+                <tr><td>Property 2, Message 1</td></tr>
+                <tr><td>Property 2, Message 2</td></tr>
+                <tr><td>Property 2, Message 3</td></tr>
+                <tr><td>Property 3, Message 1</td></tr>
+                <tr><td>Property 3, Message 2</td></tr>
+                <tr><td>Global Message</td></tr>
+            </table>
+        </td>
+        <td>
+            <html-el:messages message="true" id="msg"
+                              header="messages.header"
+                              footer="messages.footer">
+                <tr><td><c:out value="${msg}"/></td></tr>
+            </html-el:messages>
+        </td>
+    </tr>
 
 </table>
 

Modified: struts/el/trunk/web/exercise-taglib/html-multibox.jsp
URL: http://svn.apache.org/viewcvs/struts/el/trunk/web/exercise-taglib/html-multibox.jsp?rev=376788&r1=376787&r2=376788&view=diff
==============================================================================
--- struts/el/trunk/web/exercise-taglib/html-multibox.jsp (original)
+++ struts/el/trunk/web/exercise-taglib/html-multibox.jsp Fri Feb 10 10:27:39 2006
@@ -1,190 +1,190 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<%@ page language="java"%>
+<%@ page language="java" %>
 <%@ taglib uri="http://struts.apache.org/tags-bean-el" prefix="bean-el" %>
 <%@ taglib uri="http://struts.apache.org/tags-html-el" prefix="html-el" %>
 <%@ taglib uri="http://struts.apache.org/tags-logic-el" prefix="logic-el" %>
 <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 <html-el:html>
 <head>
-<title>Test html-el:multibox Tag</title>
+    <title>Test html-el:multibox Tag</title>
 </head>
 <body bgcolor="white">
 
 <div align="center">
-<h1>Test struts html-el:multibox Tag</h1>
+    <h1>Test struts html-el:multibox Tag</h1>
 </div>
 
 Whatever changes you make to properties should be reflected when the page
-is redisplayed.  When first started, all of the listed checkboxes should
-be selected.  Press "Save" to update, or "Cancel" to return to the
+is redisplayed. When first started, all of the listed checkboxes should
+be selected. Press "Save" to update, or "Cancel" to return to the
 main menu.
 
 <html-el:form action="html-multibox.do">
 <table border="0" width="100%">
 
-  <tr>
+<tr>
     <th align="center" colspan="4">String Array Values</th>
-  </tr>
+</tr>
 
-  <tr>
+<tr>
     <th align="right">String 0</th>
     <td align="left">
-      <html-el:multibox property="stringMultibox">
-        String 0
-      </html-el:multibox>
+        <html-el:multibox property="stringMultibox">
+            String 0
+        </html-el:multibox>
     </td>
     <th align="right">(nested) String 0</th>
     <td align="left">
-      <html-el:multibox property="nested.stringMultibox" value="String 0"/>
+        <html-el:multibox property="nested.stringMultibox" value="String 0"/>
     </td>
-  </tr>
+</tr>
 
-  <tr>
+<tr>
     <th align="right">String 1</th>
     <td align="left">
-      <html-el:multibox property="stringMultibox">
-        String 1
-      </html-el:multibox>
+        <html-el:multibox property="stringMultibox">
+            String 1
+        </html-el:multibox>
     </td>
     <th align="right">(nested) String 1</th>
     <td align="left">
-      <html-el:multibox property="nested.stringMultibox" value="String 1"/>
+        <html-el:multibox property="nested.stringMultibox" value="String 1"/>
     </td>
-  </tr>
+</tr>
 
-  <tr>
+<tr>
     <th align="right">String 2</th>
     <td align="left">
-      <html-el:multibox property="stringMultibox">
-        String 2
-      </html-el:multibox>
+        <html-el:multibox property="stringMultibox">
+            String 2
+        </html-el:multibox>
     </td>
     <th align="right">(nested) String 2</th>
     <td align="left">
-      <html-el:multibox property="nested.stringMultibox" value="String 2"/>
+        <html-el:multibox property="nested.stringMultibox" value="String 2"/>
     </td>
-  </tr>
+</tr>
 
-  <tr>
+<tr>
     <th align="right">String 3</th>
     <td align="left">
-      <html-el:multibox property="stringMultibox">
-        String 3
-      </html-el:multibox>
+        <html-el:multibox property="stringMultibox">
+            String 3
+        </html-el:multibox>
     </td>
     <th align="right">(nested) String 3</th>
     <td align="left">
-      <html-el:multibox property="nested.stringMultibox" value="String 3"/>
+        <html-el:multibox property="nested.stringMultibox" value="String 3"/>
     </td>
-  </tr>
+</tr>
 
-  <tr>
+<tr>
     <th align="right">String 4</th>
     <td align="left">
-      <html-el:multibox property="stringMultibox">
-        String 4
-      </html-el:multibox>
+        <html-el:multibox property="stringMultibox">
+            String 4
+        </html-el:multibox>
     </td>
     <th align="right">(nested) String 4</th>
     <td align="left">
-      <html-el:multibox property="nested.stringMultibox" value="String 4"/>
+        <html-el:multibox property="nested.stringMultibox" value="String 4"/>
     </td>
-  </tr>
+</tr>
 
-  <tr>
+<tr>
     <th align="center" colspan="4">Integer Array Values</th>
-  </tr>
+</tr>
 
-  <tr>
+<tr>
     <th align="right">0</th>
     <td align="left">
-      <html-el:multibox property="intMultibox" value="0"/>
+        <html-el:multibox property="intMultibox" value="0"/>
     </td>
     <th align="right">(nested) 0</th>
     <td align="left">
-      <html-el:multibox property="nested.intMultibox">
-        0
-      </html-el:multibox>
+        <html-el:multibox property="nested.intMultibox">
+            0
+        </html-el:multibox>
     </td>
-  </tr>
+</tr>
 
-  <tr>
+<tr>
     <th align="right">10</th>
     <td align="left">
-      <html-el:multibox property="intMultibox" value="10"/>
+        <html-el:multibox property="intMultibox" value="10"/>
     </td>
     <th align="right">(nested) 10</th>
     <td align="left">
-      <html-el:multibox property="nested.intMultibox">
-        10
-      </html-el:multibox>
+        <html-el:multibox property="nested.intMultibox">
+            10
+        </html-el:multibox>
     </td>
-  </tr>
+</tr>
 
-  <tr>
+<tr>
     <th align="right">20</th>
     <td align="left">
-      <html-el:multibox property="intMultibox" value="20"/>
+        <html-el:multibox property="intMultibox" value="20"/>
     </td>
     <th align="right">(nested) 20</th>
     <td align="left">
-      <html-el:multibox property="nested.intMultibox">
-        20
-      </html-el:multibox>
+        <html-el:multibox property="nested.intMultibox">
+            20
+        </html-el:multibox>
     </td>
-  </tr>
+</tr>
 
-  <tr>
+<tr>
     <th align="right">30</th>
     <td align="left">
-      <html-el:multibox property="intMultibox" value="30"/>
+        <html-el:multibox property="intMultibox" value="30"/>
     </td>
     <th align="right">(nested) 30</th>
     <td align="left">
-      <html-el:multibox property="nested.intMultibox">
-        30
-      </html-el:multibox>
+        <html-el:multibox property="nested.intMultibox">
+            30
+        </html-el:multibox>
     </td>
-  </tr>
+</tr>
 
-  <tr>
+<tr>
     <th align="right">40</th>
     <td align="left">
-      <html-el:multibox property="intMultibox" value="40"/>
+        <html-el:multibox property="intMultibox" value="40"/>
     </td>
     <th align="right">(nested) 40</th>
     <td align="left">
-      <html-el:multibox property="nested.intMultibox">
-        40
-      </html-el:multibox>
+        <html-el:multibox property="nested.intMultibox">
+            40
+        </html-el:multibox>
     </td>
-  </tr>
+</tr>
 
-  <tr>
+<tr>
     <th align="right">50</th>
     <td align="left">
-      <html-el:multibox property="intMultibox" value="50"/>
+        <html-el:multibox property="intMultibox" value="50"/>
     </td>
     <th align="right">(nested) 50</th>
     <td align="left">
-      <html-el:multibox property="nested.intMultibox"
-                        disabled="${!empty pageScope}">
-        50
-      </html-el:multibox>
+        <html-el:multibox property="nested.intMultibox"
+                          disabled="${!empty pageScope}">
+            50
+        </html-el:multibox>
     </td>
-  </tr>
+</tr>
 
-  <tr>
+<tr>
     <td>&nbsp;</td>
     <td align="right">
-      <html-el:submit>Save</html-el:submit>
+        <html-el:submit>Save</html-el:submit>
     </td>
     <td align="left">
-      <html-el:reset>Reset</html-el:reset>
-      <html-el:cancel>Cancel</html-el:cancel>
+        <html-el:reset>Reset</html-el:reset>
+        <html-el:cancel>Cancel</html-el:cancel>
     </td>
     <td>&nbsp;</td>
-  </tr>
+</tr>
 
 </table>
 

Modified: struts/el/trunk/web/exercise-taglib/html-radio.jsp
URL: http://svn.apache.org/viewcvs/struts/el/trunk/web/exercise-taglib/html-radio.jsp?rev=376788&r1=376787&r2=376788&view=diff
==============================================================================
--- struts/el/trunk/web/exercise-taglib/html-radio.jsp (original)
+++ struts/el/trunk/web/exercise-taglib/html-radio.jsp Fri Feb 10 10:27:39 2006
@@ -1,73 +1,76 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<%@ page language="java"%>
+<%@ page language="java" %>
 <%@ taglib uri="http://struts.apache.org/tags-bean-el" prefix="bean-el" %>
 <%@ taglib uri="http://struts.apache.org/tags-html-el" prefix="html-el" %>
 <%@ taglib uri="http://struts.apache.org/tags-logic-el" prefix="logic-el" %>
 <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 <html-el:html>
- <head>
-  <title>Test html-el:radio Tag</title>
- </head>
- <body bgcolor="white">
+    <head>
+        <title>Test html-el:radio Tag</title>
+    </head>
 
-  <div align="center">
-   <h1>Test struts html-el:radio Tag</h1>
-  </div>
+    <body bgcolor="white">
 
-  <html-el:form action="html-radio.do">
-   <table>
-    <tr>
-     <td>
-      <html-el:radio property="stringProperty" value="flagOne"
-                     title="Flag One" tabindex="3" accesskey="1"
-                     disabled="${!empty pageScope}"/>
-     </td>
-     <td>flag one</td>
-    </tr>
-    <tr>
-     <td>
-      <html-el:radio property="stringProperty" value="flagTwo"
-                     title="Flag Two" tabindex="2" accesskey="2"/>
-     </td>
-     <td>flag two</td>
-    </tr>
-    <tr>
-     <td>
-      <html-el:radio property="stringProperty" value="flagThree"
-                     title="Flag Three" tabindex="1" accesskey="3"
-                     onblur="showevent(event)"
-                     onchange="showevent(event)"
-                     onclick="showevent(event)"
-                     ondblclick="showevent(event)"
-                     onfocus="showevent(event)"
-                     onkeydown="showevent(event)"
-                     onkeypress="showevent(event)"
-                     onkeyup="showevent(event)"
-                     onmousedown="showevent(event)"
-                     onmousemove="showevent(event)"
-                     onmouseout="showevent(event)"
-                     onmouseover="showevent(event)"
-                     onmouseup="showevent(event)"
-      />
-     </td>
-     <td>flag three</td>
-    </tr>
-    <tr>
-     <td>
-      <html-el:submit>Save</html-el:submit>
-     </td>
-    </tr>
-   </table>
-  </html-el:form>
+    <div align="center">
+        <h1>Test struts html-el:radio Tag</h1>
+    </div>
 
-  <script>
-   <!--
-    function showevent(evt)
-	 {
-        window.status = evt.type;
-    }
-    // -->
-  </script>
+    <html-el:form action="html-radio.do">
+        <table>
+            <tr>
+                <td>
+                    <html-el:radio property="stringProperty" value="flagOne"
+                                   title="Flag One" tabindex="3" accesskey="1"
+                                   disabled="${!empty pageScope}"/>
+                </td>
+                <td>flag one</td>
+            </tr>
+            <tr>
+                <td>
+                    <html-el:radio property="stringProperty" value="flagTwo"
+                                   title="Flag Two" tabindex="2"
+                                   accesskey="2"/>
+                </td>
+                <td>flag two</td>
+            </tr>
+            <tr>
+                <td>
+                    <html-el:radio property="stringProperty" value="flagThree"
+                                   title="Flag Three" tabindex="1"
+                                   accesskey="3"
+                                   onblur="showevent(event)"
+                                   onchange="showevent(event)"
+                                   onclick="showevent(event)"
+                                   ondblclick="showevent(event)"
+                                   onfocus="showevent(event)"
+                                   onkeydown="showevent(event)"
+                                   onkeypress="showevent(event)"
+                                   onkeyup="showevent(event)"
+                                   onmousedown="showevent(event)"
+                                   onmousemove="showevent(event)"
+                                   onmouseout="showevent(event)"
+                                   onmouseover="showevent(event)"
+                                   onmouseup="showevent(event)"
+                            />
+                </td>
+                <td>flag three</td>
+            </tr>
+            <tr>
+                <td>
+                    <html-el:submit>Save</html-el:submit>
+                </td>
+            </tr>
+        </table>
+    </html-el:form>
 
- </body>
+    <script>
+        <!--
+        function showevent(evt)
+        {
+            window.status = evt.type;
+        }
+        // -->
+    </script>
+
+    </body>
 </html-el:html>

Modified: struts/el/trunk/web/exercise-taglib/html-select.jsp
URL: http://svn.apache.org/viewcvs/struts/el/trunk/web/exercise-taglib/html-select.jsp?rev=376788&r1=376787&r2=376788&view=diff
==============================================================================
--- struts/el/trunk/web/exercise-taglib/html-select.jsp (original)
+++ struts/el/trunk/web/exercise-taglib/html-select.jsp Fri Feb 10 10:27:39 2006
@@ -1,45 +1,47 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<%@ page language="java" import="java.util.*, org.apache.struts.util.*"%>
+<%@ page language="java" import="org.apache.struts.util.LabelValueBean, java.util.Vector" %>
 <%@ taglib uri="http://struts.apache.org/tags-bean-el" prefix="bean-el" %>
 <%@ taglib uri="http://struts.apache.org/tags-html-el" prefix="html-el" %>
 <%@ taglib uri="http://struts.apache.org/tags-logic-el" prefix="logic-el" %>
 <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 <html-el:html>
 <head>
-<title>Test html-el:select Tag</title>
-<%
-  String multipleValues[] =
-   { "Multiple 0", "Multiple 1", "Multiple 2", "Multiple 3", "Multiple 4",
-     "Multiple 5", "Multiple 6", "Multiple 7", "Multiple 8", "Multiple 9" };
-  pageContext.setAttribute("multipleValues", multipleValues);
-
-  Vector options = new Vector();
-  options.add(new LabelValueBean("Label 0", "Value 0"));
-  options.add(new LabelValueBean("Label 1", "Value 1"));
-  options.add(new LabelValueBean("Label 2", "Value 2"));
-  options.add(new LabelValueBean("Label 3", "Value 3"));
-  options.add(new LabelValueBean("Label 4", "Value 4"));
-  options.add(new LabelValueBean("Label 5", "Value 5"));
-  options.add(new LabelValueBean("Label 6", "Value 6"));
-  options.add(new LabelValueBean("Label 7", "Value 7"));
-  options.add(new LabelValueBean("Label 8", "Value 8"));
-  options.add(new LabelValueBean("Label 9", "Value 9"));
-  pageContext.setAttribute("options", options);
-
-  String withNulls[] =
-   { "String 0", null, "String 2" };
-  pageContext.setAttribute("withNulls", withNulls);
+    <title>Test html-el:select Tag</title>
+    <%
+        String multipleValues[] =
+                { "Multiple 0", "Multiple 1", "Multiple 2", "Multiple 3",
+                        "Multiple 4",
+                        "Multiple 5", "Multiple 6", "Multiple 7",
+                        "Multiple 8", "Multiple 9" };
+        pageContext.setAttribute("multipleValues", multipleValues);
+
+        Vector options = new Vector();
+        options.add(new LabelValueBean("Label 0", "Value 0"));
+        options.add(new LabelValueBean("Label 1", "Value 1"));
+        options.add(new LabelValueBean("Label 2", "Value 2"));
+        options.add(new LabelValueBean("Label 3", "Value 3"));
+        options.add(new LabelValueBean("Label 4", "Value 4"));
+        options.add(new LabelValueBean("Label 5", "Value 5"));
+        options.add(new LabelValueBean("Label 6", "Value 6"));
+        options.add(new LabelValueBean("Label 7", "Value 7"));
+        options.add(new LabelValueBean("Label 8", "Value 8"));
+        options.add(new LabelValueBean("Label 9", "Value 9"));
+        pageContext.setAttribute("options", options);
+
+        String withNulls[] =
+                { "String 0", null, "String 2" };
+        pageContext.setAttribute("withNulls", withNulls);
 
-%>
+    %>
 </head>
 <body bgcolor="white">
 
 <div align="center">
-<h1>Test struts-html-el Select Tag</h1>
+    <h1>Test struts-html-el Select Tag</h1>
 </div>
 
 Whatever changes you make to properties should be reflected when the page
-is redisplayed.  Press "Save" to update, or "Cancel" to return to the
+is redisplayed. Press "Save" to update, or "Cancel" to return to the
 main menu.
 
 <%--
@@ -53,95 +55,104 @@
      either modify the TestBean class, adding an initialize() method, or to
      have an Action class set the initial values.
 --%>
-<jsp:useBean id="testbean" scope="session" class="org.apache.struts.webapp.exercise.TestBean"/>
+<jsp:useBean id="testbean" scope="session"
+             class="org.apache.struts.webapp.exercise.TestBean"/>
 
 <html-el:form action="html-select.do">
-<table border="0" width="100%">
+    <table border="0" width="100%">
 
-  <tr>
-    <th align="right">Single Select Allowed:</th>
-    <td align="left">
-      <html-el:select property="singleSelect" size="10">
-        <html-el:option value="Single 0">Single 0</html-el:option>
-        <html-el:option value="Single 1">Single 1</html-el:option>
-        <html-el:option value="Single 2">Single 2</html-el:option>
-        <html-el:option value="Single 3" disabled="${!empty pageScope}">
-         Single 3
-        </html-el:option>
-        <html-el:option value="Single 4">Single 4</html-el:option>
-        <html-el:option value="Single 5">Single 5</html-el:option>
-        <html-el:option value="Single 6">Single 6</html-el:option>
-        <html-el:option value="Single 7">Single 7</html-el:option>
-        <html-el:option value="Single 8">Single 8</html-el:option>
-        <html-el:option value="Single 9" styleId="flork">Single 9</html-el:option>
-      </html-el:select>
-    </td>
-  </tr>
-
-  <tr>
-    <th align="right">Multiple Select Allowed:</th>
-    <td align="left">
-      <html-el:select property="multipleSelect" size="10" multiple="true">
-        <html-el:options name="multipleValues" labelName="multipleValues"/>
-      </html-el:select>
-    </td>
-  </tr>
-
-  <tr>
-    <th align="right">Multiple Select From A Collection (Using &lt;html-el:options&gt;):</th>
-    <td align="left">
-      <html-el:select property="collectionSelect" size="10" multiple="true">
-        <html-el:options collection="options" property="value" labelProperty="label"/>
-      </html-el:select>
-    </td>
-  </tr>
-
-  <tr>
-    <th align="right">Multiple Select From A Collection (Using &lt;html-el:optionsCollection&gt;):</th>
-    <td align="left">
-      <html-el:select property="beanCollectionSelect" size="10" multiple="true">
-        <html-el:optionsCollection name="testbean" property="beanCollection"
-                                   filter="${empty pageScope}"/>
-      </html-el:select>
-    </td>
-  </tr>
-
-  <tr>
-    <th align="right">
-      Collection with null labels and values:
-    </th>
-    <td align="left">
-      <html-el:select property="withNulls" size="3">
-        <html-el:options name="withNulls" labelName="withNulls"
-                         filter="${empty pageScope}" />
-      </html-el:select>
-    </td>
-  </tr>
-
-  <tr>
-    <th align="right">
-      Disabled select
-    </th>
-    <td align="left">
-      <html-el:select disabled="${!empty pageScope}"
-                      property="withNulls" size="3">
-        <html-el:options name="withNulls" labelName="withNulls"
-                         filter="${empty pageScope}" />
-      </html-el:select>
-    </td>
-  </tr>
-
-  <tr>
-    <td align="right">
-      <html-el:submit>Save</html-el:submit>
-    </td>
-    <td align="left">
-      <html-el:reset>Reset</html-el:reset>
-      <html-el:cancel>Cancel</html-el:cancel>
-    </td>
-  </tr>
+        <tr>
+            <th align="right">Single Select Allowed:</th>
+            <td align="left">
+                <html-el:select property="singleSelect" size="10">
+                    <html-el:option value="Single 0">Single 0</html-el:option>
+                    <html-el:option value="Single 1">Single 1</html-el:option>
+                    <html-el:option value="Single 2">Single 2</html-el:option>
+                    <html-el:option value="Single 3"
+                                    disabled="${!empty pageScope}">
+                        Single 3
+                    </html-el:option>
+                    <html-el:option value="Single 4">Single 4</html-el:option>
+                    <html-el:option value="Single 5">Single 5</html-el:option>
+                    <html-el:option value="Single 6">Single 6</html-el:option>
+                    <html-el:option value="Single 7">Single 7</html-el:option>
+                    <html-el:option value="Single 8">Single 8</html-el:option>
+                    <html-el:option value="Single 9" styleId="flork">Single
+                        9</html-el:option>
+                </html-el:select>
+            </td>
+        </tr>
+
+        <tr>
+            <th align="right">Multiple Select Allowed:</th>
+            <td align="left">
+                <html-el:select property="multipleSelect" size="10"
+                                multiple="true">
+                    <html-el:options name="multipleValues"
+                                     labelName="multipleValues"/>
+                </html-el:select>
+            </td>
+        </tr>
+
+        <tr>
+            <th align="right">Multiple Select From A Collection (Using &lt;html-el:options&gt;):</th>
+            <td align="left">
+                <html-el:select property="collectionSelect" size="10"
+                                multiple="true">
+                    <html-el:options collection="options" property="value"
+                                     labelProperty="label"/>
+                </html-el:select>
+            </td>
+        </tr>
+
+        <tr>
+            <th align="right">Multiple Select From A Collection (Using &lt;html-el:optionsCollection&gt;):</th>
+            <td align="left">
+                <html-el:select property="beanCollectionSelect" size="10"
+                                multiple="true">
+                    <html-el:optionsCollection name="testbean"
+                                               property="beanCollection"
+                                               filter="${empty pageScope}"/>
+                </html-el:select>
+            </td>
+        </tr>
+
+        <tr>
+            <th align="right">
+                Collection with null labels and values:
+            </th>
+            <td align="left">
+                <html-el:select property="withNulls" size="3">
+                    <html-el:options name="withNulls" labelName="withNulls"
+                                     filter="${empty pageScope}"/>
+                </html-el:select>
+            </td>
+        </tr>
+
+        <tr>
+            <th align="right">
+                Disabled select
+            </th>
+            <td align="left">
+                <html-el:select disabled="${!empty pageScope}"
+                                property="withNulls" size="3">
+                    <html-el:options name="withNulls" labelName="withNulls"
+                                     filter="${empty pageScope}"/>
+                </html-el:select>
+            </td>
+        </tr>
+
+        <tr>
+            <td align="right">
+                <html-el:submit>Save</html-el:submit>
+            </td>
+            <td align="left">
+                <html-el:reset>Reset</html-el:reset>
+                <html-el:cancel>Cancel</html-el:cancel>
+            </td>
+        </tr>
 
-</table>
+    </table>
 
 </html-el:form>
 

Modified: struts/el/trunk/web/exercise-taglib/html-setters.jsp
URL: http://svn.apache.org/viewcvs/struts/el/trunk/web/exercise-taglib/html-setters.jsp?rev=376788&r1=376787&r2=376788&view=diff
==============================================================================
--- struts/el/trunk/web/exercise-taglib/html-setters.jsp (original)
+++ struts/el/trunk/web/exercise-taglib/html-setters.jsp Fri Feb 10 10:27:39 2006
@@ -1,179 +1,179 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<%@ page language="java"%>
+<%@ page language="java" %>
 <%@ taglib uri="http://struts.apache.org/tags-bean-el" prefix="bean-el" %>
 <%@ taglib uri="http://struts.apache.org/tags-html-el" prefix="html-el" %>
 <%@ taglib uri="http://struts.apache.org/tags-logic-el" prefix="logic-el" %>
 <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 <html-el:html>
 <head>
-<title>Test struts-html-el Property Setters</title>
+    <title>Test struts-html-el Property Setters</title>
 </head>
 <body bgcolor="white">
 
 <div align="center">
-<h1>Test struts-html-el Property Setters</h1>
+    <h1>Test struts-html-el Property Setters</h1>
 </div>
 
 Whatever changes you make to properties should be reflected when the page
-is redisplayed.  Press "Save" to update, or "Cancel" to return to the
+is redisplayed. Press "Save" to update, or "Cancel" to return to the
 main menu.
 
 <html-el:form action="html-setters.do">
 <table border="0" width="100%">
 
-  <tr>
+<tr>
     <th align="center" colspan="4">Scalar Properties</th align="center">
-  </tr>
+</tr>
 
-  <tr>
+<tr>
     <th align="right">booleanProperty</th>
     <td align="left">
-      <html-el:checkbox property="booleanProperty"/>
+        <html-el:checkbox property="booleanProperty"/>
     </td>
     <th align="right">nested.booleanProperty</th>
     <td align="left">
-      <html-el:checkbox property="nested.booleanProperty"/>
+        <html-el:checkbox property="nested.booleanProperty"/>
     </td>
-  </tr>
+</tr>
 
-  <tr>
+<tr>
     <th align="right">doubleProperty</th>
     <td align="left">
-      <html-el:text property="doubleProperty" size="32"/>
+        <html-el:text property="doubleProperty" size="32"/>
     </td>
     <th align="right">nested.doubleProperty</th>
     <td align="left">
-      <html-el:text property="nested.doubleProperty" size="32"/>
+        <html-el:text property="nested.doubleProperty" size="32"/>
     </td>
-  </tr>
+</tr>
 
-  <tr>
+<tr>
     <th align="right">floatProperty</th>
     <td align="left">
-      <html-el:text property="floatProperty" size="32"/>
+        <html-el:text property="floatProperty" size="32"/>
     </td>
     <th align="right">nested.floatProperty</th>
     <td align="left">
-      <html-el:text property="nested.floatProperty" size="32"/>
+        <html-el:text property="nested.floatProperty" size="32"/>
     </td>
-  </tr>
+</tr>
 
-  <tr>
+<tr>
     <th align="right">intProperty</th>
     <td align="left">
-      <html-el:text property="intProperty" size="32"/>
+        <html-el:text property="intProperty" size="32"/>
     </td>
     <th align="right">nested.intProperty</th>
     <td align="left">
-      <html-el:text property="nested.intProperty" size="32"/>
+        <html-el:text property="nested.intProperty" size="32"/>
     </td>
-  </tr>
+</tr>
 
-  <tr>
+<tr>
     <th align="right">longProperty</th>
     <td align="left">
-      <html-el:text property="longProperty" size="32"/>
+        <html-el:text property="longProperty" size="32"/>
     </td>
     <th align="right">nested.longProperty</th>
     <td align="left">
-      <html-el:text property="nested.longProperty" size="32"/>
+        <html-el:text property="nested.longProperty" size="32"/>
     </td>
-  </tr>
+</tr>
 
-  <tr>
+<tr>
     <th align="right">stringProperty</th>
     <td align="left">
-      <html-el:text property="stringProperty" size="32"/>
+        <html-el:text property="stringProperty" size="32"/>
     </td>
     <th align="right">nested.stringProperty</th>
     <td align="left">
-      <html-el:text property="nested.stringProperty" size="32"/>
+        <html-el:text property="nested.stringProperty" size="32"/>
     </td>
-  </tr>
+</tr>
 
-  <tr>
+<tr>
     <th align="center" colspan="4">Indexed Properties</th align="center">
-  </tr>
+</tr>
 
-  <tr>
+<tr>
     <th align="right">intIndexed[0]</th>
     <td align="left">
-      <html-el:text property="intIndexed[0]" size="32"/>
+        <html-el:text property="intIndexed[0]" size="32"/>
     </td>
     <th align="right">nested.intIndexed[0]</th>
     <td align="left">
-      <html-el:text property="nested.intIndexed[0]" size="32"/>
+        <html-el:text property="nested.intIndexed[0]" size="32"/>
     </td>
-  </tr>
+</tr>
 
-  <tr>
+<tr>
     <th align="right">intIndexed[1]</th>
     <td align="left">
-      <html-el:text property="intIndexed[1]" size="32"/>
+        <html-el:text property="intIndexed[1]" size="32"/>
     </td>
     <th align="right">nested.intIndexed[1]</th>
     <td align="left">
-      <html-el:text property="nested.intIndexed[1]" size="32"/>
+        <html-el:text property="nested.intIndexed[1]" size="32"/>
     </td>
-  </tr>
+</tr>
 
-  <tr>
+<tr>
     <th align="right">stringIndexed[0]</th>
     <td align="left">
-      <html-el:text property="stringIndexed[0]" size="32"/>
+        <html-el:text property="stringIndexed[0]" size="32"/>
     </td>
     <th align="right">nested.stringIndexed[0]</th>
     <td align="left">
-      <html-el:text property="nested.stringIndexed[0]" size="32"/>
+        <html-el:text property="nested.stringIndexed[0]" size="32"/>
     </td>
-  </tr>
+</tr>
 
-  <tr>
+<tr>
     <th align="right">stringIndexed[1]</th>
     <td align="left">
-      <html-el:text property="stringIndexed[1]" size="32"/>
+        <html-el:text property="stringIndexed[1]" size="32"/>
     </td>
     <th align="right">nested.stringIndexed[1]</th>
     <td align="left">
-      <html-el:text property="nested.stringIndexed[1]" size="32"/>
+        <html-el:text property="nested.stringIndexed[1]" size="32"/>
     </td>
-  </tr>
+</tr>
 
-  <tr>
+<tr>
     <th align="right">stringIndexed[1]</th>
     <td align="left">
-      <html-el:textarea property="stringIndexed[1]" rows="${1+3}"/>
+        <html-el:textarea property="stringIndexed[1]" rows="${1+3}"/>
     </td>
     <th align="right">nested.stringIndexed[1]</th>
     <td align="left">
-      <html-el:textarea disabled="${!empty pageScope}"
-                        property="nested.stringIndexed[1]"/>
+        <html-el:textarea disabled="${!empty pageScope}"
+                          property="nested.stringIndexed[1]"/>
     </td>
-  </tr>
+</tr>
 
-  <tr>
+<tr>
     <th align="right">stringIndexed[1]</th>
     <td align="left">
-      <html-el:text property="stringIndexed[1]" size="32"/>
+        <html-el:text property="stringIndexed[1]" size="32"/>
     </td>
     <th align="right">nested.stringIndexed[1]</th>
     <td align="left">
-      <html-el:text property="nested.stringIndexed[1]"
-                    disabled="${!empty pageScope}" size="32"/>
+        <html-el:text property="nested.stringIndexed[1]"
+                      disabled="${!empty pageScope}" size="32"/>
     </td>
-  </tr>
+</tr>
 
-  <tr>
+<tr>
     <td>&nbsp;</td>
     <td align="right">
-      <html-el:submit>Save</html-el:submit>
+        <html-el:submit>Save</html-el:submit>
     </td>
     <td align="left">
-      <html-el:reset>Reset</html-el:reset>
-      <html-el:cancel>Cancel</html-el:cancel>
+        <html-el:reset>Reset</html-el:reset>
+        <html-el:cancel>Cancel</html-el:cancel>
     </td>
     <td>&nbsp;</td>
-  </tr>
+</tr>
 
 </table>
 

Modified: struts/el/trunk/web/exercise-taglib/index.jsp
URL: http://svn.apache.org/viewcvs/struts/el/trunk/web/exercise-taglib/index.jsp?rev=376788&r1=376787&r2=376788&view=diff
==============================================================================
--- struts/el/trunk/web/exercise-taglib/index.jsp (original)
+++ struts/el/trunk/web/exercise-taglib/index.jsp Fri Feb 10 10:27:39 2006
@@ -1,67 +1,95 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <%@ page language="java" %>
-<%@ taglib uri="http://struts.apache.org/tags-html-el"  prefix="html-el"  %>
+<%@ taglib uri="http://struts.apache.org/tags-html-el" prefix="html-el" %>
 <html>
 <head>
-<title>Struts-EL Test Application</title>
+    <title>Struts-EL Test Application</title>
 </head>
+
 <body bgcolor="white">
 
 <div align="center">
-<h1>Struts-EL Test Pages</h1>
+    <h1>Struts-EL Test Pages</h1>
 </div>
 
 <h3>BEAN Tags</h3>
 <ul>
-<li><a href="bean-include.jsp">&lt;bean:include&gt;</a>[<a href="showSource.jsp?path=/bean-include.jsp">Source</a>]</li>
-<li><a href="bean-resource.jsp">&lt;bean:resource&gt;</a>[<a href="showSource.jsp?path=/bean-resource.jsp">Source</a>]</li>
-<li><a href="bean-size.jsp">&lt;bean:size&gt;</a>[<a href="showSource.jsp?path=/bean-size.jsp">Source</a>]</li>
+    <li><a href="bean-include.jsp">&lt;bean:include&gt;</a>[<a
+            href="showSource.jsp?path=/bean-include.jsp">Source</a>]</li>
+    <li><a href="bean-resource.jsp">&lt;bean:resource&gt;</a>[<a
+            href="showSource.jsp?path=/bean-resource.jsp">Source</a>]</li>
+    <li><a href="bean-size.jsp">&lt;bean:size&gt;</a>[<a
+            href="showSource.jsp?path=/bean-size.jsp">Source</a>]</li>
 </ul>
 
 <h3>HTML Tags</h3>
 <ul>
-<li><a href="html-link.jsp">&lt;html:link&gt;</a>[<a href="showSource.jsp?path=/html-link.jsp">Source</a>]</li>
-<li><a href="html-multibox.jsp">&lt;html:multibox&gt;</a>[<a href="showSource.jsp?path=/html-multibox.jsp">Source</a>]</li>
-<li><a href="html-radio.jsp">&lt;html:radio&gt;</a>[<a href="showSource.jsp?path=/html-radio.jsp">Source</a>]</li>
-<li><a href="html-button.jsp">&lt;html:button&gt;</a>[<a href="showSource.jsp?path=/html-button.jsp">Source</a>]</li>
-<li><a href="html-file.jsp">&lt;html:file&gt;</a>[<a href="showSource.jsp?path=/html-file.jsp">Source</a>]</li>
-<li><a href="html-frame.jsp">&lt;html:frame&gt;</a>[<a href="showSource.jsp?path=/html-frame.jsp">Source</a>]</li>
-<li><a href="html-input.jsp">&lt;html:input&gt;</a>[<a href="showSource.jsp?path=/html-input.jsp">Source</a>]</li>
-<li><a href="html-select.jsp">&lt;html:select&gt;</a>[<a href="showSource.jsp?path=/html-select.jsp">Source</a>]</li>
-<li><a href="html-setters.jsp">Scalar Setters</a>[<a href="showSource.jsp?path=/html-setters.jsp">Source</a>]</li>
-<li><a href="html-indexed.jsp">Indexed Tags</a>[<a href="showSource.jsp?path=/html-indexed.jsp">Source</a>]</li>
+    <li><a href="html-link.jsp">&lt;html:link&gt;</a>[<a
+            href="showSource.jsp?path=/html-link.jsp">Source</a>]</li>
+    <li><a href="html-multibox.jsp">&lt;html:multibox&gt;</a>[<a
+            href="showSource.jsp?path=/html-multibox.jsp">Source</a>]</li>
+    <li><a href="html-radio.jsp">&lt;html:radio&gt;</a>[<a
+            href="showSource.jsp?path=/html-radio.jsp">Source</a>]</li>
+    <li><a href="html-button.jsp">&lt;html:button&gt;</a>[<a
+            href="showSource.jsp?path=/html-button.jsp">Source</a>]</li>
+    <li><a href="html-file.jsp">&lt;html:file&gt;</a>[<a
+            href="showSource.jsp?path=/html-file.jsp">Source</a>]</li>
+    <li><a href="html-frame.jsp">&lt;html:frame&gt;</a>[<a
+            href="showSource.jsp?path=/html-frame.jsp">Source</a>]</li>
+    <li><a href="html-input.jsp">&lt;html:input&gt;</a>[<a
+            href="showSource.jsp?path=/html-input.jsp">Source</a>]</li>
+    <li><a href="html-select.jsp">&lt;html:select&gt;</a>[<a
+            href="showSource.jsp?path=/html-select.jsp">Source</a>]</li>
+    <li><a href="html-setters.jsp">Scalar Setters</a>[<a
+            href="showSource.jsp?path=/html-setters.jsp">Source</a>]</li>
+    <li><a href="html-indexed.jsp">Indexed Tags</a>[<a
+            href="showSource.jsp?path=/html-indexed.jsp">Source</a>]</li>
 </ul>
 
 <h3>LOGIC Tags</h3>
 <ul>
-<li><a href="logic-iterate.jsp">Iterate Tag</a>[<a href="showSource.jsp?path=/logic-iterate.jsp">Source</a>]</li>
-<li><a href="logic-match.jsp?param1=value1">Match Tags</a>[<a href="showSource.jsp?path=/logic-match.jsp">Source</a>]</li>
-<li><a href="logic-present.jsp?param1=value1">Presence Tags</a>[<a href="showSource.jsp?path=/logic-present.jsp">Source</a>]</li>
-<li><a href="logic-redirect.jsp">&lt;logic:redirect&gt;</a>[<a href="showSource.jsp?path=/logic-redirect.jsp">Source</a>]</li>
+    <li><a href="logic-iterate.jsp">Iterate Tag</a>[<a
+            href="showSource.jsp?path=/logic-iterate.jsp">Source</a>]</li>
+    <li><a href="logic-match.jsp?param1=value1">Match Tags</a>[<a
+            href="showSource.jsp?path=/logic-match.jsp">Source</a>]</li>
+    <li><a href="logic-present.jsp?param1=value1">Presence Tags</a>[<a
+            href="showSource.jsp?path=/logic-present.jsp">Source</a>]</li>
+    <li><a href="logic-redirect.jsp">&lt;logic:redirect&gt;</a>[<a
+            href="showSource.jsp?path=/logic-redirect.jsp">Source</a>]</li>
 </ul>
 
 <h2>Replacements for Struts tags not ported to Struts-EL</h2>
+
 <h3>BEAN Tags</h3>
 <ul>
-<li><a href="bean-cookie.jsp">&lt;bean:cookie&gt;</a>[<a href="showSource.jsp?path=/bean-cookie.jsp">Source</a>]</li>
-<li><a href="bean-define.jsp">&lt;bean:define&gt;</a>[<a href="showSource.jsp?path=/bean-define.jsp">Source</a>]</li>
-<li><a href="bean-header.jsp">&lt;bean:header&gt;</a>[<a href="showSource.jsp?path=/bean-header.jsp">Source</a>]</li>
-<li><a href="bean-parameter.jsp?param1=value1&param2=value2">&lt;bean:parameter&gt;</a>[<a href="showSource.jsp?path=/bean-parameter.jsp">Source</a>]</li>
-<li><a href="bean-write.jsp">&lt;bean:write&gt;</a>[<a href="showSource.jsp?path=/bean-write.jsp">Source</a>]</li>
+    <li><a href="bean-cookie.jsp">&lt;bean:cookie&gt;</a>[<a
+            href="showSource.jsp?path=/bean-cookie.jsp">Source</a>]</li>
+    <li><a href="bean-define.jsp">&lt;bean:define&gt;</a>[<a
+            href="showSource.jsp?path=/bean-define.jsp">Source</a>]</li>
+    <li><a href="bean-header.jsp">&lt;bean:header&gt;</a>[<a
+            href="showSource.jsp?path=/bean-header.jsp">Source</a>]</li>
+    <li><a href="bean-parameter.jsp?param1=value1&param2=value2">&lt;bean:parameter&gt;</a>[<a
+            href="showSource.jsp?path=/bean-parameter.jsp">Source</a>]</li>
+    <li><a href="bean-write.jsp">&lt;bean:write&gt;</a>[<a
+            href="showSource.jsp?path=/bean-write.jsp">Source</a>]</li>
 </ul>
+
 <h3>LOGIC Tags</h3>
 <ul>
-<li><a href="logic-compare.jsp">Comparison Tags</a>[<a href="showSource.jsp?path=/logic-compare.jsp">Source</a>]</li>
-<li><a href="logic-empty.jsp">Emptiness Tags</a>[<a href="showSource.jsp?path=/logic-empty.jsp">Source</a>]</li>
+    <li><a href="logic-compare.jsp">Comparison Tags</a>[<a
+            href="showSource.jsp?path=/logic-compare.jsp">Source</a>]</li>
+    <li><a href="logic-empty.jsp">Emptiness Tags</a>[<a
+            href="showSource.jsp?path=/logic-empty.jsp">Source</a>]</li>
 </ul>
 
 <h2>Other Testable Features</h2>
 <ul>
- <li>
-  <html-el:link page="/bean-dyna.do">
-   DynaActionForm References in EL[<a href="showSource.jsp?path=/bean-dyna.jsp">Source</a>]
-  </html-el:link>
- </li>
+    <li>
+        <html-el:link page="/bean-dyna.do">
+            DynaActionForm References in EL[<a
+            href="showSource.jsp?path=/bean-dyna.jsp">Source</a>]
+        </html-el:link>
+    </li>
 </ul>
 </body>
 </html>

Modified: struts/el/trunk/web/exercise-taglib/logic-compare.jsp
URL: http://svn.apache.org/viewcvs/struts/el/trunk/web/exercise-taglib/logic-compare.jsp?rev=376788&r1=376787&r2=376788&view=diff
==============================================================================
--- struts/el/trunk/web/exercise-taglib/logic-compare.jsp (original)
+++ struts/el/trunk/web/exercise-taglib/logic-compare.jsp Fri Feb 10 10:27:39 2006
@@ -1,617 +1,619 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <%@ page language="java" %>
-<%@ taglib uri="http://struts.apache.org/tags-html-el"  prefix="html-el"  %>
-<%@ taglib uri="http://struts.apache.org/tags-bean-el"  prefix="bean-el" %>
+<%@ taglib uri="http://struts.apache.org/tags-html-el" prefix="html-el" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean-el" prefix="bean-el" %>
 <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 <html-el:html>
 <head>
-<title>Test Replacements for struts comparison tags</title>
+    <title>Test Replacements for struts comparison tags</title>
 </head>
+
 <body bgcolor="white">
 
 <div align="center">
-<h1>Test Replacements for struts comparison tags</h1>
+    <h1>Test Replacements for struts comparison tags</h1>
 </div>
 
-<jsp:useBean id="bean" scope="page" class="org.apache.struts.webapp.exercise.TestBean"/>
+<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";
-  String long1 = "321";
-  String long2 = "111";
-  String long3 = "333";
-  String short1 = "987";
-  String short2 = "654";
-  String short3 = "999";
-  String str1 = "This is a string";
-  String str2 = "Less than";
-  String str3 = "XYZ greater than";
+    String bool1 = "true";
+    String bool2 = "false";
+    String doub1 = "321.0";
+    String doub2 = "111.0";
+    String doub3 = "333.0";
+    String long1 = "321";
+    String long2 = "111";
+    String long3 = "333";
+    String short1 = "987";
+    String short2 = "654";
+    String short3 = "999";
+    String str1 = "This is a string";
+    String str2 = "Less than";
+    String str3 = "XYZ greater than";
 
-  pageContext.setAttribute("bool1", bool1);
-  pageContext.setAttribute("bool2", bool2);
-  pageContext.setAttribute("doub1", doub1);
-  pageContext.setAttribute("doub2", doub2);
-  pageContext.setAttribute("doub3", doub3);
-  pageContext.setAttribute("long1", long1);
-  pageContext.setAttribute("long2", long2);
-  pageContext.setAttribute("long3", long3);
-  pageContext.setAttribute("short1", short1);
-  pageContext.setAttribute("short2", short2);
-  pageContext.setAttribute("short3", short3);
-  pageContext.setAttribute("str1", str1);
-  pageContext.setAttribute("str2", str2);
-  pageContext.setAttribute("str3", str3);
+    pageContext.setAttribute("bool1", bool1);
+    pageContext.setAttribute("bool2", bool2);
+    pageContext.setAttribute("doub1", doub1);
+    pageContext.setAttribute("doub2", doub2);
+    pageContext.setAttribute("doub3", doub3);
+    pageContext.setAttribute("long1", long1);
+    pageContext.setAttribute("long2", long2);
+    pageContext.setAttribute("long3", long3);
+    pageContext.setAttribute("short1", short1);
+    pageContext.setAttribute("short2", short2);
+    pageContext.setAttribute("short3", short3);
+    pageContext.setAttribute("str1", str1);
+    pageContext.setAttribute("str2", str2);
+    pageContext.setAttribute("str3", str3);
 %>
 
 <table border="1">
-  <tr>
+<tr>
     <th>Test Type</th>
     <th>Variable Content</th>
     <th>Value Content </th>
     <th>Correct Value</th>
     <th>Test Result</th>
-  </tr>
-  <tr>
+</tr>
+<tr>
     <td>boolean / EQ</td>
     <td><c:out value="${bean.booleanProperty}"/></td>
     <td><c:out value="${bool1}"/></td>
     <td>equal</td>
     <td>
-      <c:choose>
-       <c:when test="${bean.booleanProperty eq bool1}">
-        equal
-       </c:when>
-       <c:otherwise>
-        notEqual
-       </c:otherwise>
-      </c:choose>
+        <c:choose>
+            <c:when test="${bean.booleanProperty eq bool1}">
+                equal
+            </c:when>
+            <c:otherwise>
+                notEqual
+            </c:otherwise>
+        </c:choose>
     </td>
-  </tr>
-  <tr>
+</tr>
+<tr>
     <td>boolean / EQ</td>
     <td><c:out value="${bean.falseProperty}"/></td>
     <td><c:out value="${bool2}"/></td>
     <td>equal</td>
     <td>
-      <c:choose>
-       <c:when test="${bean.falseProperty eq bool2}">
-        equal
-       </c:when>
-       <c:otherwise>
-        notEqual
-       </c:otherwise>
-      </c:choose>
+        <c:choose>
+            <c:when test="${bean.falseProperty eq bool2}">
+                equal
+            </c:when>
+            <c:otherwise>
+                notEqual
+            </c:otherwise>
+        </c:choose>
     </td>
-  </tr>
-  <tr>
+</tr>
+<tr>
     <td>boolean / NE</td>
     <td><c:out value="${bean.booleanProperty}"/></td>
     <td><c:out value="${bool2}"/></td>
     <td>notEqual</td>
     <td>
-      <c:choose>
-       <c:when test="${bean.booleanProperty eq bool2}">
-        equal
-       </c:when>
-       <c:otherwise>
-        notEqual
-       </c:otherwise>
-      </c:choose>
+        <c:choose>
+            <c:when test="${bean.booleanProperty eq bool2}">
+                equal
+            </c:when>
+            <c:otherwise>
+                notEqual
+            </c:otherwise>
+        </c:choose>
     </td>
-  </tr>
-  <tr>
+</tr>
+<tr>
     <td>boolean / NE</td>
     <td><c:out value="${bean.falseProperty}"/></td>
     <td><c:out value="${bool1}"/></td>
     <td>notEqual</td>
     <td>
-      <c:choose>
-       <c:when test="${bean.falseProperty eq bool1}">
-        equal
-       </c:when>
-       <c:otherwise>
-        notEqual
-       </c:otherwise>
-      </c:choose>
+        <c:choose>
+            <c:when test="${bean.falseProperty eq bool1}">
+                equal
+            </c:when>
+            <c:otherwise>
+                notEqual
+            </c:otherwise>
+        </c:choose>
     </td>
-  </tr>
-  <tr>
+</tr>
+<tr>
     <td>double / EQ</td>
     <td><c:out value="${bean.doubleProperty}"/></td>
     <td><c:out value="${doub1}"/></td>
     <td>equal greaterEqual lessEqual</td>
     <td>
-      <c:if test="${bean.doubleProperty eq doub1}">
-        equal
-      </c:if>
-      <c:if test="${bean.doubleProperty ge doub1}">
-        greaterEqual
-      </c:if>
-      <c:if test="${bean.doubleProperty gt doub1}">
-        greaterThan
-      </c:if>
-      <c:if test="${bean.doubleProperty le doub1}">
-        lessEqual
-      </c:if>
-      <c:if test="${bean.doubleProperty lt doub1}">
-        lessThan
-      </c:if>
-      <c:if test="${bean.doubleProperty ne doub1}">
-        notEqual
-      </c:if>
+        <c:if test="${bean.doubleProperty eq doub1}">
+            equal
+        </c:if>
+        <c:if test="${bean.doubleProperty ge doub1}">
+            greaterEqual
+        </c:if>
+        <c:if test="${bean.doubleProperty gt doub1}">
+            greaterThan
+        </c:if>
+        <c:if test="${bean.doubleProperty le doub1}">
+            lessEqual
+        </c:if>
+        <c:if test="${bean.doubleProperty lt doub1}">
+            lessThan
+        </c:if>
+        <c:if test="${bean.doubleProperty ne doub1}">
+            notEqual
+        </c:if>
     </td>
-  </tr>
-  <tr>
+</tr>
+<tr>
     <td>double / GT</td>
     <td><c:out value="${bean.doubleProperty}"/></td>
     <td><c:out value="${doub2}"/></td>
     <td>greaterEqual greaterThan notEqual</td>
     <td>
-      <c:if test="${bean.doubleProperty eq doub2}">
-        equal
-      </c:if>
-      <c:if test="${bean.doubleProperty ge doub2}">
-        greaterEqual
-      </c:if>
-      <c:if test="${bean.doubleProperty gt doub2}">
-        greaterThan
-      </c:if>
-      <c:if test="${bean.doubleProperty le doub2}">
-        lessEqual
-      </c:if>
-      <c:if test="${bean.doubleProperty lt doub2}">
-        lessThan
-      </c:if>
-      <c:if test="${bean.doubleProperty ne doub2}">
-        notEqual
-      </c:if>
+        <c:if test="${bean.doubleProperty eq doub2}">
+            equal
+        </c:if>
+        <c:if test="${bean.doubleProperty ge doub2}">
+            greaterEqual
+        </c:if>
+        <c:if test="${bean.doubleProperty gt doub2}">
+            greaterThan
+        </c:if>
+        <c:if test="${bean.doubleProperty le doub2}">
+            lessEqual
+        </c:if>
+        <c:if test="${bean.doubleProperty lt doub2}">
+            lessThan
+        </c:if>
+        <c:if test="${bean.doubleProperty ne doub2}">
+            notEqual
+        </c:if>
     </td>
-  </tr>
-  <tr>
+</tr>
+<tr>
     <td>double / LT</td>
     <td><c:out value="${bean.doubleProperty}"/></td>
     <td><c:out value="${doub3}"/></td>
     <td>lessEqual lessThan notEqual</td>
     <td>
-      <c:if test="${bean.doubleProperty eq doub3}">
-        equal
-      </c:if>
-      <c:if test="${bean.doubleProperty ge doub3}">
-        greaterEqual
-      </c:if>
-      <c:if test="${bean.doubleProperty gt doub3}">
-        greaterThan
-      </c:if>
-      <c:if test="${bean.doubleProperty le doub3}">
-        lessEqual
-      </c:if>
-      <c:if test="${bean.doubleProperty lt doub3}">
-        lessThan
-      </c:if>
-      <c:if test="${bean.doubleProperty ne doub3}">
-        notEqual
-      </c:if>
+        <c:if test="${bean.doubleProperty eq doub3}">
+            equal
+        </c:if>
+        <c:if test="${bean.doubleProperty ge doub3}">
+            greaterEqual
+        </c:if>
+        <c:if test="${bean.doubleProperty gt doub3}">
+            greaterThan
+        </c:if>
+        <c:if test="${bean.doubleProperty le doub3}">
+            lessEqual
+        </c:if>
+        <c:if test="${bean.doubleProperty lt doub3}">
+            lessThan
+        </c:if>
+        <c:if test="${bean.doubleProperty ne doub3}">
+            notEqual
+        </c:if>
     </td>
-  </tr>
-  <tr>
+</tr>
+<tr>
     <td>float / EQ</td>
     <td><c:out value="${bean.floatProperty}"/></td>
     <td><c:out value="${doub1}"/></td>
     <td>lessEqual lessThan notEqual</td>
     <td>
-      <c:if test="${bean.floatProperty eq doub1}">
-        equal
-      </c:if>
-      <c:if test="${bean.floatProperty ge doub1}">
-        greaterEqual
-      </c:if>
-      <c:if test="${bean.floatProperty gt doub1}">
-        greaterThan
-      </c:if>
-      <c:if test="${bean.floatProperty le doub1}">
-        lessEqual
-      </c:if>
-      <c:if test="${bean.floatProperty lt doub1}">
-        lessThan
-      </c:if>
-      <c:if test="${bean.floatProperty ne doub1}">
-        notEqual
-      </c:if>
+        <c:if test="${bean.floatProperty eq doub1}">
+            equal
+        </c:if>
+        <c:if test="${bean.floatProperty ge doub1}">
+            greaterEqual
+        </c:if>
+        <c:if test="${bean.floatProperty gt doub1}">
+            greaterThan
+        </c:if>
+        <c:if test="${bean.floatProperty le doub1}">
+            lessEqual
+        </c:if>
+        <c:if test="${bean.floatProperty lt doub1}">
+            lessThan
+        </c:if>
+        <c:if test="${bean.floatProperty ne doub1}">
+            notEqual
+        </c:if>
     </td>
-  </tr>
-  <tr>
+</tr>
+<tr>
     <td>float / GT</td>
     <td><c:out value="${bean.floatProperty}"/></td>
     <td><c:out value="${doub2}"/></td>
     <td>greaterEqual greaterThan notEqual</td>
     <td>
-      <c:if test="${bean.floatProperty eq doub2}">
-        equal
-      </c:if>
-      <c:if test="${bean.floatProperty ge doub2}">
-        greaterEqual
-      </c:if>
-      <c:if test="${bean.floatProperty gt doub2}">
-        greaterThan
-      </c:if>
-      <c:if test="${bean.floatProperty le doub2}">
-        lessEqual
-      </c:if>
-      <c:if test="${bean.floatProperty lt doub2}">
-        lessThan
-      </c:if>
-      <c:if test="${bean.floatProperty ne doub2}">
-        notEqual
-      </c:if>
+        <c:if test="${bean.floatProperty eq doub2}">
+            equal
+        </c:if>
+        <c:if test="${bean.floatProperty ge doub2}">
+            greaterEqual
+        </c:if>
+        <c:if test="${bean.floatProperty gt doub2}">
+            greaterThan
+        </c:if>
+        <c:if test="${bean.floatProperty le doub2}">
+            lessEqual
+        </c:if>
+        <c:if test="${bean.floatProperty lt doub2}">
+            lessThan
+        </c:if>
+        <c:if test="${bean.floatProperty ne doub2}">
+            notEqual
+        </c:if>
     </td>
-  </tr>
-  <tr>
+</tr>
+<tr>
     <td>float / LT</td>
     <td><c:out value="${bean.floatProperty}"/></td>
     <td><c:out value="${doub3}"/></td>
     <td>lessEqual lessThan notEqual</td>
     <td>
-      <c:if test="${bean.floatProperty eq doub3}">
-        equal
-      </c:if>
-      <c:if test="${bean.floatProperty ge doub3}">
-        greaterEqual
-      </c:if>
-      <c:if test="${bean.floatProperty gt doub3}">
-        greaterThan
-      </c:if>
-      <c:if test="${bean.floatProperty le doub3}">
-        lessEqual
-      </c:if>
-      <c:if test="${bean.floatProperty lt doub3}">
-        lessThan
-      </c:if>
-      <c:if test="${bean.floatProperty ne doub3}">
-        notEqual
-      </c:if>
+        <c:if test="${bean.floatProperty eq doub3}">
+            equal
+        </c:if>
+        <c:if test="${bean.floatProperty ge doub3}">
+            greaterEqual
+        </c:if>
+        <c:if test="${bean.floatProperty gt doub3}">
+            greaterThan
+        </c:if>
+        <c:if test="${bean.floatProperty le doub3}">
+            lessEqual
+        </c:if>
+        <c:if test="${bean.floatProperty lt doub3}">
+            lessThan
+        </c:if>
+        <c:if test="${bean.floatProperty ne doub3}">
+            notEqual
+        </c:if>
     </td>
-  </tr>
-  <tr>
+</tr>
+<tr>
     <td>int / EQ</td>
     <td><c:out value="${bean.intProperty}"/></td>
     <td><c:out value="${long1}"/></td>
     <td>lessEqual lessThan notEqual</td>
     <td>
-      <c:if test="${bean.intProperty eq long1}">
-        equal
-      </c:if>
-      <c:if test="${bean.intProperty ge long1}">
-        greaterEqual
-      </c:if>
-      <c:if test="${bean.intProperty gt long1}">
-        greaterThan
-      </c:if>
-      <c:if test="${bean.intProperty le long1}">
-        lessEqual
-      </c:if>
-      <c:if test="${bean.intProperty lt long1}">
-        lessThan
-      </c:if>
-      <c:if test="${bean.intProperty ne long1}">
-        notEqual
-      </c:if>
+        <c:if test="${bean.intProperty eq long1}">
+            equal
+        </c:if>
+        <c:if test="${bean.intProperty ge long1}">
+            greaterEqual
+        </c:if>
+        <c:if test="${bean.intProperty gt long1}">
+            greaterThan
+        </c:if>
+        <c:if test="${bean.intProperty le long1}">
+            lessEqual
+        </c:if>
+        <c:if test="${bean.intProperty lt long1}">
+            lessThan
+        </c:if>
+        <c:if test="${bean.intProperty ne long1}">
+            notEqual
+        </c:if>
     </td>
-  </tr>
-  <tr>
+</tr>
+<tr>
     <td>int / GT</td>
     <td><c:out value="${bean.intProperty}"/></td>
     <td><c:out value="${long2}"/></td>
     <td>greaterEqual greaterThan notEqual</td>
     <td>
-      <c:if test="${bean.intProperty eq long2}">
-        equal
-      </c:if>
-      <c:if test="${bean.intProperty ge long2}">
-        greaterEqual
-      </c:if>
-      <c:if test="${bean.intProperty gt long2}">
-        greaterThan
-      </c:if>
-      <c:if test="${bean.intProperty le long2}">
-        lessEqual
-      </c:if>
-      <c:if test="${bean.intProperty lt long2}">
-        lessThan
-      </c:if>
-      <c:if test="${bean.intProperty ne long2}">
-        notEqual
-      </c:if>
+        <c:if test="${bean.intProperty eq long2}">
+            equal
+        </c:if>
+        <c:if test="${bean.intProperty ge long2}">
+            greaterEqual
+        </c:if>
+        <c:if test="${bean.intProperty gt long2}">
+            greaterThan
+        </c:if>
+        <c:if test="${bean.intProperty le long2}">
+            lessEqual
+        </c:if>
+        <c:if test="${bean.intProperty lt long2}">
+            lessThan
+        </c:if>
+        <c:if test="${bean.intProperty ne long2}">
+            notEqual
+        </c:if>
     </td>
-  </tr>
-  <tr>
+</tr>
+<tr>
     <td>int / LT</td>
     <td><c:out value="${bean.intProperty}"/></td>
     <td><c:out value="${long3}"/></td>
     <td>lessEqual lessThan notEqual</td>
     <td>
-      <c:if test="${bean.intProperty eq long3}">
-        equal
-      </c:if>
-      <c:if test="${bean.intProperty ge long3}">
-        greaterEqual
-      </c:if>
-      <c:if test="${bean.intProperty gt long3}">
-        greaterThan
-      </c:if>
-      <c:if test="${bean.intProperty le long3}">
-        lessEqual
-      </c:if>
-      <c:if test="${bean.intProperty lt long3}">
-        lessThan
-      </c:if>
-      <c:if test="${bean.intProperty ne long3}">
-        notEqual
-      </c:if>
+        <c:if test="${bean.intProperty eq long3}">
+            equal
+        </c:if>
+        <c:if test="${bean.intProperty ge long3}">
+            greaterEqual
+        </c:if>
+        <c:if test="${bean.intProperty gt long3}">
+            greaterThan
+        </c:if>
+        <c:if test="${bean.intProperty le long3}">
+            lessEqual
+        </c:if>
+        <c:if test="${bean.intProperty lt long3}">
+            lessThan
+        </c:if>
+        <c:if test="${bean.intProperty ne long3}">
+            notEqual
+        </c:if>
     </td>
-  </tr>
-  <tr>
+</tr>
+<tr>
     <td>long / EQ</td>
     <td><c:out value="${bean.longProperty}"/></td>
     <td><c:out value="${long1}"/></td>
     <td>equal greaterEqual lessEqual</td>
     <td>
-      <c:if test="${bean.longProperty eq long1}">
-        equal
-      </c:if>
-      <c:if test="${bean.longProperty ge long1}">
-        greaterEqual
-      </c:if>
-      <c:if test="${bean.longProperty gt long1}">
-        greaterThan
-      </c:if>
-      <c:if test="${bean.longProperty le long1}">
-        lessEqual
-      </c:if>
-      <c:if test="${bean.longProperty lt long1}">
-        lessThan
-      </c:if>
-      <c:if test="${bean.longProperty ne long1}">
-        notEqual
-      </c:if>
+        <c:if test="${bean.longProperty eq long1}">
+            equal
+        </c:if>
+        <c:if test="${bean.longProperty ge long1}">
+            greaterEqual
+        </c:if>
+        <c:if test="${bean.longProperty gt long1}">
+            greaterThan
+        </c:if>
+        <c:if test="${bean.longProperty le long1}">
+            lessEqual
+        </c:if>
+        <c:if test="${bean.longProperty lt long1}">
+            lessThan
+        </c:if>
+        <c:if test="${bean.longProperty ne long1}">
+            notEqual
+        </c:if>
     </td>
-  </tr>
-  <tr>
+</tr>
+<tr>
     <td>long / GT</td>
     <td><c:out value="${bean.longProperty}"/></td>
     <td><c:out value="${long2}"/></td>
     <td>greaterEqual greaterThan notEqual</td>
     <td>
-      <c:if test="${bean.longProperty eq long2}">
-        equal
-      </c:if>
-      <c:if test="${bean.longProperty ge long2}">
-        greaterEqual
-      </c:if>
-      <c:if test="${bean.longProperty gt long2}">
-        greaterThan
-      </c:if>
-      <c:if test="${bean.longProperty le long2}">
-        lessEqual
-      </c:if>
-      <c:if test="${bean.longProperty lt long2}">
-        lessThan
-      </c:if>
-      <c:if test="${bean.longProperty ne long2}">
-        notEqual
-      </c:if>
+        <c:if test="${bean.longProperty eq long2}">
+            equal
+        </c:if>
+        <c:if test="${bean.longProperty ge long2}">
+            greaterEqual
+        </c:if>
+        <c:if test="${bean.longProperty gt long2}">
+            greaterThan
+        </c:if>
+        <c:if test="${bean.longProperty le long2}">
+            lessEqual
+        </c:if>
+        <c:if test="${bean.longProperty lt long2}">
+            lessThan
+        </c:if>
+        <c:if test="${bean.longProperty ne long2}">
+            notEqual
+        </c:if>
     </td>
-  </tr>
-  <tr>
+</tr>
+<tr>
     <td>long / LT</td>
     <td><c:out value="${bean.longProperty}"/></td>
     <td><c:out value="${long3}"/></td>
     <td>lessEqual lessThan notEqual</td>
     <td>
-      <c:if test="${bean.longProperty eq long3}">
-        equal
-      </c:if>
-      <c:if test="${bean.longProperty ge long3}">
-        greaterEqual
-      </c:if>
-      <c:if test="${bean.longProperty gt long3}">
-        greaterThan
-      </c:if>
-      <c:if test="${bean.longProperty le long3}">
-        lessEqual
-      </c:if>
-      <c:if test="${bean.longProperty lt long3}">
-        lessThan
-      </c:if>
-      <c:if test="${bean.longProperty ne long3}">
-        notEqual
-      </c:if>
+        <c:if test="${bean.longProperty eq long3}">
+            equal
+        </c:if>
+        <c:if test="${bean.longProperty ge long3}">
+            greaterEqual
+        </c:if>
+        <c:if test="${bean.longProperty gt long3}">
+            greaterThan
+        </c:if>
+        <c:if test="${bean.longProperty le long3}">
+            lessEqual
+        </c:if>
+        <c:if test="${bean.longProperty lt long3}">
+            lessThan
+        </c:if>
+        <c:if test="${bean.longProperty ne long3}">
+            notEqual
+        </c:if>
     </td>
-  </tr>
-  <tr>
+</tr>
+<tr>
     <td>short / EQ</td>
     <td><c:out value="${bean.shortProperty}"/></td>
     <td><c:out value="${short1}"/></td>
     <td>equal greaterEqual lessEqual</td>
     <td>
-      <c:if test="${bean.shortProperty eq short1}">
-        equal
-      </c:if>
-      <c:if test="${bean.shortProperty ge short1}">
-        greaterEqual
-      </c:if>
-      <c:if test="${bean.shortProperty gt short1}">
-        greaterThan
-      </c:if>
-      <c:if test="${bean.shortProperty le short1}">
-        lessEqual
-      </c:if>
-      <c:if test="${bean.shortProperty lt short1}">
-        lessThan
-      </c:if>
-      <c:if test="${bean.shortProperty ne short1}">
-        notEqual
-      </c:if>
+        <c:if test="${bean.shortProperty eq short1}">
+            equal
+        </c:if>
+        <c:if test="${bean.shortProperty ge short1}">
+            greaterEqual
+        </c:if>
+        <c:if test="${bean.shortProperty gt short1}">
+            greaterThan
+        </c:if>
+        <c:if test="${bean.shortProperty le short1}">
+            lessEqual
+        </c:if>
+        <c:if test="${bean.shortProperty lt short1}">
+            lessThan
+        </c:if>
+        <c:if test="${bean.shortProperty ne short1}">
+            notEqual
+        </c:if>
     </td>
-  </tr>
-  <tr>
+</tr>
+<tr>
     <td>short / GT</td>
     <td><c:out value="${bean.shortProperty}"/></td>
     <td><c:out value="${short2}"/></td>
     <td>greaterEqual greaterThan notEqual</td>
     <td>
-      <c:if test="${bean.shortProperty eq short2}">
-        equal
-      </c:if>
-      <c:if test="${bean.shortProperty ge short2}">
-        greaterEqual
-      </c:if>
-      <c:if test="${bean.shortProperty gt short2}">
-        greaterThan
-      </c:if>
-      <c:if test="${bean.shortProperty le short2}">
-        lessEqual
-      </c:if>
-      <c:if test="${bean.shortProperty lt short2}">
-        lessThan
-      </c:if>
-      <c:if test="${bean.shortProperty ne short2}">
-        notEqual
-      </c:if>
+        <c:if test="${bean.shortProperty eq short2}">
+            equal
+        </c:if>
+        <c:if test="${bean.shortProperty ge short2}">
+            greaterEqual
+        </c:if>
+        <c:if test="${bean.shortProperty gt short2}">
+            greaterThan
+        </c:if>
+        <c:if test="${bean.shortProperty le short2}">
+            lessEqual
+        </c:if>
+        <c:if test="${bean.shortProperty lt short2}">
+            lessThan
+        </c:if>
+        <c:if test="${bean.shortProperty ne short2}">
+            notEqual
+        </c:if>
     </td>
-  </tr>
-  <tr>
+</tr>
+<tr>
     <td>short / LT</td>
     <td><c:out value="${bean.shortProperty}"/></td>
     <td><c:out value="${short3}"/></td>
     <td>lessEqual lessThan notEqual</td>
     <td>
-      <c:if test="${bean.shortProperty eq short3}">
-        equal
-      </c:if>
-      <c:if test="${bean.shortProperty ge short3}">
-        greaterEqual
-      </c:if>
-      <c:if test="${bean.shortProperty gt short3}">
-        greaterThan
-      </c:if>
-      <c:if test="${bean.shortProperty le short3}">
-        lessEqual
-      </c:if>
-      <c:if test="${bean.shortProperty lt short3}">
-        lessThan
-      </c:if>
-      <c:if test="${bean.shortProperty ne short3}">
-        notEqual
-      </c:if>
+        <c:if test="${bean.shortProperty eq short3}">
+            equal
+        </c:if>
+        <c:if test="${bean.shortProperty ge short3}">
+            greaterEqual
+        </c:if>
+        <c:if test="${bean.shortProperty gt short3}">
+            greaterThan
+        </c:if>
+        <c:if test="${bean.shortProperty le short3}">
+            lessEqual
+        </c:if>
+        <c:if test="${bean.shortProperty lt short3}">
+            lessThan
+        </c:if>
+        <c:if test="${bean.shortProperty ne short3}">
+            notEqual
+        </c:if>
     </td>
-  </tr>
-  <tr>
+</tr>
+<tr>
     <td>string / EQ</td>
     <td><c:out value="${bean.stringProperty}"/></td>
     <td><c:out value="${str1}"/></td>
     <td>equal greaterEqual lessEqual</td>
     <td>
-      <c:if test="${bean.stringProperty eq str1}">
-        equal
-      </c:if>
-      <c:if test="${bean.stringProperty ge str1}">
-        greaterEqual
-      </c:if>
-      <c:if test="${bean.stringProperty gt str1}">
-        greaterThan
-      </c:if>
-      <c:if test="${bean.stringProperty le str1}">
-        lessEqual
-      </c:if>
-      <c:if test="${bean.stringProperty lt str1}">
-        lessThan
-      </c:if>
-      <c:if test="${bean.stringProperty ne str1}">
-        notEqual
-      </c:if>
+        <c:if test="${bean.stringProperty eq str1}">
+            equal
+        </c:if>
+        <c:if test="${bean.stringProperty ge str1}">
+            greaterEqual
+        </c:if>
+        <c:if test="${bean.stringProperty gt str1}">
+            greaterThan
+        </c:if>
+        <c:if test="${bean.stringProperty le str1}">
+            lessEqual
+        </c:if>
+        <c:if test="${bean.stringProperty lt str1}">
+            lessThan
+        </c:if>
+        <c:if test="${bean.stringProperty ne str1}">
+            notEqual
+        </c:if>
     </td>
-  </tr>
-  <tr>
+</tr>
+<tr>
     <td>string / GT</td>
     <td><c:out value="${bean.stringProperty}"/></td>
     <td><c:out value="${str2}"/></td>
     <td>greaterEqual greaterThan notEqual</td>
     <td>
-      <c:if test="${bean.stringProperty eq str2}">
-        equal
-      </c:if>
-      <c:if test="${bean.stringProperty ge str2}">
-        greaterEqual
-      </c:if>
-      <c:if test="${bean.stringProperty gt str2}">
-        greaterThan
-      </c:if>
-      <c:if test="${bean.stringProperty le str2}">
-        lessEqual
-      </c:if>
-      <c:if test="${bean.stringProperty lt str2}">
-        lessThan
-      </c:if>
-      <c:if test="${bean.stringProperty ne str2}">
-        notEqual
-      </c:if>
+        <c:if test="${bean.stringProperty eq str2}">
+            equal
+        </c:if>
+        <c:if test="${bean.stringProperty ge str2}">
+            greaterEqual
+        </c:if>
+        <c:if test="${bean.stringProperty gt str2}">
+            greaterThan
+        </c:if>
+        <c:if test="${bean.stringProperty le str2}">
+            lessEqual
+        </c:if>
+        <c:if test="${bean.stringProperty lt str2}">
+            lessThan
+        </c:if>
+        <c:if test="${bean.stringProperty ne str2}">
+            notEqual
+        </c:if>
     </td>
-  </tr>
-  <tr>
+</tr>
+<tr>
     <td>string / LT</td>
     <td><c:out value="${bean.stringProperty}"/></td>
     <td><c:out value="${str3}"/></td>
     <td>lessEqual lessThan notEqual</td>
     <td>
-      <c:if test="${bean.stringProperty eq str3}">
-        equal
-      </c:if>
-      <c:if test="${bean.stringProperty ge str3}">
-        greaterEqual
-      </c:if>
-      <c:if test="${bean.stringProperty gt str3}">
-        greaterThan
-      </c:if>
-      <c:if test="${bean.stringProperty le str3}">
-        lessEqual
-      </c:if>
-      <c:if test="${bean.stringProperty lt str3}">
-        lessThan
-      </c:if>
-      <c:if test="${bean.stringProperty ne str3}">
-        notEqual
-      </c:if>
+        <c:if test="${bean.stringProperty eq str3}">
+            equal
+        </c:if>
+        <c:if test="${bean.stringProperty ge str3}">
+            greaterEqual
+        </c:if>
+        <c:if test="${bean.stringProperty gt str3}">
+            greaterThan
+        </c:if>
+        <c:if test="${bean.stringProperty le str3}">
+            lessEqual
+        </c:if>
+        <c:if test="${bean.stringProperty lt str3}">
+            lessThan
+        </c:if>
+        <c:if test="${bean.stringProperty ne str3}">
+            notEqual
+        </c:if>
     </td>
-  </tr>
-  <tr>
+</tr>
+<tr>
     <td>string / NULL</td>
     <td><c:out value="${bean.nullProperty}" default=""/></td>
     <td>&nbsp;</td>
     <td>equal greaterEqual lessEqual</td>
     <td>
-      <c:if test='${bean.nullProperty eq ""}'>
-        equal
-      </c:if>
-      <c:if test='${bean.nullProperty ge ""}'>
-        greaterEqual
-      </c:if>
-      <c:if test='${bean.nullProperty gt ""}'>
-        greaterThan
-      </c:if>
-      <c:if test='${bean.nullProperty le ""}'>
-        lessEqual
-      </c:if>
-      <c:if test='${bean.nullProperty lt ""}'>
-        lessThan
-      </c:if>
-      <c:if test='${bean.nullProperty ne ""}'>
-        notEqual
-      </c:if>
+        <c:if test='${bean.nullProperty eq ""}'>
+            equal
+        </c:if>
+        <c:if test='${bean.nullProperty ge ""}'>
+            greaterEqual
+        </c:if>
+        <c:if test='${bean.nullProperty gt ""}'>
+            greaterThan
+        </c:if>
+        <c:if test='${bean.nullProperty le ""}'>
+            lessEqual
+        </c:if>
+        <c:if test='${bean.nullProperty lt ""}'>
+            lessThan
+        </c:if>
+        <c:if test='${bean.nullProperty ne ""}'>
+            notEqual
+        </c:if>
     </td>
-  </tr>
+</tr>
 </table>
 
 

Modified: struts/el/trunk/web/exercise-taglib/logic-empty.jsp
URL: http://svn.apache.org/viewcvs/struts/el/trunk/web/exercise-taglib/logic-empty.jsp?rev=376788&r1=376787&r2=376788&view=diff
==============================================================================
--- struts/el/trunk/web/exercise-taglib/logic-empty.jsp (original)
+++ struts/el/trunk/web/exercise-taglib/logic-empty.jsp Fri Feb 10 10:27:39 2006
@@ -1,83 +1,85 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <%@ page language="java" %>
-<%@ taglib uri="http://struts.apache.org/tags-html-el"  prefix="html-el"  %>
-<%@ taglib uri="http://struts.apache.org/tags-bean-el"  prefix="bean-el" %>
+<%@ taglib uri="http://struts.apache.org/tags-html-el" prefix="html-el" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean-el" prefix="bean-el" %>
 <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 <html-el:html>
-<head>
-<title>Test Replacements for struts emptiness tags</title>
-</head>
-<body bgcolor="white">
+    <head>
+        <title>Test Replacements for struts emptiness tags</title>
+    </head>
 
-<div align="center">
-<h1>Test Replacements for struts emptiness tags</h1>
-</div>
+    <body bgcolor="white">
 
-<jsp:useBean id="bean" scope="page" class="org.apache.struts.webapp.exercise.TestBean"/>
+    <div align="center">
+        <h1>Test Replacements for struts emptiness tags</h1>
+    </div>
 
-<table border="1">
-  <tr>
-    <th>Test Type</th>
-    <th>Correct Value</th>
-    <th>Test Result</th>
-  </tr>
-  <tr>
-    <td>null</td>
-    <td>empty</td>
-    <td>
-      <c:choose>
-       <c:when test="${empty bean.nullProperty}">
-        empty
-       </c:when>
-       <c:otherwise>
-        notEmpty
-       </c:otherwise>
-      </c:choose>
-    </td>
-  </tr>
-  <tr>
-    <td>empty string</td>
-    <td>empty</td>
-    <td>
-      <c:choose>
-       <c:when test="${empty bean.emptyStringProperty}">
-        empty
-       </c:when>
-       <c:otherwise>
-        notEmpty
-       </c:otherwise>
-      </c:choose>
-    </td>
-  </tr>
-  <tr>
-    <td>non-empty string</td>
-    <td>notEmpty</td>
-    <td>
-      <c:choose>
-       <c:when test="${empty bean.stringProperty}">
-        empty
-       </c:when>
-       <c:otherwise>
-        notEmpty
-       </c:otherwise>
-      </c:choose>
-    </td>
-  </tr>
-  <tr>
-    <td>non-string object</td>
-    <td>notEmpty</td>
-    <td>
-      <c:choose>
-       <c:when test="${empty bean.intProperty}">
-        empty
-       </c:when>
-       <c:otherwise>
-        notEmpty
-       </c:otherwise>
-      </c:choose>
-    </td>
-  </tr>
-</table>
+    <jsp:useBean id="bean" scope="page"
+                 class="org.apache.struts.webapp.exercise.TestBean"/>
 
-</body>
+    <table border="1">
+        <tr>
+            <th>Test Type</th>
+            <th>Correct Value</th>
+            <th>Test Result</th>
+        </tr>
+        <tr>
+            <td>null</td>
+            <td>empty</td>
+            <td>
+                <c:choose>
+                    <c:when test="${empty bean.nullProperty}">
+                        empty
+                    </c:when>
+                    <c:otherwise>
+                        notEmpty
+                    </c:otherwise>
+                </c:choose>
+            </td>
+        </tr>
+        <tr>
+            <td>empty string</td>
+            <td>empty</td>
+            <td>
+                <c:choose>
+                    <c:when test="${empty bean.emptyStringProperty}">
+                        empty
+                    </c:when>
+                    <c:otherwise>
+                        notEmpty
+                    </c:otherwise>
+                </c:choose>
+            </td>
+        </tr>
+        <tr>
+            <td>non-empty string</td>
+            <td>notEmpty</td>
+            <td>
+                <c:choose>
+                    <c:when test="${empty bean.stringProperty}">
+                        empty
+                    </c:when>
+                    <c:otherwise>
+                        notEmpty
+                    </c:otherwise>
+                </c:choose>
+            </td>
+        </tr>
+        <tr>
+            <td>non-string object</td>
+            <td>notEmpty</td>
+            <td>
+                <c:choose>
+                    <c:when test="${empty bean.intProperty}">
+                        empty
+                    </c:when>
+                    <c:otherwise>
+                        notEmpty
+                    </c:otherwise>
+                </c:choose>
+            </td>
+        </tr>
+    </table>
+
+    </body>
 </html-el:html>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org


Mime
View raw message