donaldp 2002/08/24 19:29:06
Modified: containerkit/src/java/org/apache/excalibur/containerkit/processor
DependencyMap.java
Log:
whitespace
Revision Changes Path
1.5 +40 -40
jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/processor/DependencyMap.java
Index: DependencyMap.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/processor/DependencyMap.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DependencyMap.java 25 Aug 2002 02:24:00 -0000 1.4
+++ DependencyMap.java 25 Aug 2002 02:29:06 -0000 1.5
@@ -11,9 +11,9 @@
import java.util.Collection;
import java.util.List;
import org.apache.avalon.framework.info.DependencyDescriptor;
-import org.apache.excalibur.containerkit.kernel.ComponentEntry;
import org.apache.excalibur.containerkit.metadata.ComponentMetaData;
import org.apache.excalibur.containerkit.metadata.DependencyMetaData;
+import org.apache.excalibur.containerkit.registry.ComponentProfile;
import org.apache.excalibur.containerkit.store.ComponentStore;
/**
@@ -27,53 +27,53 @@
public class DependencyMap
{
/**
- * Get the serilized graph of [EMAIL PROTECTED] ComponentEntry} objects
+ * Get the serilized graph of [EMAIL PROTECTED] ComponentProfile} objects
* required when starting up all the components. This makes sure
* that all providers occur before their coresponding
* consumers in graph.
*
* @return the ordered list of components
*/
- public ComponentEntry[] getStartupGraph( final ComponentStore store )
+ public ComponentProfile[] getStartupGraph( final ComponentStore store )
{
return walkGraph( true, store );
}
/**
- * Get the serilized graph of [EMAIL PROTECTED] ComponentEntry} objects
+ * Get the serilized graph of [EMAIL PROTECTED] ComponentProfile} objects
* required when shutting down all the components. This makes
* sure that all consumers occur before their coresponding
* providers in graph.
*
* @return the ordered list of components
*/
- public ComponentEntry[] getShutdownGraph( final ComponentStore store )
+ public ComponentProfile[] getShutdownGraph( final ComponentStore store )
{
return walkGraph( false, store );
}
/**
- * Get the serilized graph of [EMAIL PROTECTED] ComponentEntry} objects
+ * Get the serilized graph of [EMAIL PROTECTED] ComponentProfile} objects
* that use services of specified component.
*
* @param component the component
* @return the ordered list of consumers
*/
- public ComponentEntry[] getConsumerGraph( final ComponentEntry component,
- final ComponentStore store )
+ public ComponentProfile[] getConsumerGraph( final ComponentProfile
component,
+ final ComponentStore store )
{
return getComponentGraph( component, false, store );
}
/**
- * Get the serilized graph of [EMAIL PROTECTED] ComponentEntry} objects
+ * Get the serilized graph of [EMAIL PROTECTED] ComponentProfile} objects
* that provide specified component with services.
*
* @param component the component
* @return the ordered list of providers
*/
- public ComponentEntry[] getProviderGraph( final ComponentEntry component,
- final ComponentStore store )
+ public ComponentProfile[] getProviderGraph( final ComponentProfile
component,
+ final ComponentStore store )
{
return getComponentGraph( component, true, store );
}
@@ -85,9 +85,9 @@
* @param providers true if traversing providers, false if consumers
* @return the list of components in graph
*/
- private ComponentEntry[] getComponentGraph( final ComponentEntry
component,
- final boolean providers,
- final ComponentStore store )
+ private ComponentProfile[] getComponentGraph( final ComponentProfile
component,
+ final boolean providers,
+ final ComponentStore store
)
{
final ArrayList result = new ArrayList();
visitcomponent( component,
@@ -96,8 +96,8 @@
result,
store );
- final ComponentEntry[] returnValue = new ComponentEntry[
result.size() ];
- return (ComponentEntry[])result.toArray( returnValue );
+ final ComponentProfile[] returnValue = new ComponentProfile[
result.size() ];
+ return (ComponentProfile[])result.toArray( returnValue );
}
/**
@@ -108,18 +108,18 @@
* @param providers true if forward dependencys traced, false if
dependencies reversed
* @return the ordered node names
*/
- private ComponentEntry[] walkGraph( final boolean providers,
- final ComponentStore store )
+ private ComponentProfile[] walkGraph( final boolean providers,
+ final ComponentStore store )
{
final ArrayList result = new ArrayList();
final ArrayList done = new ArrayList();
final Collection components = store.getComponents();
- final ComponentEntry[] entrySet =
- (ComponentEntry[])components.toArray( new ComponentEntry[
components.size() ] );
+ final ComponentProfile[] entrySet =
+ (ComponentProfile[])components.toArray( new ComponentProfile[
components.size() ] );
for( int i = 0; i < entrySet.length; i++ )
{
- final ComponentEntry component = entrySet[ i ];
+ final ComponentProfile component = entrySet[ i ];
visitcomponent( component,
providers,
done,
@@ -127,8 +127,8 @@
store );
}
- final ComponentEntry[] returnValue = new ComponentEntry[
result.size() ];
- return (ComponentEntry[])result.toArray( returnValue );
+ final ComponentProfile[] returnValue = new ComponentProfile[
result.size() ];
+ return (ComponentProfile[])result.toArray( returnValue );
}
/**
@@ -140,7 +140,7 @@
* @param order the order in which nodes have already been
* traversed
*/
- private void visitcomponent( final ComponentEntry component,
+ private void visitcomponent( final ComponentProfile component,
final boolean providers,
final ArrayList done,
final ArrayList order,
@@ -169,16 +169,16 @@
* Traverse graph of components that provide services to
* the specified component.
*
- * @param component the ComponentEntry
+ * @param component the ComponentProfile
*/
- private void visitProviders( final ComponentEntry component,
+ private void visitProviders( final ComponentProfile component,
final ArrayList done,
final ArrayList order,
final ComponentStore store )
{
final DependencyDescriptor[] descriptors =
- component.getProfile().getInfo().getDependencies();
- final ComponentMetaData metaData =
component.getProfile().getMetaData();
+ component.getInfo().getDependencies();
+ final ComponentMetaData metaData = component.getMetaData();
for( int i = 0; i < descriptors.length; i++ )
{
@@ -191,7 +191,7 @@
if( dependency != null )
{
- final ComponentEntry other =
+ final ComponentProfile other =
getComponent( dependency.getProviderName(), store );
visitcomponent( other, true, done, order, store );
}
@@ -202,23 +202,23 @@
* Traverse all Consumers of component. ie Anyone that uses
* service provided by component.
*
- * @param component the ComponentEntry
+ * @param component the ComponentProfile
*/
- private void visitConsumers( final ComponentEntry component,
+ private void visitConsumers( final ComponentProfile component,
final ArrayList done,
final ArrayList order,
final ComponentStore store )
{
- final String name = component.getProfile().getMetaData().getName();
+ final String name = component.getMetaData().getName();
final Collection components = store.getComponents();
- final ComponentEntry[] entrySet =
- (ComponentEntry[])components.toArray( new ComponentEntry[
components.size() ] );
+ final ComponentProfile[] entrySet =
+ (ComponentProfile[])components.toArray( new ComponentProfile[
components.size() ] );
for( int i = 0; i < entrySet.length; i++ )
{
- final ComponentEntry other = entrySet[ i ];
+ final ComponentProfile other = entrySet[ i ];
final DependencyMetaData[] roles =
- other.getProfile().getMetaData().getDependencies();
+ other.getMetaData().getDependencies();
for( int j = 0; j < roles.length; j++ )
{
@@ -245,10 +245,10 @@
* @param name the name of component
* @return the component
*/
- private ComponentEntry getComponent( final String name,
- final ComponentStore store )
+ private ComponentProfile getComponent( final String name,
+ final ComponentStore store )
{
- final ComponentEntry component = store.getComponent( name );
+ final ComponentProfile component = store.getComponent( name );
if( null != component )
{
return component;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
