You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by bl...@apache.org on 2003/07/23 22:20:14 UTC
cvs commit: avalon-sandbox/meta/impl/src/java/org/apache/avalon/meta/info/builder TypeBuilder.java
bloritsch 2003/07/23 13:20:14
Modified: meta/impl/src/java/org/apache/avalon/meta/info/builder
TypeBuilder.java
Log:
Fix JavaDocs
Revision Changes Path
1.6 +12 -14 avalon-sandbox/meta/impl/src/java/org/apache/avalon/meta/info/builder/TypeBuilder.java
Index: TypeBuilder.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/meta/impl/src/java/org/apache/avalon/meta/info/builder/TypeBuilder.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TypeBuilder.java 15 Jul 2003 21:26:35 -0000 1.5
+++ TypeBuilder.java 23 Jul 2003 20:20:14 -0000 1.6
@@ -109,15 +109,14 @@
/**
* Build Type from the XML descriptor format.
*
- * @param classname The classname of Component
- * @param classLoader the ClassLoader to load info from
+ * @param clazz The class for Component
* @return the created Type
* @throws Exception if an error occurs
*/
private Type buildFromSerDescriptor( final Class clazz )
throws Exception
{
- Type type = buildFromSerDescriptor( clazz, ".ztype" );
+ Type type = buildFromSerDescriptor( clazz, ".ztype" );
if( type != null )
{
return type;
@@ -146,14 +145,13 @@
/**
* Build Type from the XML descriptor format. The implementation
* will attempt to locate a <classname>.xtype resource. If
- * not found, the implementation will attempt to locate
+ * not found, the implementation will attempt to locate
* a <classname>.info resource. Once a resource is established
* the type will be resolved relative to the root element. Normally
- * the root element is a <type>, however the implementation
- * also recognises the legacy <blockinfo> schema.
- *
- * @param classname The classname of Component
- * @param classLoader the ClassLoader to load info from
+ * the root element is a <type>, however the implementation
+ * also recognises the legacy <blockinfo> schema.
+ *
+ * @param clazz The class for Component
* @return the created Type
* @throws Exception if an error occurs
*/
@@ -201,7 +199,7 @@
if( defaultsStream != null )
{
final InputSource defaultsSource = new InputSource( defaultsStream );
- defaults = resolveConfiguration(
+ defaults = resolveConfiguration(
classLoader, ConfigurationBuilder.build( defaultsSource ) );
}
else
@@ -216,7 +214,7 @@
return xmlTypeFactory.createType( classname, xinfo, defaults );
}
- private Configuration resolveConfiguration( ClassLoader classloader, Configuration config )
+ private Configuration resolveConfiguration( ClassLoader classloader, Configuration config )
throws Exception
{
if( config == null )
@@ -242,14 +240,14 @@
throw new ConfigurationException( error );
}
final InputSource source = new InputSource( stream );
- return resolveConfiguration(
+ return resolveConfiguration(
classloader, ConfigurationBuilder.build( source ) );
}
else
{
try
{
- return resolveConfiguration(
+ return resolveConfiguration(
classloader, ConfigurationBuilder.build( src ) );
}
catch( Throwable e )
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org