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 TypeBuilder.java
Date Fri, 18 Apr 2003 22:17:29 GMT
mcconnell    2003/04/18 15:17:28

  Modified:    merlin/meta/src/java/org/apache/avalon/meta/info/builder
                        TypeBuilder.java
  Log:
  Update the type builder to check for both xinfo and xtype.
  
  Revision  Changes    Path
  1.3       +11 -3     avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/info/builder/TypeBuilder.java
  
  Index: TypeBuilder.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/info/builder/TypeBuilder.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TypeBuilder.java	29 Mar 2003 03:25:58 -0000	1.2
  +++ TypeBuilder.java	18 Apr 2003 22:17:28 -0000	1.3
  @@ -159,10 +159,18 @@
           // get the input stream for the .xtype resource
           //
   
  -        final String path =
  +        String path =
               classname.replace( '.', '/' ) + ".xinfo";
  -        final InputStream inputStream =
  +        InputStream inputStream =
               classLoader.getResourceAsStream( path );
  +
  +        if( null == inputStream )
  +        {
  +            path =
  +              classname.replace( '.', '/' ) + ".xtype";
  +            inputStream =
  +              classLoader.getResourceAsStream( path );
  +        }
   
           if( null == inputStream )
           {
  
  
  

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


Mime
View raw message