donaldp 2002/11/12 12:07:51
Modified: xfc/src/java/org/apache/excalibur/xfc/ant XFCTask.java
xfc/src/java/org/apache/excalibur/xfc/model/instance
Instance.java MultiNonRoleInstance.java
MultiRoleInstance.java SelectorHintInstance.java
SingleNonRoleInstance.java SingleRoleInstance.java
xfc/src/java/org/apache/excalibur/xfc/modules/ecm ECM.java
ECMGenerator.java
Log:
Toucups.
Revision Changes Path
1.4 +13 -9
jakarta-avalon-excalibur/xfc/src/java/org/apache/excalibur/xfc/ant/XFCTask.java
Index: XFCTask.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/xfc/src/java/org/apache/excalibur/xfc/ant/XFCTask.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XFCTask.java 12 Nov 2002 19:55:27 -0000 1.3
+++ XFCTask.java 12 Nov 2002 20:07:50 -0000 1.4
@@ -70,7 +70,8 @@
* @author <a href="mailto:crafterm@;apache.org">Marcus Crafter</a>
* @version CVS $Id$
*/
-public final class XFCTask extends Task
+public final class XFCTask
+ extends Task
{
private Logger m_logger = new ConsoleLogger( ConsoleLogger.LEVEL_WARN );
private ModuleDefinition m_input;
@@ -125,9 +126,9 @@
}
catch( Exception e )
{
- throw new BuildException(
- "Error occured during XFC task conversion", e
- );
+ final String message =
+ "Error occured during XFC task conversion";
+ throw new BuildException( message, e );
}
}
@@ -146,16 +147,19 @@
m_input.getContext() == null
)
{
- throw new BuildException( "XFC input task missing input criteria" );
+ final String message =
+ "XFC input task missing input criteria";
+ throw new BuildException( message );
}
// check the output task
if( m_output == null ||
m_output.getModule() == null ||
- m_output.getContext() == null
- )
+ m_output.getContext() == null )
{
- throw new BuildException( "XFC output task missing output criteria" );
+ final String message =
+ "XFC output task missing output criteria";
+ throw new BuildException( message );
}
}
1.3 +4 -6
jakarta-avalon-excalibur/xfc/src/java/org/apache/excalibur/xfc/model/instance/Instance.java
Index: Instance.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/xfc/src/java/org/apache/excalibur/xfc/model/instance/Instance.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Instance.java 12 Nov 2002 19:55:27 -0000 1.2
+++ Instance.java 12 Nov 2002 20:07:50 -0000 1.3
@@ -83,11 +83,9 @@
* @param config instance <code>Configuration</code> as an array, if any
* @param handler a <code>String</code> value
*/
- public Instance(
- final String clazz,
- final Configuration[] config,
- final String handler
- )
+ public Instance( final String clazz,
+ final Configuration[] config,
+ final String handler )
{
m_class = clazz;
m_configuration = config;
1.3 +5 -6
jakarta-avalon-excalibur/xfc/src/java/org/apache/excalibur/xfc/model/instance/MultiNonRoleInstance.java
Index: MultiNonRoleInstance.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/xfc/src/java/org/apache/excalibur/xfc/model/instance/MultiNonRoleInstance.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MultiNonRoleInstance.java 12 Nov 2002 19:55:27 -0000 1.2
+++ MultiNonRoleInstance.java 12 Nov 2002 20:07:50 -0000 1.3
@@ -57,7 +57,8 @@
* @author <a href="mailto:crafterm@;apache.org">Marcus Crafter</a>
* @version CVS $Id$
*/
-public class MultiNonRoleInstance extends Instance
+public class MultiNonRoleInstance
+ extends Instance
{
// instance roles/override class/and subinstance definitions, if any
private final String m_role;
@@ -69,10 +70,8 @@
* @param role role name
* @param subinstances an {@link SingleRoleInstance}[] array
*/
- public MultiNonRoleInstance(
- final String role,
- final SingleRoleInstance[] subinstances
- )
+ public MultiNonRoleInstance( final String role,
+ final SingleRoleInstance[] subinstances )
{
super( null, null, null );
1.4 +5 -6
jakarta-avalon-excalibur/xfc/src/java/org/apache/excalibur/xfc/model/instance/MultiRoleInstance.java
Index: MultiRoleInstance.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/xfc/src/java/org/apache/excalibur/xfc/model/instance/MultiRoleInstance.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MultiRoleInstance.java 12 Nov 2002 19:55:27 -0000 1.3
+++ MultiRoleInstance.java 12 Nov 2002 20:07:50 -0000 1.4
@@ -56,7 +56,8 @@
* @author <a href="mailto:crafterm@;apache.org">Marcus Crafter</a>
* @version CVS $Id$
*/
-public class MultiRoleInstance extends Instance
+public class MultiRoleInstance
+ extends Instance
{
// instance configuration
private final String m_shorthand;
@@ -68,10 +69,8 @@
* @param shorthand a <code>String</code> value
* @param subinstances an <code>Instance[]</code> value
*/
- public MultiRoleInstance(
- final String shorthand,
- final SelectorHintInstance[] subinstances
- )
+ public MultiRoleInstance( final String shorthand,
+ final SelectorHintInstance[] subinstances )
{
super( null, null, null );
1.4 +5 -7
jakarta-avalon-excalibur/xfc/src/java/org/apache/excalibur/xfc/model/instance/SelectorHintInstance.java
Index: SelectorHintInstance.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/xfc/src/java/org/apache/excalibur/xfc/model/instance/SelectorHintInstance.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SelectorHintInstance.java 12 Nov 2002 19:55:27 -0000 1.3
+++ SelectorHintInstance.java 12 Nov 2002 20:07:50 -0000 1.4
@@ -58,7 +58,8 @@
* @author <a href="mailto:crafterm@;apache.org">Marcus Crafter</a>
* @version CVS $Id$
*/
-public class SelectorHintInstance extends Instance
+public class SelectorHintInstance
+ extends Instance
{
// instance configuration
private final String m_shorthand;
@@ -71,14 +72,11 @@
* @param hint selector hint
* @param clazz override class, if any
* @param config instance <code>Configuration</code> as an array, if any
- * @param handler handler name
*/
- public SelectorHintInstance(
- final String shorthand,
+ public SelectorHintInstance( final String shorthand,
final String hint,
final String clazz,
- final Configuration[] config
- )
+ final Configuration[] config )
{
super( clazz, config, null );
m_shorthand = shorthand;
1.3 +5 -6
jakarta-avalon-excalibur/xfc/src/java/org/apache/excalibur/xfc/model/instance/SingleNonRoleInstance.java
Index: SingleNonRoleInstance.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/xfc/src/java/org/apache/excalibur/xfc/model/instance/SingleNonRoleInstance.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SingleNonRoleInstance.java 12 Nov 2002 19:55:27 -0000 1.2
+++ SingleNonRoleInstance.java 12 Nov 2002 20:07:50 -0000 1.3
@@ -59,7 +59,8 @@
* @author <a href="mailto:crafterm@;apache.org">Marcus Crafter</a>
* @version CVS $Id$
*/
-public class SingleNonRoleInstance extends Instance
+public class SingleNonRoleInstance
+ extends Instance
{
// instance configuration
private final String m_role;
@@ -72,12 +73,10 @@
* @param config instance <code>Configuration</code> as an array, if any
* @param handler component handler name
*/
- public SingleNonRoleInstance(
- final String role,
+ public SingleNonRoleInstance( final String role,
final String clazz,
final Configuration[] config,
- final String handler
- )
+ final String handler )
{
super( clazz, config, handler );
m_role = role;
1.3 +3 -5
jakarta-avalon-excalibur/xfc/src/java/org/apache/excalibur/xfc/model/instance/SingleRoleInstance.java
Index: SingleRoleInstance.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/xfc/src/java/org/apache/excalibur/xfc/model/instance/SingleRoleInstance.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SingleRoleInstance.java 12 Nov 2002 19:55:27 -0000 1.2
+++ SingleRoleInstance.java 12 Nov 2002 20:07:50 -0000 1.3
@@ -71,12 +71,10 @@
* @param config instance <code>Configuration</code> as an array, if any
* @param handler handler name
*/
- public SingleRoleInstance(
- final String shorthand,
+ public SingleRoleInstance( final String shorthand,
final String clazz,
final Configuration[] config,
- final String handler
- )
+ final String handler )
{
super( clazz, config, handler );
m_shorthand = shorthand;
1.3 +3 -2
jakarta-avalon-excalibur/xfc/src/java/org/apache/excalibur/xfc/modules/ecm/ECM.java
Index: ECM.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/xfc/src/java/org/apache/excalibur/xfc/modules/ecm/ECM.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ECM.java 12 Nov 2002 19:55:28 -0000 1.2
+++ ECM.java 12 Nov 2002 20:07:50 -0000 1.3
@@ -85,7 +85,8 @@
* @author <a href="mailto:crafterm@;apache.org">Marcus Crafter</a>
* @version CVS $Id$
*/
-public class ECM extends AbstractLogEnabled
+public class ECM
+ extends AbstractLogEnabled
implements Module
{
private final ECMGenerator m_generator = new ECMGenerator();
1.6 +9 -6
jakarta-avalon-excalibur/xfc/src/java/org/apache/excalibur/xfc/modules/ecm/ECMGenerator.java
Index: ECMGenerator.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/xfc/src/java/org/apache/excalibur/xfc/modules/ecm/ECMGenerator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ECMGenerator.java 12 Nov 2002 19:55:28 -0000 1.5
+++ ECMGenerator.java 12 Nov 2002 20:07:50 -0000 1.6
@@ -73,7 +73,8 @@
* @author <a href="mailto:crafterm@;apache.org">Marcus Crafter</a>
* @version CVS $Id$
*/
-public class ECMGenerator extends AbstractLogEnabled
+public class ECMGenerator
+ extends AbstractLogEnabled
implements Constants
{
protected final DefaultConfigurationBuilder m_builder =
@@ -125,7 +126,9 @@
if( getLogger().isDebugEnabled() )
{
- getLogger().debug( "Identified total of " + roles.length + " roles" );
+ final String message =
+ "Identified total of " + roles.length + " roles";
+ getLogger().debug( message );
}
// for each role create a type object
@@ -151,9 +154,9 @@
if( getLogger().isDebugEnabled() )
{
- getLogger().debug(
- "Identified total of " + instances.length + " component instances"
- );
+ final String message =
+ "Identified total of " + instances.length + " component instances";
+ getLogger().debug( message );
}
for( int i = 0; i < instances.length; ++i )
--
To unsubscribe, e-mail: <mailto:avalon-cvs-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@;jakarta.apache.org>
