You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by br...@apache.org on 2003/11/02 10:52:05 UTC
cvs commit: cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel AggregateFieldDefinitionBuilder.java RepeaterDefinitionBuilder.java
bruno 2003/11/02 01:52:05
Modified: src/blocks/woody/java/org/apache/cocoon/woody/formmodel
AggregateFieldDefinitionBuilder.java
RepeaterDefinitionBuilder.java
Log:
Child widget definitions are now located inside a wd:widgets element.
Revision Changes Path
1.4 +2 -2 cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/AggregateFieldDefinitionBuilder.java
Index: AggregateFieldDefinitionBuilder.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/AggregateFieldDefinitionBuilder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AggregateFieldDefinitionBuilder.java 24 Oct 2003 14:13:49 -0000 1.3
+++ AggregateFieldDefinitionBuilder.java 2 Nov 2003 09:52:05 -0000 1.4
@@ -71,8 +71,8 @@
setDisplayData(widgetElement, definition);
// make childfields
- Element childrenElement = DomHelper.getChildElement(widgetElement, Constants.WD_NS, "children", true);
- Element[] fieldElements = DomHelper.getChildElements(childrenElement, Constants.WD_NS, "field");
+ Element widgetsElement = DomHelper.getChildElement(widgetElement, Constants.WD_NS, "widgets", true);
+ Element[] fieldElements = DomHelper.getChildElements(widgetsElement, Constants.WD_NS, "field");
for (int i = 0; i < fieldElements.length; i++) {
FieldDefinition fieldDefinition = (FieldDefinition)buildAnotherWidgetDefinition(fieldElements[i]);
if (!String.class.isAssignableFrom(fieldDefinition.getDatatype().getTypeClass()))
1.4 +6 -5 cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/RepeaterDefinitionBuilder.java
Index: RepeaterDefinitionBuilder.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/RepeaterDefinitionBuilder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RepeaterDefinitionBuilder.java 24 Oct 2003 14:13:49 -0000 1.3
+++ RepeaterDefinitionBuilder.java 2 Nov 2003 09:52:05 -0000 1.4
@@ -59,13 +59,14 @@
*/
public class RepeaterDefinitionBuilder extends AbstractWidgetDefinitionBuilder {
- public WidgetDefinition buildWidgetDefinition(Element widgetElement) throws Exception {
+ public WidgetDefinition buildWidgetDefinition(Element repeaterElement) throws Exception {
RepeaterDefinition repeaterDefinition = new RepeaterDefinition();
- setId(widgetElement, repeaterDefinition);
- setDisplayData(widgetElement, repeaterDefinition);
+ setId(repeaterElement, repeaterDefinition);
+ setDisplayData(repeaterElement, repeaterDefinition);
- // the children of the repeater element are widget configuration elements
- Element[] widgetElements = DomHelper.getChildElements(widgetElement, Constants.WD_NS);
+ Element widgetsElement = DomHelper.getChildElement(repeaterElement, Constants.WD_NS, "widgets", true);
+ // All child elements of the widgets element are widgets
+ Element[] widgetElements = DomHelper.getChildElements(widgetsElement, Constants.WD_NS);
for (int i = 0; i < widgetElements.length; i++) {
WidgetDefinition widgetDefinition = buildAnotherWidgetDefinition(widgetElements[i]);
repeaterDefinition.addWidget(widgetDefinition);