avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: avalon/util/defaults/src/java/org/apache/avalon/util/defaults DefaultsBuilder.java
Date Thu, 04 Mar 2004 03:28:55 GMT
mcconnell    2004/03/03 19:28:55

  Modified:    util/defaults/src/java/org/apache/avalon/util/defaults
                        DefaultsBuilder.java
  Log:
  Minor enhancement to the Default handling related to the retrival of sequenced properties.
  
  Revision  Changes    Path
  1.5       +18 -2     avalon/util/defaults/src/java/org/apache/avalon/util/defaults/DefaultsBuilder.java
  
  Index: DefaultsBuilder.java
  ===================================================================
  RCS file: /home/cvs/avalon/util/defaults/src/java/org/apache/avalon/util/defaults/DefaultsBuilder.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DefaultsBuilder.java	24 Feb 2004 22:18:24 -0000	1.4
  +++ DefaultsBuilder.java	4 Mar 2004 03:28:55 -0000	1.5
  @@ -251,10 +251,26 @@
   
      /**
       * Return a consolidated set of properties.
  +    * @param defaults the source properties
  +    * @param keys the simple property keys
  +    * @return the consolidated properties
       */
       public Properties getConsolidatedProperties( 
         final Properties defaults, final String[] keys ) throws IOException
       {
  +        return getConsolidatedProperties( defaults, keys, new String[0] );
  +    }
  +
  +   /**
  +    * Return a consolidated set of properties.
  +    * @param defaults the source properties
  +    * @param keys the simple property keys
  +    * @param sequence the sequence property keys
  +    * @return the consolidated properties
  +    */
  +    public Properties getConsolidatedProperties( 
  +      final Properties defaults, final String[] keys, String[] sequence ) throws IOException
  +    {
           final Properties[] parameters = 
             new Properties[] { 
               defaults,
  @@ -268,6 +284,6 @@
                 false ), 
               new SystemDefaultsFinder() 
             };
  -        return new Defaults( keys, new String[0], finders );
  +        return new Defaults( keys, sequence, finders );
       }
   }
  
  
  

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


Mime
View raw message