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

[tim]

tim         2003/12/29 07:48:32

  Modified:    src/blocks/woody/java/org/apache/cocoon/woody
                        DefaultFormManager.java
               src/blocks/woody/java/org/apache/cocoon/woody/formmodel
                        FormDefinitionBuilder.java
  Log:
  Starting to move class resolving into builder.
  
  Revision  Changes    Path
  1.11      +0 -1      
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/DefaultFormManager.java
  
  Index: DefaultFormManager.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/DefaultFormManager.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- DefaultFormManager.java   29 Dec 2003 06:14:48 -0000      1.10
  +++ DefaultFormManager.java   29 Dec 2003 15:48:32 -0000      1.11
  @@ -150,7 +150,6 @@
   
               FormDefinitionBuilder formDefinitionBuilder = 
(FormDefinitionBuilder)widgetDefinitionBuilderSelector.select("form");
               formDefinition = 
(FormDefinition)formDefinitionBuilder.buildWidgetDefinition(formElement);
  -            formDefinition.resolve();
               storeFormDefinition(formDefinition, source);
           }
           return formDefinition;
  
  
  
  1.6       +2 -0      
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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- FormDefinitionBuilder.java        19 Dec 2003 21:28:39 -0000      1.5
  +++ FormDefinitionBuilder.java        29 Dec 2003 15:48:32 -0000      1.6
  @@ -74,6 +74,8 @@
               formDefinition.addWidgetDefinition(widgetDefinition);
           }
   
  +        formDefinition.resolve();
  +
           return formDefinition;
       }
   }