You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2003/06/18 13:01:04 UTC
cvs commit: avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/appliance DependencyGraph.java
mcconnell 2003/06/18 04:01:04
Modified: merlin/assembly-spi/src/java/org/apache/avalon/assembly/appliance
DependencyGraph.java
Log:
Housekeeping.
Revision Changes Path
1.6 +17 -11 avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/appliance/DependencyGraph.java
Index: DependencyGraph.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/appliance/DependencyGraph.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DependencyGraph.java 24 Apr 2003 12:29:56 -0000 1.5
+++ DependencyGraph.java 18 Jun 2003 11:01:03 -0000 1.6
@@ -93,7 +93,7 @@
private final ArrayList m_children = new ArrayList();
/**
- * Creation of a new empty dependecy graph.
+ * Creation of a new empty dependency graph.
*/
public DependencyGraph()
{
@@ -168,7 +168,8 @@
try
{
return walkGraph( true );
- } catch( Throwable e )
+ }
+ catch( Throwable e )
{
final String error = "Unexpect error while resolving startup graph.";
throw new ApplianceRuntimeException( error, e );
@@ -188,7 +189,8 @@
try
{
return walkGraph( false );
- } catch( Throwable e )
+ }
+ catch( Throwable e )
{
final String error = "Unexpect error while resolving shutdown graph.";
throw new ApplianceRuntimeException( error, e );
@@ -207,7 +209,8 @@
try
{
return referencedAppliances( appliance, getComponentGraph( appliance, false ) );
- } catch( Throwable e )
+ }
+ catch( Throwable e )
{
final String error =
"Unexpect error while resolving consumer graph for appliance: " + appliance;
@@ -227,7 +230,8 @@
try
{
return referencedAppliances( appliance, getComponentGraph( appliance, true ) );
- } catch( Throwable e )
+ }
+ catch( Throwable e )
{
final String error =
"Unexpect error while resolving provider graph for: " + appliance;
@@ -320,12 +324,14 @@
{
return;
}
+
done.add( appliance );
if( providers )
{
visitProviders( appliance, done, order );
- } else
+ }
+ else
{
visitConsumers( appliance, done, order );
}
@@ -396,7 +402,7 @@
if( dependency.isRequired() )
{
throw new IllegalStateException(
- "unresolved service dependency for role: " + dependency.getKey()
+ "Unresolved service dependency for role: " + dependency.getKey()
+ " in appliance: " + appliance );
}
}
@@ -423,7 +429,7 @@
(Appliance) m_appliances.get( i );
//
- // check if the 'other' appliance is used by this 'appliance'
+ // check if the 'other' appliance uses this 'appliance'
// as a service provider
//
@@ -439,7 +445,7 @@
}
//
- // check if the 'other' appliance is used by this 'appliance'
+ // check if the 'other' appliance uses this 'appliance'
// as a context provider
//
@@ -450,7 +456,7 @@
}
//
- // check if the 'other' appliance is used by this 'appliance'
+ // check if the 'other' appliance uses this 'appliance'
// as an extension provider
//
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org