donaldp 2002/11/15 23:46:41
Modified: info/src/java/org/apache/avalon/framework/tools/qdox
DefaultInfoBuilder.java
Log:
Handle the case where the source file does not specify all tags
Revision Changes Path
1.2 +14 -5
jakarta-avalon-excalibur/info/src/java/org/apache/avalon/framework/tools/qdox/DefaultInfoBuilder.java
Index: DefaultInfoBuilder.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/info/src/java/org/apache/avalon/framework/tools/qdox/DefaultInfoBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultInfoBuilder.java 16 Nov 2002 05:15:45 -0000 1.1
+++ DefaultInfoBuilder.java 16 Nov 2002 07:46:41 -0000 1.2
@@ -31,6 +31,8 @@
public class DefaultInfoBuilder
extends AbstractInfoBuilder
{
+ private static final SchemaDescriptor NULL_SCHEMA_DESCRIPTOR = new
SchemaDescriptor( "", "", "", EMPTY_ATTRIBUTES );
+
/**
* Build a ComponentInfo object for specified class.
*
@@ -180,15 +182,22 @@
category = "parameters";
if( null == method )
{
- return new SchemaDescriptor( "", "", "", EMPTY_ATTRIBUTES );
+ return NULL_SCHEMA_DESCRIPTOR;
}
tag = method.getTagByName( "avalon.parameters" );
}
- final String location = getNamedParameter( tag, "location", "" );
- final String type = getNamedParameter( tag, "type", "" );
+ if( null == tag )
+ {
+ return NULL_SCHEMA_DESCRIPTOR;
+ }
+ else
+ {
+ final String location = getNamedParameter( tag, "location", "" );
+ final String type = getNamedParameter( tag, "type", "" );
- return new SchemaDescriptor( category, location, type, EMPTY_ATTRIBUTES );
+ return new SchemaDescriptor( category, location, type, EMPTY_ATTRIBUTES
);
+ }
}
/**
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
