CVS: jcontainer/loom/engine/src/java/org/jcontainer/loom/components/util ComponentMetaDataConverter.java,1.7,1.8

Update of /cvsroot/jcontainer/jcontainer/loom/engine/src/java/org/jcontainer/loom/components/util
In directory hogshead.codehaus.org:/tmp/cvs-serv22178/engine/src/java/org/jcontainer/loom/components/util

Modified Files:
	ComponentMetaDataConverter.java 
Log Message:
Rename the MetaData away from standard MetaData postfix to use more readily accesisble names


Index: ComponentMetaDataConverter.java
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/loom/engine/src/java/org/jcontainer/loom/components/util/ComponentMetaDataConverter.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ComponentMetaDataConverter.java	16 Oct 2003 14:45:46 -0000	1.7
+++ ComponentMetaDataConverter.java	3 Nov 2003 06:43:15 -0000	1.8
@@ -15,13 +15,13 @@
 import org.apache.avalon.phoenix.metadata.SarMetaData;
 import org.apache.avalon.phoenix.metainfo.BlockInfo;
 import org.jcontainer.loom.components.util.info.ComponentInfo;
-import org.jcontainer.loom.components.util.metadata.ComponentMetaData;
+import org.jcontainer.loom.components.util.metadata.ComponentTemplate;
 import org.jcontainer.loom.components.util.profile.ComponentProfile;
 import org.jcontainer.loom.components.util.profile.PartitionProfile;
 import org.jcontainer.loom.interfaces.ContainerConstants;
 
 /**
- * Convert a {@link org.jcontainer.loom.components.util.metadata.ComponentMetaData} into a {@link BlockMetaData}.
+ * Convert a ComponentTemplate into a BlockMetaData.
  *
  * @author <a href="mailto:[email protected]">Peter Donald</a>
  * @version $Revision$ $Date$
@@ -51,10 +51,10 @@
 
     /**
      * Convert a set of {@link org.jcontainer.loom.components.util.profile.ComponentProfile} object
-     * into a set of {@link BlockMetaData} objects.
+     * into a set of BlockMetaData objects.
      *
      * @param components the {@link org.jcontainer.loom.components.util.profile.ComponentProfile} objects
-     * @return the {@link BlockMetaData} objects
+     * @return the BlockMetaData objects
      */
     private static BlockMetaData[] toBlocks( final ComponentProfile[] components )
     {
@@ -63,19 +63,19 @@
         {
             final ComponentProfile component = components[ i ];
             final BlockMetaData block =
-                toBlockMetaData( component.getMetaData(), component.getInfo() );
+                toBlockMetaData( component.getTemplate(), component.getInfo() );
             listenerSet.add( block );
         }
         return (BlockMetaData[])listenerSet.toArray( new BlockMetaData[ listenerSet.size() ] );
     }
 
     /**
-     * Convert a {@link org.jcontainer.loom.components.util.metadata.ComponentMetaData} object into a {@link BlockListenerMetaData} object.
+     * Convert a ComponentTemplate object into a {@link BlockListenerMetaData} object.
      *
-     * @param listeners the {@link org.jcontainer.loom.components.util.metadata.ComponentMetaData} object
+     * @param listeners the ComponentTemplate object
      * @return the {@link BlockListenerMetaData} object
      */
-    public static BlockListenerMetaData[] toBlockListeners( final ComponentMetaData[] listeners )
+    public static BlockListenerMetaData[] toBlockListeners( final ComponentTemplate[] listeners )
     {
         final ArrayList listenerSet = new ArrayList();
         for( int i = 0; i < listeners.length; i++ )
@@ -89,12 +89,12 @@
     }
 
     /**
-     * Convert a {@link org.jcontainer.loom.components.util.metadata.ComponentMetaData} object into a {@link BlockMetaData} object.
+     * Convert a ComponentTemplate object into a BlockMetaData object.
      *
-     * @param component the {@link org.jcontainer.loom.components.util.metadata.ComponentMetaData} object
-     * @return the {@link BlockMetaData} object
+     * @param component the ComponentTemplate object
+     * @return the BlockMetaData object
      */
-    public static BlockMetaData toBlockMetaData( final ComponentMetaData component,
+    public static BlockMetaData toBlockMetaData( final ComponentTemplate component,
                                                  final ComponentInfo info )
     {
         final boolean disableProxy = component.isDisableProxy();
@@ -115,7 +115,7 @@
      * @return the Phoenix dependencys
      */
     private static DependencyMetaData[] toPhoenixDependencys(
-        final org.jcontainer.loom.components.util.metadata.DependencyMetaData[] dependencies )
+        final org.jcontainer.loom.components.util.metadata.DependencyDirective[] dependencies )
     {
         final ArrayList depends = new ArrayList();
         for( int i = 0; i < dependencies.length; i++ )