You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by cr...@locus.apache.org on 2000/06/17 00:18:17 UTC
cvs commit: jakarta-struts/web/example subscription.jsp
craigmcc 00/06/16 15:18:17
Modified: src/share/org/apache/struts/taglib SelectTag.java
TextareaTag.java
web/example subscription.jsp
Log:
Repair the <struts:textarea> and <struts:select> tags so that they work
again. Textarea was throwing and exception, and select was not rendering
the internal <struts:option> entries.
Revision Changes Path
1.4 +8 -5 jakarta-struts/src/share/org/apache/struts/taglib/SelectTag.java
Index: SelectTag.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/SelectTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SelectTag.java 2000/06/16 04:41:08 1.3
+++ SelectTag.java 2000/06/16 22:18:14 1.4
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/SelectTag.java,v 1.3 2000/06/16 04:41:08 craigmcc Exp $
- * $Revision: 1.3 $
- * $Date: 2000/06/16 04:41:08 $
+ * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/SelectTag.java,v 1.4 2000/06/16 22:18:14 craigmcc Exp $
+ * $Revision: 1.4 $
+ * $Date: 2000/06/16 22:18:14 $
*
* ====================================================================
*
@@ -79,7 +79,7 @@
* inside a form tag.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.3 $ $Date: 2000/06/16 04:41:08 $
+ * @version $Revision: 1.4 $ $Date: 2000/06/16 22:18:14 $
*/
public final class SelectTag extends BaseHandlerTag {
@@ -247,7 +247,10 @@
pageContext.removeAttribute(Constants.SELECT_KEY);
// Render a tag representing the end of our current form
- StringBuffer results = new StringBuffer("</select>");
+ StringBuffer results = new StringBuffer();
+ if (bodyContent != null)
+ results.append(bodyContent.getString());
+ results.append("</select>");
// Print this value to our output writer
JspWriter writer = pageContext.getOut();
1.7 +5 -5 jakarta-struts/src/share/org/apache/struts/taglib/TextareaTag.java
Index: TextareaTag.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/TextareaTag.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TextareaTag.java 2000/06/16 04:41:08 1.6
+++ TextareaTag.java 2000/06/16 22:18:14 1.7
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/TextareaTag.java,v 1.6 2000/06/16 04:41:08 craigmcc Exp $
- * $Revision: 1.6 $
- * $Date: 2000/06/16 04:41:08 $
+ * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/TextareaTag.java,v 1.7 2000/06/16 22:18:14 craigmcc Exp $
+ * $Revision: 1.7 $
+ * $Date: 2000/06/16 22:18:14 $
*
* ====================================================================
*
@@ -77,7 +77,7 @@
* Custom tag for input fields of type "textarea".
*
* @author Craig R. McClanahan
- * @version $Revision: 1.6 $ $Date: 2000/06/16 04:41:08 $
+ * @version $Revision: 1.7 $ $Date: 2000/06/16 22:18:14 $
*/
public class TextareaTag extends BaseInputTag {
@@ -160,7 +160,7 @@
}
// Continue processing this page
- return (EVAL_BODY_INCLUDE);
+ return (EVAL_BODY_TAG);
}
1.4 +3 -3 jakarta-struts/web/example/subscription.jsp
Index: subscription.jsp
===================================================================
RCS file: /home/cvs/jakarta-struts/web/example/subscription.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- subscription.jsp 2000/06/16 04:41:12 1.3
+++ subscription.jsp 2000/06/16 22:18:16 1.4
@@ -40,7 +40,7 @@
<struts:message key="prompt.mailHostname"/>
</th>
<td align="left">
- <struts:text property="host" size="50"/>
+ <struts:textarea property="host" cols="50" rows="1"/>
</td>
</tr>
@@ -67,7 +67,6 @@
<struts:message key="prompt.mailServerType"/>
</th>
<td align="left">
-<%--
<struts:select property="type">
<struts:option value="pop3">
<struts:message key="option.pop3"/>
@@ -76,13 +75,14 @@
<struts:message key="option.imap"/>
</struts:option>
</struts:select>
---%>
+<%--
<struts:radio property="type" value="imap">
<struts:message key="option.imap"/>
</struts:radio>
<struts:radio property="type" value="pop3">
<struts:message key="option.pop3"/>
</struts:radio>
+--%>
</td>
</tr>