avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/info/builder XMLServiceCreator.java XMLTypeCreator.java
Date Tue, 15 Apr 2003 03:05:41 GMT
mcconnell    2003/04/14 20:05:41

  Modified:    merlin/meta/src/java/org/apache/avalon/meta/info/builder
                        XMLServiceCreator.java XMLTypeCreator.java
  Log:
  Removed unused code.
  
  Revision  Changes    Path
  1.2       +2 -2      avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/info/builder/XMLServiceCreator.java
  
  Index: XMLServiceCreator.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/info/builder/XMLServiceCreator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- XMLServiceCreator.java	13 Mar 2003 01:06:04 -0000	1.1
  +++ XMLServiceCreator.java	15 Apr 2003 03:05:41 -0000	1.2
  @@ -137,7 +137,7 @@
        * @return the Properties object representing attributes
        * @throws ConfigurationException if an error occurs
        */
  -    protected Properties buildAttributes( final Configuration config )
  +    public Properties buildAttributes( final Configuration config )
           throws ConfigurationException
       {
           final Properties attributes = new Properties();
  
  
  
  1.5       +4 -8      avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/info/builder/XMLTypeCreator.java
  
  Index: XMLTypeCreator.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/info/builder/XMLTypeCreator.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- XMLTypeCreator.java	5 Apr 2003 11:55:02 -0000	1.4
  +++ XMLTypeCreator.java	15 Apr 2003 03:05:41 -0000	1.5
  @@ -149,10 +149,6 @@
           //
   
           configuration = info.getChild( "info", false );
  -        if( configuration == null )
  -        {
  -            configuration = info.getChild( "component" );
  -        }
   
           final InfoDescriptor descriptor =
               buildInfoDescriptor( classname, configuration );
  @@ -404,9 +400,9 @@
        * @return the created InfoDescriptor
        * @throws ConfigurationException if an error occurs
        */
  -    protected InfoDescriptor buildInfoDescriptor( final String classname,
  -                                                            final Configuration component
)
  -        throws ConfigurationException
  +    public InfoDescriptor buildInfoDescriptor(
  +      final String classname, final Configuration component )
  +      throws ConfigurationException
       {
           final String name = 
             component.getChild( "name" ).getValue( null );
  
  
  

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


Mime
View raw message