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/01 21:08:18 UTC

cvs commit: cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel FormDefinitionBuilder.java

bruno       2003/11/01 12:08:18

  Modified:    src/blocks/woody/java/org/apache/cocoon/woody/formmodel
                        FormDefinitionBuilder.java
  Log:
  Child widget definitions are now located inside a wd:widgets element.
  
  Revision  Changes    Path
  1.4       +3 -3      cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/FormDefinitionBuilder.java
  
  Index: FormDefinitionBuilder.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/FormDefinitionBuilder.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- FormDefinitionBuilder.java	24 Oct 2003 14:13:49 -0000	1.3
  +++ FormDefinitionBuilder.java	1 Nov 2003 20:08:18 -0000	1.4
  @@ -65,9 +65,9 @@
           formDefinition.setId("");
           setDisplayData(formElement, formDefinition);
   
  -        // all child elements of the form element, that are in woody's namespace, are supposed
  -        // to be widgets
  -        Element[] widgetElements = DomHelper.getChildElements(formElement, Constants.WD_NS);
  +        Element widgetsElement = DomHelper.getChildElement(formElement, 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++) {
               Element widgetElement = widgetElements[i];
               WidgetDefinition widgetDefinition = buildAnotherWidgetDefinition(widgetElement);