donaldp 02/02/06 05:35:14
Modified: proposal/myrmidon/src/java/org/apache/myrmidon/components/builder
ATIProjectBuilder.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/converter
DefaultConverterRegistry.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer
DefaultDeployer.java Deployment.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/executor
AspectAwareExecutor.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/role
DefaultRoleManager.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace
ProjectListenerSupport.java
Log:
Style touchups
Revision Changes Path
1.9 +7 -3
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/ATIProjectBuilder.java
Index: ATIProjectBuilder.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/ATIProjectBuilder.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ATIProjectBuilder.java 26 Jan 2002 12:04:07 -0000 1.8
+++ ATIProjectBuilder.java 6 Feb 2002 13:35:13 -0000 1.9
@@ -73,11 +73,15 @@
final String target = reactorHandler.getTarget( i );
final String data = reactorHandler.getData( i );
- if( target.equals( "xsl-param" ) ) {
+ if( target.equals( "xsl-param" ) )
+ {
handleParameter( data );
- } else if( target.equals( "xsl-params" ) ) {
+ }
+ else if( target.equals( "xsl-params" ) )
+ {
handleParameters( data, sourceID );
- } else if( target.equals( "xsl-stylesheet" ) )
+ }
+ else if( target.equals( "xsl-stylesheet" ) )
{
if( null != transformer )
{
1.8 +3 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/converter/DefaultConverterRegistry.java
Index: DefaultConverterRegistry.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/converter/DefaultConverterRegistry.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DefaultConverterRegistry.java 20 Jan 2002 17:32:57 -0000 1.7
+++ DefaultConverterRegistry.java 6 Feb 2002 13:35:13 -0000 1.8
@@ -23,8 +23,9 @@
public String getConverterName( final String source, final String
destination )
{
final HashMap map = (HashMap)m_mapping.get( source );
- if( null == map ) {
- return null;
+ if( null == map )
+ {
+ return null;
}
return (String)map.get( destination );
}
1.18 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/DefaultDeployer.java
Index: DefaultDeployer.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/DefaultDeployer.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- DefaultDeployer.java 3 Feb 2002 03:39:36 -0000 1.17
+++ DefaultDeployer.java 6 Feb 2002 13:35:13 -0000 1.18
@@ -149,7 +149,7 @@
checkFile( canonFile );
final File[] extensions = getOptionalPackagesFor( canonFile );
final URL[] urls = buildClasspath( canonFile, extensions );
- classLoader = new URLClassLoader( urls,
Thread.currentThread().getContextClassLoader() );
+ classLoader = new URLClassLoader( urls,
Thread.currentThread().getContextClassLoader() );
m_fileDeployers.put( canonFile, classLoader );
}
return classLoader;
1.16 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/Deployment.java
Index: Deployment.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/Deployment.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Deployment.java 3 Feb 2002 03:40:01 -0000 1.15
+++ Deployment.java 6 Feb 2002 13:35:13 -0000 1.16
@@ -142,7 +142,7 @@
for( int i = 0; i < m_descriptors.length; i++ )
{
Configuration descriptor = m_descriptors[ i ];
- deployFromDescriptor( descriptor, m_classLoader,
m_descriptorUrls[i] );
+ deployFromDescriptor( descriptor, m_classLoader,
m_descriptorUrls[ i ] );
}
}
@@ -338,7 +338,7 @@
/**
* Returns the type factory for a role.
*/
- private DefaultTypeFactory getFactory( final Class roleType)
+ private DefaultTypeFactory getFactory( final Class roleType )
{
DefaultTypeFactory factory = (DefaultTypeFactory)m_factories.get(
roleType );
1.16 +11 -6
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/AspectAwareExecutor.java
Index: AspectAwareExecutor.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/AspectAwareExecutor.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- AspectAwareExecutor.java 26 Jan 2002 12:04:31 -0000 1.15
+++ AspectAwareExecutor.java 6 Feb 2002 13:35:13 -0000 1.16
@@ -138,14 +138,17 @@
final ArrayList elementList = (ArrayList)elementMap.remove(
names[ i ] );
Parameters parameters = (Parameters)parameterMap.remove( names[
i ] );
- if( null == parameters ) {
- parameters = Parameters.EMPTY_PARAMETERS;
+ if( null == parameters )
+ {
+ parameters = Parameters.EMPTY_PARAMETERS;
}
Configuration[] elements = null;
- if( null == elementList ) {
+ if( null == elementList )
+ {
elements = EMPTY_ELEMENTS;
- } else
+ }
+ else
{
elements = (Configuration[])elementList.toArray(
EMPTY_ELEMENTS );
}
@@ -171,9 +174,11 @@
Configuration[] elements = null;
- if( null == elementList ) {
+ if( null == elementList )
+ {
elements = EMPTY_ELEMENTS;
- } else
+ }
+ else
{
elements = (Configuration[])elementList.toArray(
EMPTY_ELEMENTS );
}
1.9 +3 -3
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/role/DefaultRoleManager.java
Index: DefaultRoleManager.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/role/DefaultRoleManager.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DefaultRoleManager.java 1 Feb 2002 00:37:59 -0000 1.8
+++ DefaultRoleManager.java 6 Feb 2002 13:35:14 -0000 1.9
@@ -16,7 +16,7 @@
* Interface to manage roles and mapping to names.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version CVS $Revision: 1.8 $ $Date: 2002/02/01 00:37:59 $
+ * @version CVS $Revision: 1.9 $ $Date: 2002/02/06 13:35:14 $
*/
public class DefaultRoleManager
implements RoleManager
@@ -99,14 +99,14 @@
throws IllegalArgumentException
{
final String oldRole = (String)m_names.get( name );
- if( null != oldRole && ! oldRole.equals( role ) )
+ if( null != oldRole && !oldRole.equals( role ) )
{
final String message = REZ.getString( "duplicate-name.error",
oldRole );
throw new IllegalArgumentException( message );
}
final String oldName = (String)m_roles.get( role );
- if( null != oldName && ! oldName.equals( name ) )
+ if( null != oldName && !oldName.equals( name ) )
{
final String message = REZ.getString( "duplicate-role.error",
oldName );
throw new IllegalArgumentException( message );
1.6 +3 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/ProjectListenerSupport.java
Index: ProjectListenerSupport.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/ProjectListenerSupport.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ProjectListenerSupport.java 20 Jan 2002 17:32:58 -0000 1.5
+++ ProjectListenerSupport.java 6 Feb 2002 13:35:14 -0000 1.6
@@ -50,8 +50,9 @@
}
}
- if( -1 == found ) {
- return;
+ if( -1 == found )
+ {
+ return;
}
final ProjectListener[] listeners = new ProjectListener[
m_listeners.length - 1 ];
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
