donaldp 2002/11/11 19:47:29
Modified: info/src/java/org/apache/avalon/framework/tools/generator
InfoBuilder.java MetaGenerateTask.java
Log:
info builder becomes non-static
Revision Changes Path
1.3 +15 -15
jakarta-avalon-excalibur/info/src/java/org/apache/avalon/framework/tools/generator/InfoBuilder.java
Index: InfoBuilder.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/info/src/java/org/apache/avalon/framework/tools/generator/InfoBuilder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- InfoBuilder.java 12 Nov 2002 01:03:31 -0000 1.2
+++ InfoBuilder.java 12 Nov 2002 03:47:29 -0000 1.3
@@ -29,7 +29,7 @@
* @author <a href="mailto:peter at apache.org">Peter Donald</a>
* @version $Revision$ $Date$
*/
-class InfoBuilder
+public class InfoBuilder
{
private static final String CONTEXT_CLASS =
"org.apache.avalon.framework.context.Context";
private static final String LOGGER_CLASS =
"org.apache.avalon.framework.logger.Logger";
@@ -46,7 +46,7 @@
* @param javaClass the class
* @return the ComponentInfo object
*/
- static ComponentInfo buildComponentInfo( final JavaClass javaClass )
+ public ComponentInfo buildComponentInfo( final JavaClass javaClass )
{
final ComponentDescriptor component = buildComponentDescriptor( javaClass );
final ContextDescriptor context = buildContextDescriptor( javaClass );
@@ -63,7 +63,7 @@
* @param javaClass the class
* @return the set of dependency descriptors
*/
- private static DependencyDescriptor[] buildDependencies( final JavaClass
javaClass )
+ private DependencyDescriptor[] buildDependencies( final JavaClass javaClass )
{
JavaMethod method =
getLifecycleMethod( javaClass, "compose", COMPONENT_MANAGER_CLASS );
@@ -105,7 +105,7 @@
* @param javaClass the class
* @return the set of service descriptors
*/
- private static ServiceDescriptor[] buildServices( final JavaClass javaClass )
+ private ServiceDescriptor[] buildServices( final JavaClass javaClass )
{
final ArrayList services = new ArrayList();
final DocletTag[] tags = javaClass.getTagsByName( "avalon.service" );
@@ -126,7 +126,7 @@
* @param javaClass the class
* @return the set of logger descriptors
*/
- private static LoggerDescriptor[] buildLoggers( final JavaClass javaClass )
+ private LoggerDescriptor[] buildLoggers( final JavaClass javaClass )
{
final JavaMethod method =
getLifecycleMethod( javaClass, "enableLogging", LOGGER_CLASS );
@@ -156,7 +156,7 @@
* @param javaClass the class
* @return the context descriptor
*/
- private static ContextDescriptor buildContextDescriptor( final JavaClass
javaClass )
+ private ContextDescriptor buildContextDescriptor( final JavaClass javaClass )
{
final JavaMethod method =
getLifecycleMethod( javaClass, "contextualize", CONTEXT_CLASS );
@@ -200,7 +200,7 @@
* @param javaClass the class
* @return the component descriptor
*/
- private static ComponentDescriptor buildComponentDescriptor( final JavaClass
javaClass )
+ private ComponentDescriptor buildComponentDescriptor( final JavaClass javaClass
)
{
final String type = javaClass.getFullyQualifiedName();
return new ComponentDescriptor( type, EMPTY_ATTRIBUTES );
@@ -215,7 +215,7 @@
* @param type the unresolved type
* @return the resolved type
*/
- private static String resolveType( final JavaClass javaClass, final String type
)
+ private String resolveType( final JavaClass javaClass, final String type )
{
return javaClass.getParentSource().resolveType( type );
}
@@ -229,9 +229,9 @@
* @param parameterType the class name of parameter
* @return the method if such a method exists
*/
- private static JavaMethod getLifecycleMethod( final JavaClass javaClass,
- final String methodName,
- final String parameterType )
+ private JavaMethod getLifecycleMethod( final JavaClass javaClass,
+ final String methodName,
+ final String parameterType )
{
final JavaMethod[] methods = javaClass.getMethods();
for( int i = 0; i < methods.length; i++ )
@@ -256,9 +256,9 @@
* @param name the name of parameter
* @return the value of named parameter
*/
- private static String getNamedParameter( final DocletTag tag,
- final String name,
- final String defaultValue )
+ private String getNamedParameter( final DocletTag tag,
+ final String name,
+ final String defaultValue )
{
final String value = tag.getNamedParameter( name );
if( null == value )
1.3 +3 -2
jakarta-avalon-excalibur/info/src/java/org/apache/avalon/framework/tools/generator/MetaGenerateTask.java
Index: MetaGenerateTask.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/info/src/java/org/apache/avalon/framework/tools/generator/MetaGenerateTask.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MetaGenerateTask.java 12 Nov 2002 02:56:56 -0000 1.2
+++ MetaGenerateTask.java 12 Nov 2002 03:47:29 -0000 1.3
@@ -133,7 +133,8 @@
final DocletTag tag = javaClass.getTagByName( "avalon.component" );
if( null != tag )
{
- final ComponentInfo info = InfoBuilder.buildComponentInfo(
javaClass );
+ final InfoBuilder infoBuilder = new InfoBuilder();
+ final ComponentInfo info = infoBuilder.buildComponentInfo(
javaClass );
final String fqn = javaClass.getFullyQualifiedName();
final String filename =
fqn.replace( '.', File.separatorChar ) + "-info";
--
To unsubscribe, e-mail: <mailto:avalon-cvs-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@;jakarta.apache.org>
