avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/assembly DependencyGraph.java
Date Thu, 22 Aug 2002 06:27:33 GMT
mcconnell    2002/08/21 23:27:33

  Modified:    assembly/src/java/org/apache/excalibur/merlin/assembly
                        DependencyGraph.java
  Log:
  checkstyle ok
  
  Revision  Changes    Path
  1.5       +14 -7     jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/assembly/DependencyGraph.java
  
  Index: DependencyGraph.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/assembly/DependencyGraph.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DependencyGraph.java	21 Aug 2002 17:00:51 -0000	1.4
  +++ DependencyGraph.java	22 Aug 2002 06:27:33 -0000	1.5
  @@ -92,7 +92,9 @@
       public void add( final Profile profile )
       {
           if( !m_components.contains( profile ) )
  -          m_components.add( profile );
  +        {
  +            m_components.add( profile );
  +        }
       }
   
       /**
  @@ -154,7 +156,9 @@
           for( int i=0; i<profiles.length; i++ )
           {
               if( !profiles[i].equals( profile ) )
  -              list.add( profiles[i] );
  +            {
  +                list.add( profiles[i] );
  +            }
           }
           return (Profile[]) list.toArray( new Profile[0] );
       }
  @@ -222,7 +226,8 @@
                                    final ArrayList order )
       {
   
  -        //If already visited this profile then bug out early
  +        //If already visited this profile return
  +
           if( done.contains( profile ) )
           {
               return;
  @@ -292,9 +297,11 @@
               else
               {
                   if( descriptors[i].isRequired() )
  -                  throw new IllegalStateException( 
  -                    "unresolved dependency for role: " + descriptors[i].getRole() 
  -                    + " in profile: " + profile );
  +                {
  +                    throw new IllegalStateException( 
  +                      "unresolved dependency for role: " + descriptors[i].getRole() 
  +                      + " in profile: " + profile );
  +                }
               }
           }
       }
  
  
  

--
To unsubscribe, e-mail:   <mailto:avalon-cvs-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@jakarta.apache.org>


Mime
View raw message