cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject cvs commit: cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody DefaultFormManager.java
Date Wed, 14 May 2003 12:23:32 GMT
bruno       2003/05/14 05:23:32

  Modified:    src/blocks/woody/java/org/apache/cocoon/woody
                        DefaultFormManager.java
  Log:
  cache form definitions
  
  Revision  Changes    Path
  1.4       +70 -18    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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DefaultFormManager.java	14 May 2003 11:35:38 -0000	1.3
  +++ DefaultFormManager.java	14 May 2003 12:23:32 -0000	1.4
  @@ -54,7 +54,10 @@
   import org.apache.cocoon.woody.util.DomHelper;
   import org.apache.cocoon.components.LifecycleHelper;
   import org.apache.excalibur.source.Source;
  +import org.apache.excalibur.source.SourceValidity;
  +import org.apache.excalibur.store.Store;
   import org.apache.avalon.framework.CascadingException;
  +import org.apache.avalon.framework.activity.Disposable;
   import org.apache.avalon.framework.component.Composable;
   import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.avalon.framework.component.ComponentException;
  @@ -65,21 +68,22 @@
   
   import java.util.Map;
   import java.util.HashMap;
  +import java.io.IOException;
   
   /**
    * Component implementing the {@link FormManager} role.
    *
  - * <p>Some important TODO's: cache FormDefiniton's (now they are reparsed and recreated
each
  - * on each request), and make the list of widget implementations configurable instead of
hardcoded.
    */
  -public class DefaultFormManager implements FormManager, ThreadSafe, Composable {
  +public class DefaultFormManager implements FormManager, ThreadSafe, Composable, Disposable
{
       private ComponentManager componentManager;
       private Map widgetDefinitionBuilders = new HashMap();
       private FormDefinitionBuilder formDefinitionBuilder;
       private boolean initialized = false;
  +    private Store store;
   
       public void compose(ComponentManager componentManager) throws ComponentException {
           this.componentManager = componentManager;
  +        this.store = (Store)componentManager.lookup(Store.TRANSIENT_STORE);
       }
   
       public void lazyInitialize() throws Exception {
  @@ -126,31 +130,75 @@
       }
   
       public Form createForm(Source source) throws Exception {
  -        return (Form)getFormDefinition(source).createInstance();
  +        FormDefinition formDefinition = getFormDefinition(source);
  +        return (Form)formDefinition.createInstance();
       }
   
       public FormDefinition getFormDefinition(Source source) throws Exception {
           lazyInitialize();
   
  -        // TODO caching!!
  -        Document formDocument;
  -        try {
  -            InputSource inputSource = new InputSource(source.getInputStream());
  -            inputSource.setSystemId(source.getURI());
  -            formDocument = DomHelper.parse(inputSource);
  +        FormDefinition formDefinition = getStoredFormDefinition(source);
  +        if (formDefinition == null) {
  +            Document formDocument;
  +            try {
  +                InputSource inputSource = new InputSource(source.getInputStream());
  +                inputSource.setSystemId(source.getURI());
  +                formDocument = DomHelper.parse(inputSource);
  +            }
  +            catch (Exception exc) {
  +                throw new CascadingException("Could not parse form definition from " +
source.getURI(), exc);
  +            }
  +
  +            Element formElement = formDocument.getDocumentElement();
  +
  +            // check that the root element is a wd:form element
  +            if (!(formElement.getLocalName().equals("form") || Constants.WD_NS.equals(formElement.getNamespaceURI())))
  +                throw new Exception("Expected a Woody form element at " + DomHelper.getLocation(formElement));
  +
  +            formDefinition = (FormDefinition)formDefinitionBuilder.buildWidgetDefinition(formElement);
  +            storeFormDefinition(formDefinition, source);
  +        }
  +        return formDefinition;
  +    }
  +
  +    private FormDefinition getStoredFormDefinition(Source source) {
  +        String key = "WoodyForm:" + source.getURI();
  +        SourceValidity newValidity = source.getValidity();
  +
  +        if (newValidity == null) {
  +            store.remove(key);
  +            return null;
           }
  -        catch (Exception exc) {
  -            throw new CascadingException("Could not parse form definition from " + source.getURI(),
exc);
  +
  +        Object[] formDefinitionAndValidity = (Object[])store.get(key);
  +        if (formDefinitionAndValidity == null)
  +            return null;
  +
  +        SourceValidity storedValidity = (SourceValidity)formDefinitionAndValidity[1];
  +        int valid = storedValidity.isValid();
  +        boolean isValid;
  +        if (valid == 0) {
  +            valid = storedValidity.isValid(newValidity);
  +            isValid = (valid == 1);
  +        } else {
  +            isValid = (valid == 1);
           }
   
  -        Element formElement = formDocument.getDocumentElement();
  +        if (!isValid) {
  +            store.remove(key);
  +            return null;
  +        }
   
  -        // check that the root element is a wd:form element
  -        if (!(formElement.getLocalName().equals("form") || Constants.WD_NS.equals(formElement.getNamespaceURI())))
  -            throw new Exception("Expected a Woody form element at " + DomHelper.getLocation(formElement));
  +        return (FormDefinition)formDefinitionAndValidity[0];
  +    }
   
  -        FormDefinition formDefinition = (FormDefinition)formDefinitionBuilder.buildWidgetDefinition(formElement);
  -        return formDefinition;
  +    private void storeFormDefinition(FormDefinition formDefinition, Source source) throws
IOException {
  +        String key = "WoodyForm:" + source.getURI();
  +        SourceValidity validity = source.getValidity();
  +        if (validity != null) {
  +            Object[] formDefinitionAndValidity = {formDefinition,  validity};
  +            store.store(key, formDefinitionAndValidity);
  +        }
       }
   
       public WidgetDefinition buildWidgetDefinition(Element widgetDefinition) throws Exception
{
  @@ -161,5 +209,9 @@
           if (builder == null)
               throw new Exception("Unkown kind of widget \"" + widgetName + "\" specified
at " + DomHelper.getLocation(widgetDefinition));
           return builder.buildWidgetDefinition(widgetDefinition);
  +    }
  +
  +    public void dispose() {
  +        componentManager.release(store);
       }
   }
  
  
  

Mime
View raw message