donaldp 2002/11/12 11:55:28
Modified: xfc/src/java/org/apache/excalibur/xfc Converter.java
Main.java
xfc/src/java/org/apache/excalibur/xfc/ant
ModuleDefinition.java XFCTask.java
xfc/src/java/org/apache/excalibur/xfc/model Definition.java
Model.java
xfc/src/java/org/apache/excalibur/xfc/model/instance
Instance.java InstanceVisitor.java
MultiNonRoleInstance.java MultiRoleInstance.java
SelectorHintInstance.java
SingleNonRoleInstance.java SingleRoleInstance.java
xfc/src/java/org/apache/excalibur/xfc/model/role
MultiRoleRef.java
xfc/src/java/org/apache/excalibur/xfc/modules Constants.java
xfc/src/java/org/apache/excalibur/xfc/modules/ecm ECM.java
ECMGenerator.java ECMSerializer.java
HandlerAnalyzer.java
xfc/src/java/org/apache/excalibur/xfc/modules/fortress
Fortress.java FortressGenerator.java
FortressSerializer.java HandlerMapper.java
Log:
optimize imports
Revision Changes Path
1.2 +3 -3
jakarta-avalon-excalibur/xfc/src/java/org/apache/excalibur/xfc/Converter.java
Index: Converter.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/xfc/src/java/org/apache/excalibur/xfc/Converter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Converter.java 2 Oct 2002 17:32:28 -0000 1.1
+++ Converter.java 12 Nov 2002 19:55:26 -0000 1.2
@@ -88,7 +88,7 @@
public void setInputModule( final Class module )
throws Exception
{
- m_input = ( Module ) module.newInstance();
+ m_input = (Module)module.newInstance();
m_input.enableLogging( getLogger().getChildLogger( module.getName() ) );
}
@@ -101,7 +101,7 @@
public void setOutputModule( final Class module )
throws Exception
{
- m_output = ( Module ) module.newInstance();
+ m_output = (Module)module.newInstance();
m_output.enableLogging( getLogger().getChildLogger( module.getName() ) );
}
1.4 +18 -20
jakarta-avalon-excalibur/xfc/src/java/org/apache/excalibur/xfc/Main.java
Index: Main.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/xfc/src/java/org/apache/excalibur/xfc/Main.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Main.java 23 Oct 2002 12:04:16 -0000 1.3
+++ Main.java 12 Nov 2002 19:55:27 -0000 1.4
@@ -50,15 +50,13 @@
package org.apache.excalibur.xfc;
import java.util.List;
-
-import org.apache.avalon.framework.logger.ConsoleLogger;
-import org.apache.avalon.framework.logger.NullLogger;
-import org.apache.avalon.framework.logger.Logger;
-
import org.apache.avalon.excalibur.cli.CLArgsParser;
import org.apache.avalon.excalibur.cli.CLOption;
import org.apache.avalon.excalibur.cli.CLOptionDescriptor;
import org.apache.avalon.excalibur.cli.CLUtil;
+import org.apache.avalon.framework.logger.ConsoleLogger;
+import org.apache.avalon.framework.logger.Logger;
+import org.apache.avalon.framework.logger.NullLogger;
/**
* Command line based XFC entry point.
@@ -129,14 +127,14 @@
// parse command line args
parseArgs( args );
- if ( getLogger().isInfoEnabled() )
+ if( getLogger().isInfoEnabled() )
{
getLogger().info( "Input Module = " + m_inputModule );
getLogger().info( "Input Module Context = " + m_inputCtx );
getLogger().info( "Output Module = " + m_outputModule );
getLogger().info( "Output Module Context = " + m_outputCtx );
}
-
+
// create converter
final Converter cv = new Converter( getLogger() );
@@ -167,7 +165,7 @@
if( null != parser.getErrorString() )
{
System.err.println( "Error: " + parser.getErrorString() );
- System.exit(1);
+ System.exit( 1 );
}
// Get a list of parsed options
@@ -175,7 +173,7 @@
final int size = options.size();
// Check that there are enough arguments (should be no more than 3)
- if ( size > 3 )
+ if( size > 3 )
{
printUsage();
}
@@ -220,17 +218,17 @@
}
// check that modules/contexts are set
- if ( m_inputModule == null ||
- m_inputCtx == null ||
- m_outputModule == null ||
- m_outputCtx == null )
+ if( m_inputModule == null ||
+ m_inputCtx == null ||
+ m_outputModule == null ||
+ m_outputCtx == null )
{
printUsage();
}
}
/**
- * Helper method for obtaining the {@link Module} name
+ * Helper method for obtaining the {@link Module} name
* from the given {@link String} parameter
*
* @param str a <code>String</code> value
@@ -238,7 +236,7 @@
*/
private static String getModule( final String str )
{
- final int i = str.indexOf(':');
+ final int i = str.indexOf( ':' );
return str.substring( 0, i );
}
@@ -251,7 +249,7 @@
*/
private static String getContext( final String str )
{
- final int i = str.indexOf(':');
+ final int i = str.indexOf( ':' );
return str.substring( i + 1 );
}
@@ -272,17 +270,17 @@
private static Class getClass( final String clazz )
throws ClassNotFoundException
{
- if ( "ecm".equalsIgnoreCase( clazz ) )
+ if( "ecm".equalsIgnoreCase( clazz ) )
{
return Class.forName( "org.apache.excalibur.xfc.modules.ecm.ECM" );
}
- if ( "fortress".equalsIgnoreCase( clazz ) )
+ if( "fortress".equalsIgnoreCase( clazz ) )
{
return Class.forName(
"org.apache.excalibur.xfc.modules.fortress.Fortress" );
}
- if ( "merlin".equalsIgnoreCase( clazz ) )
+ if( "merlin".equalsIgnoreCase( clazz ) )
{
return Class.forName( "org.apache.excalibur.xfc.modules.merlin.Merlin"
);
}
1.2 +9 -11
jakarta-avalon-excalibur/xfc/src/java/org/apache/excalibur/xfc/ant/ModuleDefinition.java
Index: ModuleDefinition.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/xfc/src/java/org/apache/excalibur/xfc/ant/ModuleDefinition.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ModuleDefinition.java 8 Oct 2002 16:30:18 -0000 1.1
+++ ModuleDefinition.java 12 Nov 2002 19:55:27 -0000 1.2
@@ -49,8 +49,6 @@
*/
package org.apache.excalibur.xfc.ant;
-import org.apache.tools.ant.BuildException;
-
/**
* Class used to hold information about a module definition in an XFC ANT
* task.
@@ -63,39 +61,39 @@
// internals
String m_module;
String m_context;
-
+
/**
* Get the value of m_module.
* @return value of m_module.
*/
- public String getModule()
+ public String getModule()
{
return m_module;
}
-
+
/**
* Set the value of m_module.
* @param v Value to assign to m_module.
*/
- public void setModule(String v)
+ public void setModule( String v )
{
m_module = v;
}
-
+
/**
* Get the value of m_context.
* @return value of m_context.
*/
- public String getContext()
+ public String getContext()
{
return m_context;
}
-
+
/**
* Set the value of m_context.
* @param v Value to assign to m_context.
*/
- public void setContext(String v)
+ public void setContext( String v )
{
m_context = v;
}
1.3 +11 -13
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XFCTask.java 16 Oct 2002 16:21:07 -0000 1.2
+++ XFCTask.java 12 Nov 2002 19:55:27 -0000 1.3
@@ -51,9 +51,7 @@
import org.apache.avalon.framework.logger.ConsoleLogger;
import org.apache.avalon.framework.logger.Logger;
-
import org.apache.excalibur.xfc.Converter;
-
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Task;
@@ -125,7 +123,7 @@
// all done, good show
}
- catch ( Exception e )
+ catch( Exception e )
{
throw new BuildException(
"Error occured during XFC task conversion", e
@@ -143,18 +141,18 @@
throws BuildException
{
// check the input task
- if ( m_input == null ||
- m_input.getModule() == null ||
- m_input.getContext() == null
+ if( m_input == null ||
+ m_input.getModule() == null ||
+ m_input.getContext() == null
)
{
throw new BuildException( "XFC input task missing input criteria" );
}
// check the output task
- if ( m_output == null ||
- m_output.getModule() == null ||
- m_output.getContext() == null
+ if( m_output == null ||
+ m_output.getModule() == null ||
+ m_output.getContext() == null
)
{
throw new BuildException( "XFC output task missing output criteria" );
@@ -178,17 +176,17 @@
private Class getClass( final String clazz )
throws ClassNotFoundException
{
- if ( "ecm".equalsIgnoreCase( clazz ) )
+ if( "ecm".equalsIgnoreCase( clazz ) )
{
return Class.forName( "org.apache.excalibur.xfc.modules.ecm.ECM" );
}
- if ( "fortress".equalsIgnoreCase( clazz ) )
+ if( "fortress".equalsIgnoreCase( clazz ) )
{
return Class.forName(
"org.apache.excalibur.xfc.modules.fortress.Fortress" );
}
- if ( "merlin".equalsIgnoreCase( clazz ) )
+ if( "merlin".equalsIgnoreCase( clazz ) )
{
return Class.forName( "org.apache.excalibur.xfc.modules.merlin.Merlin"
);
}
1.3 +2 -2
jakarta-avalon-excalibur/xfc/src/java/org/apache/excalibur/xfc/model/Definition.java
Index: Definition.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/xfc/src/java/org/apache/excalibur/xfc/model/Definition.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Definition.java 7 Oct 2002 17:13:17 -0000 1.2
+++ Definition.java 12 Nov 2002 19:55:27 -0000 1.3
@@ -73,7 +73,7 @@
final String clazz,
final String shorthand,
final String handler
- )
+ )
{
m_clazz = clazz;
m_shorthand = shorthand;
1.5 +7 -8
jakarta-avalon-excalibur/xfc/src/java/org/apache/excalibur/xfc/model/Model.java
Index: Model.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/xfc/src/java/org/apache/excalibur/xfc/model/Model.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Model.java 17 Oct 2002 14:38:17 -0000 1.4
+++ Model.java 12 Nov 2002 19:55:27 -0000 1.5
@@ -51,9 +51,8 @@
import java.util.ArrayList;
import java.util.List;
-
-import org.apache.excalibur.xfc.model.role.RoleRef;
import org.apache.excalibur.xfc.model.instance.Instance;
+import org.apache.excalibur.xfc.model.role.RoleRef;
/**
* Class for maintaining the Roles and their providing Components
@@ -99,7 +98,7 @@
*/
public RoleRef[] getDefinitions()
{
- return (RoleRef[]) m_definitions.toArray(
+ return (RoleRef[])m_definitions.toArray(
new RoleRef[ m_definitions.size() ]
);
}
@@ -114,10 +113,10 @@
{
RoleRef[] refs = getDefinitions();
- for ( int i = 0; i < refs.length; ++i )
+ for( int i = 0; i < refs.length; ++i )
{
- if ( refs[i].getShorthand().equals( shorthand ) )
- return refs[i];
+ if( refs[ i ].getShorthand().equals( shorthand ) )
+ return refs[ i ];
}
return null;
@@ -131,7 +130,7 @@
*/
public Instance[] getInstances()
{
- return (Instance[]) m_instances.toArray(
+ return (Instance[])m_instances.toArray(
new Instance[ m_instances.size() ]
);
}
1.2 +2 -2
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Instance.java 17 Oct 2002 14:38:17 -0000 1.1
+++ Instance.java 12 Nov 2002 19:55:27 -0000 1.2
@@ -87,7 +87,7 @@
final String clazz,
final Configuration[] config,
final String handler
- )
+ )
{
m_class = clazz;
m_configuration = config;
1.2 +2 -2
jakarta-avalon-excalibur/xfc/src/java/org/apache/excalibur/xfc/model/instance/InstanceVisitor.java
Index: InstanceVisitor.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/xfc/src/java/org/apache/excalibur/xfc/model/instance/InstanceVisitor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InstanceVisitor.java 17 Oct 2002 14:38:17 -0000 1.1
+++ InstanceVisitor.java 12 Nov 2002 19:55:27 -0000 1.2
@@ -56,7 +56,7 @@
* <p>
* This class is based on the Visitor pattern <i>(Design Patterns, p331)</i>.
* </p>
- *
+ *
* @author <a href="mailto:crafterm@;apache.org">Marcus Crafter</a>
* @version CVS $Id$
*/
1.2 +2 -2
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MultiNonRoleInstance.java 17 Oct 2002 14:38:17 -0000 1.1
+++ MultiNonRoleInstance.java 12 Nov 2002 19:55:27 -0000 1.2
@@ -72,7 +72,7 @@
public MultiNonRoleInstance(
final String role,
final SingleRoleInstance[] subinstances
- )
+ )
{
super( null, null, null );
1.3 +2 -2
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MultiRoleInstance.java 23 Oct 2002 11:32:25 -0000 1.2
+++ MultiRoleInstance.java 12 Nov 2002 19:55:27 -0000 1.3
@@ -71,7 +71,7 @@
public MultiRoleInstance(
final String shorthand,
final SelectorHintInstance[] subinstances
- )
+ )
{
super( null, null, null );
1.3 +2 -2
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SelectorHintInstance.java 23 Oct 2002 11:45:04 -0000 1.2
+++ SelectorHintInstance.java 12 Nov 2002 19:55:27 -0000 1.3
@@ -78,7 +78,7 @@
final String hint,
final String clazz,
final Configuration[] config
- )
+ )
{
super( clazz, config, null );
m_shorthand = shorthand;
1.2 +2 -2
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SingleNonRoleInstance.java 17 Oct 2002 14:38:17 -0000 1.1
+++ SingleNonRoleInstance.java 12 Nov 2002 19:55:27 -0000 1.2
@@ -77,7 +77,7 @@
final String clazz,
final Configuration[] config,
final String handler
- )
+ )
{
super( clazz, config, handler );
m_role = role;
1.2 +2 -2
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SingleRoleInstance.java 17 Oct 2002 14:38:17 -0000 1.1
+++ SingleRoleInstance.java 12 Nov 2002 19:55:27 -0000 1.2
@@ -76,7 +76,7 @@
final String clazz,
final Configuration[] config,
final String handler
- )
+ )
{
super( clazz, config, handler );
m_shorthand = shorthand;
1.2 +2 -2
jakarta-avalon-excalibur/xfc/src/java/org/apache/excalibur/xfc/model/role/MultiRoleRef.java
Index: MultiRoleRef.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/xfc/src/java/org/apache/excalibur/xfc/model/role/MultiRoleRef.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MultiRoleRef.java 17 Oct 2002 14:38:17 -0000 1.1
+++ MultiRoleRef.java 12 Nov 2002 19:55:28 -0000 1.2
@@ -72,7 +72,7 @@
*/
public MultiRoleRef(
final String role, final String shorthand, final Definition[] definitions
- )
+ )
{
super( role, shorthand );
m_definitions = definitions;
1.2 +17 -17
jakarta-avalon-excalibur/xfc/src/java/org/apache/excalibur/xfc/modules/Constants.java
Index: Constants.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/xfc/src/java/org/apache/excalibur/xfc/modules/Constants.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Constants.java 16 Oct 2002 16:21:07 -0000 1.1
+++ Constants.java 12 Nov 2002 19:55:28 -0000 1.2
@@ -58,27 +58,27 @@
public interface Constants
{
// normalized component handler names
- String TRANSIENT = "transient";
- String THREAD = "thread";
- String POOLED = "pooled";
- String SINGLETON = "singleton";
+ String TRANSIENT = "transient";
+ String THREAD = "thread";
+ String POOLED = "pooled";
+ String SINGLETON = "singleton";
// character used to separate context entries
- char CONTEXT_SEPARATOR = ':';
+ char CONTEXT_SEPARATOR = ':';
// ExcaliburComponentSelector class name
String ECS = "org.apache.avalon.excalibur.component.ExcaliburComponentSelector";
// general strings used in .roles/.xconf files.
- String COMPONENT = "component";
- String COMPONENT_INSTANCE = "component-instance";
- String ROLELIST = "role-list";
- String SHORTHAND = "shorthand";
- String CLASS = "class";
- String NAME = "name";
- String DEFAULT = "default-class";
- String HINT = "hint";
- String ROLE = "role";
- String ID = "id";
- String HANDLER = "handler";
+ String COMPONENT = "component";
+ String COMPONENT_INSTANCE = "component-instance";
+ String ROLELIST = "role-list";
+ String SHORTHAND = "shorthand";
+ String CLASS = "class";
+ String NAME = "name";
+ String DEFAULT = "default-class";
+ String HINT = "hint";
+ String ROLE = "role";
+ String ID = "id";
+ String HANDLER = "handler";
}
1.2 +2 -5
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ECM.java 16 Oct 2002 16:20:38 -0000 1.1
+++ ECM.java 12 Nov 2002 19:55:28 -0000 1.2
@@ -51,12 +51,10 @@
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.logger.Logger;
-
import org.apache.excalibur.xfc.Module;
import org.apache.excalibur.xfc.model.Model;
import org.apache.excalibur.xfc.modules.Constants;
-
/**
* <code>ECM</code> module implementation.
*
@@ -113,7 +111,6 @@
return m_generator.generate( validateContext( context ) );
}
-
/**
* Serializes a {@link Model} definition, ECM style, to an
* output context.
@@ -145,7 +142,7 @@
private String validateContext( final String context )
throws Exception
{
- if ( context.indexOf( Constants.CONTEXT_SEPARATOR ) == -1 )
+ if( context.indexOf( Constants.CONTEXT_SEPARATOR ) == -1 )
throw new IllegalArgumentException(
"Module requires the role and xconf filename " +
"separated by a '" + Constants.CONTEXT_SEPARATOR + "' character"
1.5 +36 -42
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ECMGenerator.java 23 Oct 2002 11:45:04 -0000 1.4
+++ ECMGenerator.java 12 Nov 2002 19:55:28 -0000 1.5
@@ -50,26 +50,20 @@
package org.apache.excalibur.xfc.modules.ecm;
import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
-
import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-
-import org.apache.excalibur.xfc.model.Model;
import org.apache.excalibur.xfc.model.Definition;
+import org.apache.excalibur.xfc.model.Model;
import org.apache.excalibur.xfc.model.instance.Instance;
import org.apache.excalibur.xfc.model.instance.MultiNonRoleInstance;
import org.apache.excalibur.xfc.model.instance.MultiRoleInstance;
import org.apache.excalibur.xfc.model.instance.SelectorHintInstance;
import org.apache.excalibur.xfc.model.instance.SingleNonRoleInstance;
import org.apache.excalibur.xfc.model.instance.SingleRoleInstance;
+import org.apache.excalibur.xfc.model.role.MultiRoleRef;
import org.apache.excalibur.xfc.model.role.RoleRef;
import org.apache.excalibur.xfc.model.role.SingleRoleRef;
-import org.apache.excalibur.xfc.model.role.MultiRoleRef;
-
import org.apache.excalibur.xfc.modules.Constants;
/**
@@ -104,10 +98,10 @@
{
Model model = new Model();
- addRoles( model, context);
- addInstances( model, context);
+ addRoles( model, context );
+ addInstances( model, context );
- if ( getLogger().isDebugEnabled() )
+ if( getLogger().isDebugEnabled() )
{
getLogger().debug( "Model built" );
}
@@ -129,15 +123,15 @@
// locate all roles
Configuration[] roles = getRoles( getRoleFile( context ) );
- if ( getLogger().isDebugEnabled() )
+ if( getLogger().isDebugEnabled() )
{
getLogger().debug( "Identified total of " + roles.length + " roles" );
}
// for each role create a type object
- for ( int i = 0; i < roles.length; ++i )
+ for( int i = 0; i < roles.length; ++i )
{
- model.addRoleRef( buildRoleRef( roles[i] ) );
+ model.addRoleRef( buildRoleRef( roles[ i ] ) );
}
}
@@ -155,16 +149,16 @@
// locate all component instances
Configuration[] instances = getInstanceList( getConfigurationFile( context
) );
- if ( getLogger().isDebugEnabled() )
+ if( getLogger().isDebugEnabled() )
{
getLogger().debug(
"Identified total of " + instances.length + " component instances"
);
}
- for ( int i = 0; i < instances.length; ++i )
+ for( int i = 0; i < instances.length; ++i )
{
- model.addInstance( buildInstance( instances[i], model ) );
+ model.addInstance( buildInstance( instances[ i ], model ) );
}
}
@@ -235,7 +229,7 @@
protected RoleRef buildRoleRef( final Configuration role )
throws Exception
{
- if ( isComponentSelectorRole( role ) )
+ if( isComponentSelectorRole( role ) )
{
return buildMultipleComponentRoleRef( role );
}
@@ -294,13 +288,13 @@
Configuration[] hints = role.getChildren( HINT );
Definition[] definitions = new Definition[ hints.length ];
- for ( int i = 0; i < hints.length; ++i )
+ for( int i = 0; i < hints.length; ++i )
{
- definitions[i] =
+ definitions[ i ] =
new Definition(
- hints[i].getAttribute( CLASS ),
- hints[i].getAttribute( SHORTHAND ),
- HandlerAnalyzer.getHandler( hints[i].getAttribute( CLASS ) )
+ hints[ i ].getAttribute( CLASS ),
+ hints[ i ].getAttribute( SHORTHAND ),
+ HandlerAnalyzer.getHandler( hints[ i ].getAttribute( CLASS ) )
);
}
@@ -312,7 +306,7 @@
// INSTANCE GENERATION METHODS
/**
- * Builds an {@link Instance} object from a given component configuration
+ * Builds an {@link Instance} object from a given component configuration
* definition.
*
* @param i a <code>Configuration</code> definition
@@ -323,11 +317,11 @@
protected Instance buildInstance( final Configuration i, final Model model )
throws Exception
{
- if ( i.getName().equals( COMPONENT ) )
+ if( i.getName().equals( COMPONENT ) )
{
Configuration[] kids = i.getChildren( COMPONENT_INSTANCE );
- if ( kids.length > 0 )
+ if( kids.length > 0 )
{
// build non-role component selector
return buildNonRoleComponentSelectorInstance( i );
@@ -337,7 +331,7 @@
return buildNonRoleComponentInstance( i );
}
- if ( isComponentSelectorXConf( i.getName(), model ) )
+ if( isComponentSelectorXConf( i.getName(), model ) )
{
// build multi role based component
return buildRoleComponentSelectorInstance( i );
@@ -359,7 +353,7 @@
*/
private boolean isComponentSelectorXConf(
final String shorthand, final Model model
- )
+ )
throws Exception
{
// check if shorthand corresponds to ECM
@@ -368,7 +362,7 @@
}
/**
- * Builds an {@link Instance} object from a given xconf
+ * Builds an {@link Instance} object from a given xconf
* configuration framgment, for component selector xconf definitions
* that do not use RoleManager.
*
@@ -378,21 +372,21 @@
*/
private Instance buildNonRoleComponentSelectorInstance(
final Configuration i
- )
+ )
throws Exception
{
final Configuration[] kids = i.getChildren( COMPONENT_INSTANCE );
final SingleRoleInstance[] subs = new SingleRoleInstance[ kids.length ];
- for ( int j = 0; j < kids.length; ++j )
+ for( int j = 0; j < kids.length; ++j )
{
- String clazz = kids[j].getAttribute( CLASS );
+ String clazz = kids[ j ].getAttribute( CLASS );
- subs[j] =
+ subs[ j ] =
new SingleRoleInstance(
- kids[j].getAttribute( NAME ),
+ kids[ j ].getAttribute( NAME ),
clazz,
- kids[j].getChildren(),
+ kids[ j ].getChildren(),
clazz == null ? null : HandlerAnalyzer.getHandler( clazz )
);
}
@@ -455,14 +449,14 @@
Configuration[] kids = i.getChildren();
SelectorHintInstance[] subinstances = new SelectorHintInstance[ kids.length
];
- for ( int j = 0; j < kids.length; ++j )
+ for( int j = 0; j < kids.length; ++j )
{
- subinstances[j] =
+ subinstances[ j ] =
new SelectorHintInstance(
- kids[j].getName(),
- kids[j].getAttribute( NAME ),
- kids[j].getAttribute( CLASS, null ),
- kids[j].getChildren()
+ kids[ j ].getName(),
+ kids[ j ].getAttribute( NAME ),
+ kids[ j ].getAttribute( CLASS, null ),
+ kids[ j ].getChildren()
);
}
1.4 +36 -41
jakarta-avalon-excalibur/xfc/src/java/org/apache/excalibur/xfc/modules/ecm/ECMSerializer.java
Index: ECMSerializer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/xfc/src/java/org/apache/excalibur/xfc/modules/ecm/ECMSerializer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ECMSerializer.java 23 Oct 2002 11:32:25 -0000 1.3
+++ ECMSerializer.java 12 Nov 2002 19:55:28 -0000 1.4
@@ -50,28 +50,23 @@
package org.apache.excalibur.xfc.modules.ecm;
import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
-
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.avalon.framework.configuration.DefaultConfigurationSerializer;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-
-import org.apache.excalibur.xfc.model.Model;
import org.apache.excalibur.xfc.model.Definition;
+import org.apache.excalibur.xfc.model.Model;
import org.apache.excalibur.xfc.model.instance.Instance;
import org.apache.excalibur.xfc.model.instance.InstanceVisitor;
+import org.apache.excalibur.xfc.model.instance.MultiNonRoleInstance;
+import org.apache.excalibur.xfc.model.instance.MultiRoleInstance;
import org.apache.excalibur.xfc.model.instance.SelectorHintInstance;
-import org.apache.excalibur.xfc.model.instance.SingleRoleInstance;
import org.apache.excalibur.xfc.model.instance.SingleNonRoleInstance;
-import org.apache.excalibur.xfc.model.instance.MultiRoleInstance;
-import org.apache.excalibur.xfc.model.instance.MultiNonRoleInstance;
+import org.apache.excalibur.xfc.model.instance.SingleRoleInstance;
+import org.apache.excalibur.xfc.model.role.MultiRoleRef;
import org.apache.excalibur.xfc.model.role.RoleRef;
import org.apache.excalibur.xfc.model.role.RoleRefVisitor;
import org.apache.excalibur.xfc.model.role.SingleRoleRef;
-import org.apache.excalibur.xfc.model.role.MultiRoleRef;
-
import org.apache.excalibur.xfc.modules.Constants;
/**
@@ -130,9 +125,9 @@
RoleRef[] rolerefs = model.getDefinitions();
// for each type object generate a roles file entry
- for ( int i = 0; i < rolerefs.length; ++i )
+ for( int i = 0; i < rolerefs.length; ++i )
{
- rolerefs[i].accept( this );
+ rolerefs[ i ].accept( this );
}
m_serializer.serializeToFile( getRoleFile( context ), m_roles );
@@ -153,9 +148,9 @@
Instance[] instances = model.getInstances();
// for each instance object generate an xconf file entry
- for ( int i = 0; i < instances.length; ++i )
+ for( int i = 0; i < instances.length; ++i )
{
- instances[i].accept( this );
+ instances[ i ].accept( this );
}
m_serializer.serializeToFile( getConfigurationFile( context ), m_xconf );
@@ -220,11 +215,11 @@
DefaultConfiguration role = new DefaultConfiguration( ROLE, "" );
Definition[] defs = ref.getProviders();
- for ( int i = 0; i < defs.length; ++i )
+ for( int i = 0; i < defs.length; ++i )
{
DefaultConfiguration hint = new DefaultConfiguration( HINT, "" );
- hint.setAttribute( SHORTHAND, defs[i].getShorthand() );
- hint.setAttribute( CLASS, defs[i].getDefaultClass() );
+ hint.setAttribute( SHORTHAND, defs[ i ].getShorthand() );
+ hint.setAttribute( CLASS, defs[ i ].getDefaultClass() );
role.addChild( hint );
}
@@ -236,7 +231,7 @@
}
/**
- * Builds a multiple component role definition from a
+ * Builds a multiple component role definition from a
* {@link RoleRef} definition. (Note, this method is unused).
*
* @param ref a {@link RoleRef} instance
@@ -261,17 +256,17 @@
{
DefaultConfiguration conf = new DefaultConfiguration( i.getShorthand(), ""
);
- if ( i.getConfiguration() != null )
+ if( i.getConfiguration() != null )
{
Configuration[] kids = i.getConfiguration();
- for ( int j = 0; j < kids.length; ++j )
+ for( int j = 0; j < kids.length; ++j )
{
- conf.addChild( kids[j] );
+ conf.addChild( kids[ j ] );
}
}
- if ( i.getClassImpl() != null )
+ if( i.getClassImpl() != null )
{
conf.setAttribute( CLASS, i.getClassImpl() );
}
@@ -294,13 +289,13 @@
conf.setAttribute( ROLE, i.getRole() );
conf.setAttribute( CLASS, i.getClassImpl() );
- if ( i.getConfiguration() != null )
+ if( i.getConfiguration() != null )
{
Configuration[] kids = i.getConfiguration();
- for ( int j = 0; j < kids.length; ++j )
+ for( int j = 0; j < kids.length; ++j )
{
- conf.addChild( kids[j] );
+ conf.addChild( kids[ j ] );
}
}
@@ -308,7 +303,7 @@
}
/**
- * Builds an xconf entry based on a {@link MultiNonRoleInstance}
+ * Builds an xconf entry based on a {@link MultiNonRoleInstance}
* declaration
*
* @param i a {@link MultiNonRoleInstance} instance
@@ -324,20 +319,20 @@
SingleRoleInstance[] subs = i.getSubInstances();
- for ( int j = 0; j < subs.length; ++j )
+ for( int j = 0; j < subs.length; ++j )
{
DefaultConfiguration child =
new DefaultConfiguration( COMPONENT_INSTANCE, "" );
- child.setAttribute( CLASS, subs[j].getClassImpl() );
- child.setAttribute( NAME, subs[j].getShorthand() );
+ child.setAttribute( CLASS, subs[ j ].getClassImpl() );
+ child.setAttribute( NAME, subs[ j ].getShorthand() );
- if ( subs[j].getConfiguration() != null )
+ if( subs[ j ].getConfiguration() != null )
{
- Configuration[] kids = subs[j].getConfiguration();
+ Configuration[] kids = subs[ j ].getConfiguration();
- for ( int k = 0; k < kids.length; ++k )
+ for( int k = 0; k < kids.length; ++k )
{
- child.addChild( kids[k] );
+ child.addChild( kids[ k ] );
}
}
@@ -360,19 +355,19 @@
SelectorHintInstance[] subs = i.getSubInstances();
- for ( int j = 0; j < subs.length; ++j )
+ for( int j = 0; j < subs.length; ++j )
{
DefaultConfiguration child =
- new DefaultConfiguration( subs[j].getShorthand(), "" );
- child.setAttribute( NAME, subs[j].getHint() );
+ new DefaultConfiguration( subs[ j ].getShorthand(), "" );
+ child.setAttribute( NAME, subs[ j ].getHint() );
- if ( subs[j].getConfiguration() != null )
+ if( subs[ j ].getConfiguration() != null )
{
- Configuration[] kids = subs[j].getConfiguration();
+ Configuration[] kids = subs[ j ].getConfiguration();
- for ( int k = 0; k < kids.length; ++k )
+ for( int k = 0; k < kids.length; ++k )
{
- child.addChild( kids[k] );
+ child.addChild( kids[ k ] );
}
}
1.3 +9 -10
jakarta-avalon-excalibur/xfc/src/java/org/apache/excalibur/xfc/modules/ecm/HandlerAnalyzer.java
Index: HandlerAnalyzer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/xfc/src/java/org/apache/excalibur/xfc/modules/ecm/HandlerAnalyzer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HandlerAnalyzer.java 17 Oct 2002 10:08:46 -0000 1.2
+++ HandlerAnalyzer.java 12 Nov 2002 19:55:28 -0000 1.3
@@ -51,7 +51,6 @@
import java.util.HashMap;
import java.util.Map;
-
import org.apache.excalibur.xfc.modules.Constants;
/**
@@ -88,7 +87,7 @@
* Method for extracting a role's ComponentHandler name,
* ECM style. ECM roles don't define ComponentHandlers explicitly,
* so some simple class analysis is made in this method to
- * try to ascertain which handler has been chosed by the
+ * try to ascertain which handler has been chosed by the
* implementor.
*
* @param classname class name as a <code>String</code> value
@@ -103,7 +102,7 @@
Class clazz = Class.forName( classname );
String handler = getNormalizedHandlerName( clazz );
- if ( handler != null )
+ if( handler != null )
{
return handler;
}
@@ -120,7 +119,7 @@
return TRANSIENT;
}
- catch ( ClassNotFoundException e )
+ catch( ClassNotFoundException e )
{
/*
if ( getLogger().isWarnEnabled() )
@@ -158,19 +157,19 @@
// get all interfaces implemented by this Class
Class[] interfaces = interfaze.getInterfaces();
- for ( int i = 0; i < interfaces.length; ++i )
+ for( int i = 0; i < interfaces.length; ++i )
{
// check if this interface is a known component marker
- if ( m_handlers.containsKey( interfaces[i].getName() ) )
+ if( m_handlers.containsKey( interfaces[ i ].getName() ) )
{
- return (String) m_handlers.get( interfaces[i].getName() );
+ return (String)m_handlers.get( interfaces[ i ].getName() );
}
// if it's unknown, check for any subinterfaces and recurse
- String handler = getNormalizedHandlerName( interfaces[i] );
+ String handler = getNormalizedHandlerName( interfaces[ i ] );
// if a subinterface is known, return
- if ( handler != null )
+ if( handler != null )
return handler;
}
1.3 +2 -3
jakarta-avalon-excalibur/xfc/src/java/org/apache/excalibur/xfc/modules/fortress/Fortress.java
Index: Fortress.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/xfc/src/java/org/apache/excalibur/xfc/modules/fortress/Fortress.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Fortress.java 17 Oct 2002 14:38:18 -0000 1.2
+++ Fortress.java 12 Nov 2002 19:55:28 -0000 1.3
@@ -51,7 +51,6 @@
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.logger.Logger;
-
import org.apache.excalibur.xfc.Module;
import org.apache.excalibur.xfc.model.Model;
import org.apache.excalibur.xfc.modules.Constants;
@@ -139,7 +138,7 @@
private String validateContext( final String context )
throws Exception
{
- if ( context.indexOf( Constants.CONTEXT_SEPARATOR ) == -1 )
+ if( context.indexOf( Constants.CONTEXT_SEPARATOR ) == -1 )
throw new IllegalArgumentException(
"Fortress Module requires the role and xconf filename " +
"separated by a '" + Constants.CONTEXT_SEPARATOR + "' character"
1.3 +10 -18
jakarta-avalon-excalibur/xfc/src/java/org/apache/excalibur/xfc/modules/fortress/FortressGenerator.java
Index: FortressGenerator.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/xfc/src/java/org/apache/excalibur/xfc/modules/fortress/FortressGenerator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FortressGenerator.java 17 Oct 2002 14:38:18 -0000 1.2
+++ FortressGenerator.java 12 Nov 2002 19:55:28 -0000 1.3
@@ -49,22 +49,14 @@
*/
package org.apache.excalibur.xfc.modules.fortress;
-import java.util.HashMap;
-import java.util.Map;
-
import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.DefaultConfiguration;
-
import org.apache.excalibur.xfc.model.Definition;
-
-import org.apache.excalibur.xfc.model.Model;
import org.apache.excalibur.xfc.model.instance.Instance;
import org.apache.excalibur.xfc.model.instance.SingleNonRoleInstance;
import org.apache.excalibur.xfc.model.instance.SingleRoleInstance;
+import org.apache.excalibur.xfc.model.role.MultiRoleRef;
import org.apache.excalibur.xfc.model.role.RoleRef;
import org.apache.excalibur.xfc.model.role.SingleRoleRef;
-import org.apache.excalibur.xfc.model.role.MultiRoleRef;
-
import org.apache.excalibur.xfc.modules.ecm.ECMGenerator;
/**
@@ -92,7 +84,7 @@
}
/**
- * Method to create a {@link RoleRef} object for a Configuration
+ * Method to create a {@link RoleRef} object for a Configuration
* definition that defines a single component based role.
*
* @param role a <code>Configuration</code> definition of a role
@@ -105,7 +97,7 @@
Configuration config = role.getChild( COMPONENT );
Definition definition =
new Definition(
- config.getAttribute( CLASS ),
+ config.getAttribute( CLASS ),
config.getAttribute( SHORTHAND ),
HandlerMapper.getHandler( config.getAttribute( HANDLER ) )
);
@@ -129,13 +121,13 @@
Configuration[] hints = role.getChildren( COMPONENT );
Definition[] definitions = new Definition[ hints.length ];
- for ( int i = 0; i < hints.length; ++i )
+ for( int i = 0; i < hints.length; ++i )
{
- definitions[i] =
+ definitions[ i ] =
new Definition(
- hints[i].getAttribute( CLASS ),
- hints[i].getAttribute( SHORTHAND ),
- HandlerMapper.getHandler( hints[i].getAttribute( HANDLER ) )
+ hints[ i ].getAttribute( CLASS ),
+ hints[ i ].getAttribute( SHORTHAND ),
+ HandlerMapper.getHandler( hints[ i ].getAttribute( HANDLER ) )
);
}
@@ -154,7 +146,7 @@
protected Instance buildInstance( final Configuration i )
throws Exception
{
- if ( i.getName().equals( COMPONENT ) )
+ if( i.getName().equals( COMPONENT ) )
{
// build non-role component
return buildNonRoleComponentInstance( i );
1.4 +31 -39
jakarta-avalon-excalibur/xfc/src/java/org/apache/excalibur/xfc/modules/fortress/FortressSerializer.java
Index: FortressSerializer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/xfc/src/java/org/apache/excalibur/xfc/modules/fortress/FortressSerializer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FortressSerializer.java 23 Oct 2002 11:32:25 -0000 1.3
+++ FortressSerializer.java 12 Nov 2002 19:55:28 -0000 1.4
@@ -49,24 +49,16 @@
*/
package org.apache.excalibur.xfc.modules.fortress;
-import java.util.HashMap;
-import java.util.Map;
-
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.DefaultConfiguration;
-
import org.apache.excalibur.xfc.model.Definition;
-import org.apache.excalibur.xfc.model.instance.Instance;
-import org.apache.excalibur.xfc.model.instance.InstanceVisitor;
+import org.apache.excalibur.xfc.model.instance.MultiNonRoleInstance;
+import org.apache.excalibur.xfc.model.instance.MultiRoleInstance;
import org.apache.excalibur.xfc.model.instance.SelectorHintInstance;
-import org.apache.excalibur.xfc.model.instance.SingleRoleInstance;
import org.apache.excalibur.xfc.model.instance.SingleNonRoleInstance;
-import org.apache.excalibur.xfc.model.instance.MultiRoleInstance;
-import org.apache.excalibur.xfc.model.instance.MultiNonRoleInstance;
-import org.apache.excalibur.xfc.model.Model;
-import org.apache.excalibur.xfc.model.role.SingleRoleRef;
+import org.apache.excalibur.xfc.model.instance.SingleRoleInstance;
import org.apache.excalibur.xfc.model.role.MultiRoleRef;
-
+import org.apache.excalibur.xfc.model.role.SingleRoleRef;
import org.apache.excalibur.xfc.modules.ecm.ECMSerializer;
/**
@@ -85,7 +77,7 @@
* definition.
*
* @param ref a {@link SingleRoleRef} instance
- * @exception Exception if an error occurs
+ * @exception Exception if an error occurs
*/
public void visit( final SingleRoleRef ref )
throws Exception
@@ -117,13 +109,13 @@
DefaultConfiguration role = new DefaultConfiguration( ROLE, "" );
Definition[] defs = ref.getProviders();
- for ( int i = 0; i < defs.length; ++i )
+ for( int i = 0; i < defs.length; ++i )
{
DefaultConfiguration hint = new DefaultConfiguration( COMPONENT, "" );
- hint.setAttribute( SHORTHAND, defs[i].getShorthand() );
- hint.setAttribute( CLASS, defs[i].getDefaultClass() );
+ hint.setAttribute( SHORTHAND, defs[ i ].getShorthand() );
+ hint.setAttribute( CLASS, defs[ i ].getDefaultClass() );
hint.setAttribute(
- HANDLER, HandlerMapper.getHandler( defs[i].getHandler() )
+ HANDLER, HandlerMapper.getHandler( defs[ i ].getHandler() )
);
role.addChild( hint );
@@ -147,13 +139,13 @@
{
DefaultConfiguration conf = new DefaultConfiguration( i.getShorthand(), ""
);
- if ( i.getConfiguration() != null )
+ if( i.getConfiguration() != null )
{
Configuration[] kids = i.getConfiguration();
- for ( int j = 0; j < kids.length; ++j )
+ for( int j = 0; j < kids.length; ++j )
{
- conf.addChild( kids[j] );
+ conf.addChild( kids[ j ] );
}
}
@@ -173,19 +165,19 @@
{
SelectorHintInstance[] subs = i.getSubInstances();
- for ( int j = 0; j < subs.length; ++j )
+ for( int j = 0; j < subs.length; ++j )
{
DefaultConfiguration child =
- new DefaultConfiguration( subs[j].getShorthand(), "" );
- child.setAttribute( ID, subs[j].getHint() );
+ new DefaultConfiguration( subs[ j ].getShorthand(), "" );
+ child.setAttribute( ID, subs[ j ].getHint() );
- if ( subs[j].getConfiguration() != null )
+ if( subs[ j ].getConfiguration() != null )
{
- Configuration[] kids = subs[j].getConfiguration();
+ Configuration[] kids = subs[ j ].getConfiguration();
- for ( int k = 0; k < kids.length; ++k )
+ for( int k = 0; k < kids.length; ++k )
{
- child.addChild( kids[k] );
+ child.addChild( kids[ k ] );
}
}
@@ -209,13 +201,13 @@
conf.setAttribute( HANDLER, HandlerMapper.getHandler( i.getHandler() ) );
conf.setAttribute( ID, "UNKNOWN" );
- if ( i.getConfiguration() != null )
+ if( i.getConfiguration() != null )
{
Configuration[] kids = i.getConfiguration();
- for ( int j = 0; j < kids.length; ++j )
+ for( int j = 0; j < kids.length; ++j )
{
- conf.addChild( kids[j] );
+ conf.addChild( kids[ j ] );
}
}
@@ -234,22 +226,22 @@
SingleRoleInstance[] subs = i.getSubInstances();
Configuration[] xconfs = new Configuration[ subs.length ];
- for ( int j = 0; j < subs.length; ++j )
+ for( int j = 0; j < subs.length; ++j )
{
DefaultConfiguration conf = new DefaultConfiguration( COMPONENT, "" );
conf.setAttribute( ROLE, i.getRole() );
- conf.setAttribute( CLASS, subs[j].getClassImpl() );
- conf.setAttribute( HANDLER, HandlerMapper.getHandler(
subs[j].getHandler() ) );
- conf.setAttribute( ID, subs[j].getShorthand() );
+ conf.setAttribute( CLASS, subs[ j ].getClassImpl() );
+ conf.setAttribute( HANDLER, HandlerMapper.getHandler( subs[ j
].getHandler() ) );
+ conf.setAttribute( ID, subs[ j ].getShorthand() );
- if ( subs[j].getConfiguration() != null )
+ if( subs[ j ].getConfiguration() != null )
{
- Configuration[] kids = subs[j].getConfiguration();
+ Configuration[] kids = subs[ j ].getConfiguration();
- for ( int k = 0; k < kids.length; ++k )
+ for( int k = 0; k < kids.length; ++k )
{
- conf.addChild( kids[k] );
+ conf.addChild( kids[ k ] );
}
}
1.3 +4 -5
jakarta-avalon-excalibur/xfc/src/java/org/apache/excalibur/xfc/modules/fortress/HandlerMapper.java
Index: HandlerMapper.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/xfc/src/java/org/apache/excalibur/xfc/modules/fortress/HandlerMapper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HandlerMapper.java 17 Oct 2002 10:08:47 -0000 1.2
+++ HandlerMapper.java 12 Nov 2002 19:55:28 -0000 1.3
@@ -51,7 +51,6 @@
import java.util.HashMap;
import java.util.Map;
-
import org.apache.excalibur.xfc.modules.Constants;
/**
@@ -113,11 +112,11 @@
*/
private static String getLifestyleType( String handler, String defaultValue )
{
- if ( handler != null )
+ if( handler != null )
{
- String type = (String) m_handlers.get( handler );
+ String type = (String)m_handlers.get( handler );
- if ( type != null )
+ if( type != null )
return type;
}
--
To unsubscribe, e-mail: <mailto:avalon-cvs-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@;jakarta.apache.org>
