joerg       2004/04/23 17:00:42

  Modified:    src/blocks/javaflow/java/org/apache/cocoon/forms/flow/java
                        FormInstance.java
  Log:
  clean up: removed the duplicate storage of the Form
  
  Revision  Changes    Path
  1.7       +3 -6      
cocoon-2.1/src/blocks/javaflow/java/org/apache/cocoon/forms/flow/java/FormInstance.java
  
  Index: FormInstance.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/javaflow/java/org/apache/cocoon/forms/flow/java/FormInstance.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- FormInstance.java 16 Apr 2004 09:39:57 -0000      1.6
  +++ FormInstance.java 24 Apr 2004 00:00:42 -0000      1.7
  @@ -44,7 +44,6 @@
   
       private Form form;
       private Binding binding;
  -    private Widget formWidget;
       private Locale locale;
       private boolean isValid;
       private Object validator; // Used?
  @@ -93,10 +92,8 @@
           try {
               formMgr = (FormManager)getComponent(FormManager.ROLE);
               resolver = (SourceResolver)getComponent(SourceResolver.ROLE);
  -            Form form = formMgr.createForm(formDefinition);
  +            this.form = formMgr.createForm(formDefinition);
               this.binding = null;
  -            // this.formWidget = new Widget(form);  could not create instance
  -            // this.local = cocoon.createPageLocal(); PageLocal ?
           } catch (Exception e) {
               throw new CascadingRuntimeException("Could not create form 
instance", e);
           } finally {
  @@ -107,7 +104,7 @@
       }
   
       public Widget getModel() {
  -        return this.formWidget;
  +        return this.form;
       }
   
       /**
  
  
  

Reply via email to