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/07/24 14:40:04 UTC

cvs commit: cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/datatype DatatypeManager.java DefaultDatatypeManager.java

bruno       2003/07/24 05:40:03

  Modified:    src/blocks/woody/java/org/apache/cocoon/woody/datatype
                        DatatypeManager.java DefaultDatatypeManager.java
  Log:
  Added createConvertor method DatatypeManager interface
  
  Revision  Changes    Path
  1.2       +6 -0      cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/datatype/DatatypeManager.java
  
  Index: DatatypeManager.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/datatype/DatatypeManager.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DatatypeManager.java	22 Apr 2003 12:04:18 -0000	1.1
  +++ DatatypeManager.java	24 Jul 2003 12:40:03 -0000	1.2
  @@ -51,6 +51,7 @@
   package org.apache.cocoon.woody.datatype;
   
   import org.w3c.dom.Element;
  +import org.apache.cocoon.woody.datatype.convertor.Convertor;
   
   /**
    * Work interface for the component that manages the datatypes.
  @@ -70,4 +71,9 @@
        * {@link DatatypeBuilder}s while building a {@link Datatype}.
        */
       public ValidationRule createValidationRule(Element validationRuleElement) throws Exception;
  +
  +    /**
  +     * Creates a convertor based on an XML description.
  +     */
  +    public Convertor createConvertor(String dataTypeName, Element convertorElement) throws Exception;
   }
  
  
  
  1.6       +6 -0      cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/datatype/DefaultDatatypeManager.java
  
  Index: DefaultDatatypeManager.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/datatype/DefaultDatatypeManager.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DefaultDatatypeManager.java	16 Jul 2003 13:59:18 -0000	1.5
  +++ DefaultDatatypeManager.java	24 Jul 2003 12:40:03 -0000	1.6
  @@ -63,6 +63,7 @@
   import org.apache.avalon.framework.CascadingException;
   import org.apache.cocoon.woody.util.DomHelper;
   import org.apache.cocoon.woody.util.SimpleServiceSelector;
  +import org.apache.cocoon.woody.datatype.convertor.Convertor;
   import org.w3c.dom.Element;
   
   /**
  @@ -121,6 +122,11 @@
               throw new CascadingException("Unknown validation rule \"" + name + "\" specified at " + DomHelper.getLocation(validationRuleElement), e);
           }
           return builder.build(validationRuleElement);
  +    }
  +
  +    public Convertor createConvertor(String dataTypeName, Element convertorElement) throws Exception {
  +        DatatypeBuilder datatypeBulder = (DatatypeBuilder)typeBuilderSelector.select(dataTypeName);
  +        return datatypeBulder.buildConvertor(convertorElement);
       }
   
       public void dispose() {