You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by ug...@apache.org on 2006/03/07 12:02:18 UTC
svn commit: r383843 - in
/cocoon/trunk/cocoon-forms/cocoon-forms-sample/src/main/resources/samples:
forms/form2_bind_bean.xml forms/form2_bind_xml.xml forms/form2_jx.xml
forms/form2_model.xml forms/form2_template.xml messages/OtherMessages.xml
Author: ugo
Date: Tue Mar 7 03:02:16 2006
New Revision: 383843
URL: http://svn.apache.org/viewcvs?rev=383843&view=rev
Log:
Added support for Commons enums to CForms [#COCOON-1793]
Modified:
cocoon/trunk/cocoon-forms/cocoon-forms-sample/src/main/resources/samples/forms/form2_bind_bean.xml
cocoon/trunk/cocoon-forms/cocoon-forms-sample/src/main/resources/samples/forms/form2_bind_xml.xml
cocoon/trunk/cocoon-forms/cocoon-forms-sample/src/main/resources/samples/forms/form2_jx.xml
cocoon/trunk/cocoon-forms/cocoon-forms-sample/src/main/resources/samples/forms/form2_model.xml
cocoon/trunk/cocoon-forms/cocoon-forms-sample/src/main/resources/samples/forms/form2_template.xml
cocoon/trunk/cocoon-forms/cocoon-forms-sample/src/main/resources/samples/messages/OtherMessages.xml
Modified: cocoon/trunk/cocoon-forms/cocoon-forms-sample/src/main/resources/samples/forms/form2_bind_bean.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-forms/cocoon-forms-sample/src/main/resources/samples/forms/form2_bind_bean.xml?rev=383843&r1=383842&r2=383843&view=diff
==============================================================================
--- cocoon/trunk/cocoon-forms/cocoon-forms-sample/src/main/resources/samples/forms/form2_bind_bean.xml (original)
+++ cocoon/trunk/cocoon-forms/cocoon-forms-sample/src/main/resources/samples/forms/form2_bind_bean.xml Tue Mar 7 03:02:16 2006
@@ -84,6 +84,7 @@
<fb:value id="lastname" path="lastName"/>
<fb:value id="phone" path="phone"/>
<fb:value id="email" path="email"/>
+ <fb:value id="preferred" path="preferred"/>
</fb:on-bind>
<fb:on-delete-row>
Modified: cocoon/trunk/cocoon-forms/cocoon-forms-sample/src/main/resources/samples/forms/form2_bind_xml.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-forms/cocoon-forms-sample/src/main/resources/samples/forms/form2_bind_xml.xml?rev=383843&r1=383842&r2=383843&view=diff
==============================================================================
--- cocoon/trunk/cocoon-forms/cocoon-forms-sample/src/main/resources/samples/forms/form2_bind_xml.xml (original)
+++ cocoon/trunk/cocoon-forms/cocoon-forms-sample/src/main/resources/samples/forms/form2_bind_xml.xml Tue Mar 7 03:02:16 2006
@@ -104,6 +104,7 @@
<fb:value id="lastname" path="lastname" />
<fb:value id="phone" path="phone/@nr" />
<fb:value id="email" path="email" />
+ <fb:value id="preferred" path="preferred"/>
</fb:on-bind>
<fb:on-delete-row>
Modified: cocoon/trunk/cocoon-forms/cocoon-forms-sample/src/main/resources/samples/forms/form2_jx.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-forms/cocoon-forms-sample/src/main/resources/samples/forms/form2_jx.xml?rev=383843&r1=383842&r2=383843&view=diff
==============================================================================
--- cocoon/trunk/cocoon-forms/cocoon-forms-sample/src/main/resources/samples/forms/form2_jx.xml (original)
+++ cocoon/trunk/cocoon-forms/cocoon-forms-sample/src/main/resources/samples/forms/form2_jx.xml Tue Mar 7 03:02:16 2006
@@ -40,6 +40,7 @@
<th>lastName</th>
<th>phone</th>
<th>email</th>
+ <th>preferred contact</th>
</tr>
<jx:forEach var="item" items="${form2bean.contacts}">
<tr>
@@ -48,6 +49,7 @@
<td>${item.lastName}</td>
<td>${item.phone}</td>
<td>${item.email}</td>
+ <td><i18n:text xmlns:i18n="http://apache.org/cocoon/i18n/2.1">${item.preferred}</i18n:text></td>
</tr>
</jx:forEach>
</table>
Modified: cocoon/trunk/cocoon-forms/cocoon-forms-sample/src/main/resources/samples/forms/form2_model.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-forms/cocoon-forms-sample/src/main/resources/samples/forms/form2_model.xml?rev=383843&r1=383842&r2=383843&view=diff
==============================================================================
--- cocoon/trunk/cocoon-forms/cocoon-forms-sample/src/main/resources/samples/forms/form2_model.xml (original)
+++ cocoon/trunk/cocoon-forms/cocoon-forms-sample/src/main/resources/samples/forms/form2_model.xml Tue Mar 7 03:02:16 2006
@@ -148,6 +148,15 @@
</fd:validation>
</fd:datatype>
</fd:field>
+ <fd:field id="preferred">
+ <fd:label>Preferred contact</fd:label>
+ <fd:datatype base="enum">
+ <fd:convertor type="enum">
+ <fd:enum>org.apache.cocoon.forms.samples.PreferredContact</fd:enum>
+ </fd:convertor>
+ </fd:datatype>
+ <fd:selection-list type="enum" class="org.apache.cocoon.forms.samples.PreferredContact" nullable="true" null-text="Select..."/>
+ </fd:field>
<fd:booleanfield id="select">
<fd:label>Select</fd:label>
</fd:booleanfield>
Modified: cocoon/trunk/cocoon-forms/cocoon-forms-sample/src/main/resources/samples/forms/form2_template.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-forms/cocoon-forms-sample/src/main/resources/samples/forms/form2_template.xml?rev=383843&r1=383842&r2=383843&view=diff
==============================================================================
--- cocoon/trunk/cocoon-forms/cocoon-forms-sample/src/main/resources/samples/forms/form2_template.xml (original)
+++ cocoon/trunk/cocoon-forms/cocoon-forms-sample/src/main/resources/samples/forms/form2_template.xml Tue Mar 7 03:02:16 2006
@@ -85,6 +85,7 @@
<th><ft:repeater-widget-label id="contacts" widget-id="lastname"/></th>
<th><ft:repeater-widget-label id="contacts" widget-id="phone"/></th>
<th><ft:repeater-widget-label id="contacts" widget-id="email"/></th>
+ <th><ft:repeater-widget-label id="contacts" widget-id="preferred"/></th>
<th><ft:repeater-widget-label id="contacts" widget-id="select"/></th>
</tr>
@@ -99,6 +100,7 @@
<td><ft:widget id="lastname"/></td>
<td><ft:widget id="phone"/></td>
<td><ft:widget id="email"/></td>
+ <td><ft:widget id="preferred"/></td>
<td><ft:widget id="select"/></td>
</tr>
</ft:repeater-widget>
Modified: cocoon/trunk/cocoon-forms/cocoon-forms-sample/src/main/resources/samples/messages/OtherMessages.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-forms/cocoon-forms-sample/src/main/resources/samples/messages/OtherMessages.xml?rev=383843&r1=383842&r2=383843&view=diff
==============================================================================
--- cocoon/trunk/cocoon-forms/cocoon-forms-sample/src/main/resources/samples/messages/OtherMessages.xml (original)
+++ cocoon/trunk/cocoon-forms/cocoon-forms-sample/src/main/resources/samples/messages/OtherMessages.xml Tue Mar 7 03:02:16 2006
@@ -17,4 +17,9 @@
<catalogue>
<message key="org.apache.cocoon.forms.samples.Sex.FEMALE">female</message>
<message key="org.apache.cocoon.forms.samples.Sex.MALE">male</message>
+ <message key="org.apache.cocoon.forms.samples.PreferredContact.EMAIL">Email</message>
+ <message key="org.apache.cocoon.forms.samples.PreferredContact.FAX">Fax</message>
+ <message key="org.apache.cocoon.forms.samples.PreferredContact.PAGER">Pager</message>
+ <message key="org.apache.cocoon.forms.samples.PreferredContact.PHONE">Phone</message>
+ <message key="org.apache.cocoon.forms.samples.PreferredContact.POSTAL_MAIL">Postal mail</message>
</catalogue>