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 DefaultSelector.java
Date Thu, 22 Aug 2002 06:25:21 GMT
mcconnell    2002/08/21 23:25:21

  Modified:    assembly/src/java/org/apache/excalibur/merlin/assembly
                        DefaultSelector.java
  Log:
  checkstyle ok
  
  Revision  Changes    Path
  1.4       +15 -6     jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/assembly/DefaultSelector.java
  
  Index: DefaultSelector.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/assembly/DefaultSelector.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DefaultSelector.java	14 Aug 2002 03:03:35 -0000	1.3
  +++ DefaultSelector.java	22 Aug 2002 06:25:21 -0000	1.4
  @@ -31,11 +31,19 @@
       public Profile select( Profile[] profiles )
       {
           if( profiles.length == 0 )
  -          return null;
  +        {
  +            return null;
  +        }
   
           Profile profile = select( profiles, Profile.EXPLICIT );
  -        if( profile == null ) profile = select( profiles, Profile.PACKAGED );
  -        if( profile == null ) profile = select( profiles, Profile.IMPLICIT );
  +        if( profile == null ) 
  +        {
  +            profile = select( profiles, Profile.PACKAGED );
  +        }
  +        if( profile == null ) 
  +        {
  +            profile = select( profiles, Profile.IMPLICIT );
  +        }
           if( profile != null )
           {
               return profile;
  @@ -48,9 +56,10 @@
           for( int i=0; i<profiles.length; i++ )
           {
               if( profiles[i].getMode() == mode )
  -              return profiles[i];
  +            {
  +                return profiles[i];
  +            }
           }
           return null;
       }
  -
   }
  
  
  

--
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