donaldp 2002/11/15 20:34:50
Modified: info/src/java/org/apache/avalon/framework/info
ComponentInfo.java
info/src/java/org/apache/avalon/framework/tools/infobuilder
LegacyBlockInfoReader.java XMLInfoReader.java
info/src/java/org/apache/avalon/framework/tools/qdox
QDoxInfoBuilder.java
info/src/test/org/apache/avalon/framework/tools/infobuilder/test
InfoBuilderTestCase.java
Log:
Reorder parameters to constructor.
Revision Changes Path
1.7 +3 -3
jakarta-avalon-excalibur/info/src/java/org/apache/avalon/framework/info/ComponentInfo.java
Index: ComponentInfo.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/info/src/java/org/apache/avalon/framework/info/ComponentInfo.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ComponentInfo.java 15 Nov 2002 22:31:14 -0000 1.6
+++ ComponentInfo.java 16 Nov 2002 04:34:50 -0000 1.7
@@ -65,8 +65,8 @@
final ServiceDescriptor[] services,
final LoggerDescriptor[] loggers,
final ContextDescriptor context,
- final SchemaDescriptor schema,
- final DependencyDescriptor[] dependencies )
+ final DependencyDescriptor[] dependencies, final
SchemaDescriptor schema
+ )
{
if( null == descriptor )
{
1.5 +3 -3
jakarta-avalon-excalibur/info/src/java/org/apache/avalon/framework/tools/infobuilder/LegacyBlockInfoReader.java
Index: LegacyBlockInfoReader.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/info/src/java/org/apache/avalon/framework/tools/infobuilder/LegacyBlockInfoReader.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LegacyBlockInfoReader.java 15 Nov 2002 22:41:26 -0000 1.4
+++ LegacyBlockInfoReader.java 16 Nov 2002 04:34:50 -0000 1.5
@@ -121,8 +121,8 @@
services,
new LoggerDescriptor[ 0 ],
buildPhoenixContext(),
- schema,
- dependencies );
+ dependencies, schema
+ );
}
/**
1.4 +2 -2
jakarta-avalon-excalibur/info/src/java/org/apache/avalon/framework/tools/infobuilder/XMLInfoReader.java
Index: XMLInfoReader.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/info/src/java/org/apache/avalon/framework/tools/infobuilder/XMLInfoReader.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XMLInfoReader.java 15 Nov 2002 22:31:14 -0000 1.3
+++ XMLInfoReader.java 16 Nov 2002 04:34:50 -0000 1.4
@@ -125,7 +125,7 @@
}
return new ComponentInfo( descriptor, services, loggers,
- context, schema, dependencies );
+ context, dependencies, schema );
}
/**
1.3 +6 -4
jakarta-avalon-excalibur/info/src/java/org/apache/avalon/framework/tools/qdox/QDoxInfoBuilder.java
Index: QDoxInfoBuilder.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/info/src/java/org/apache/avalon/framework/tools/qdox/QDoxInfoBuilder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- QDoxInfoBuilder.java 15 Nov 2002 22:31:14 -0000 1.2
+++ QDoxInfoBuilder.java 16 Nov 2002 04:34:50 -0000 1.3
@@ -32,8 +32,10 @@
*/
public class QDoxInfoBuilder
{
- private static final String LOGGER_CLASS =
"org.apache.avalon.framework.logger.Logger";
- private static final String CONTEXT_CLASS =
"org.apache.avalon.framework.context.Context";
+ private static final String LOGGER_CLASS =
+ "org.apache.avalon.framework.logger.Logger";
+ private static final String CONTEXT_CLASS =
+ "org.apache.avalon.framework.context.Context";
private static final String COMPONENT_MANAGER_CLASS =
"org.apache.avalon.framework.component.ComponentManager";
private static final String SERVICE_MANAGER_CLASS =
@@ -60,7 +62,7 @@
final SchemaDescriptor schema = buildSchema( javaClass );
final DependencyDescriptor[] dependencies = buildDependencies(
javaClass );
- return new ComponentInfo( component, services, loggers, context,
schema, dependencies );
+ return new ComponentInfo( component, services, loggers, context,
dependencies, schema );
}
/**
1.13 +2 -2
jakarta-avalon-excalibur/info/src/test/org/apache/avalon/framework/tools/infobuilder/test/InfoBuilderTestCase.java
Index: InfoBuilderTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/info/src/test/org/apache/avalon/framework/tools/infobuilder/test/InfoBuilderTestCase.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- InfoBuilderTestCase.java 15 Nov 2002 22:31:14 -0000 1.12
+++ InfoBuilderTestCase.java 16 Nov 2002 04:34:50 -0000 1.13
@@ -197,7 +197,7 @@
InfoAssert.EMPTY_ATTRIBUTES );
return new ComponentInfo( component, services, loggers,
- context, schema, deps );
+ context, deps, schema );
}
private ServiceDescriptor createServiceDescriptor()
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
