From 22f32dcc7d530978faa15a060a5fabd538c359c1 Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Fri, 1 Mar 2002 08:54:35 +0000 Subject: [PATCH] restyle via IDEA git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271627 13f79535-47bb-0310-9956-ffa450edef68 --- .../antlib/core/StringToFileConverter.java | 4 ++-- .../apache/antlib/vfile/DefaultFileSet.java | 2 +- .../apache/antlib/vfile/FilteredFileList.java | 4 ++-- .../apache/antlib/vfile/ListFilesTask.java | 2 +- .../selectors/AbstractNameFileSelector.java | 6 ++--- .../vfile/selectors/AndFileSelector.java | 6 ++--- .../vfile/selectors/BaseNameFileSelector.java | 1 - .../selectors/ExistenceFileSelector.java | 2 +- .../selectors/IsEmptyFolderSelector.java | 6 ++--- .../vfile/selectors/IsFileSelector.java | 2 +- .../vfile/selectors/IsFolderSelector.java | 2 +- .../vfile/selectors/NameFileSelector.java | 1 - .../vfile/selectors/NotFileSelector.java | 4 ++-- .../vfile/selectors/OrFileSelector.java | 6 ++--- .../vfile/selectors/UrlFileSelector.java | 1 - .../local/LocalFileSystemProvider.java | 2 +- .../configurer/DefaultConfigurer.java | 9 ++++---- .../configurer/NoSuchPropertyException.java | 2 -- .../converter/DefaultMasterConverter.java | 4 ++-- .../deployer/DefaultClassLoaderManager.java | 2 +- .../components/deployer/DefaultDeployer.java | 4 ++-- .../executor/AspectAwareExecutor.java | 2 +- .../myrmidon/interfaces/role/RoleInfo.java | 6 ++--- .../listeners/NoPrefixProjectListener.java | 2 +- .../org/apache/antlib/core/PropertyTest.java | 7 +++--- .../antlib/vfile/CopyFilesTaskTest.java | 2 +- .../aut/vfs/AbstractFileSystemTest.java | 23 ++++++++----------- .../vfs/AbstractWritableFileSystemTest.java | 1 - .../test/org/apache/aut/zip/ZipEntryTest.java | 2 +- .../apache/myrmidon/AbstractMyrmidonTest.java | 6 ++--- .../apache/myrmidon/AbstractProjectTest.java | 2 +- .../myrmidon/DependencyMetricsTest.java | 20 ++++++++-------- .../components/configurer/ConfigTest4.java | 2 -- .../configurer/ConfigTestMultiTypedAdder.java | 2 -- .../configurer/ConfigTestPrimConvert.java | 2 +- .../configurer/DefaultConfigurerTest.java | 8 +++---- .../deployer/DefaultDeployerTest.java | 8 +++---- .../embeddor/DefaultEmbeddorTest.java | 4 ++-- .../role/DefaultRoleManagerTest.java | 10 ++++---- .../InstantiatingServiceManagerTest.java | 2 +- .../interfaces/type/TypeFactoryTest.java | 1 - .../org/apache/antlib/core/PropertyTest.java | 7 +++--- .../antlib/vfile/CopyFilesTaskTest.java | 2 +- .../aut/vfs/AbstractFileSystemTest.java | 23 ++++++++----------- .../vfs/AbstractWritableFileSystemTest.java | 1 - .../org/apache/aut/zip/ZipEntryTest.java | 2 +- .../apache/myrmidon/AbstractMyrmidonTest.java | 6 ++--- .../apache/myrmidon/AbstractProjectTest.java | 2 +- .../myrmidon/DependencyMetricsTest.java | 20 ++++++++-------- .../components/configurer/ConfigTest4.java | 2 -- .../configurer/ConfigTestMultiTypedAdder.java | 2 -- .../configurer/ConfigTestPrimConvert.java | 2 +- .../configurer/DefaultConfigurerTest.java | 8 +++---- .../deployer/DefaultDeployerTest.java | 8 +++---- .../embeddor/DefaultEmbeddorTest.java | 4 ++-- .../role/DefaultRoleManagerTest.java | 10 ++++---- .../InstantiatingServiceManagerTest.java | 2 +- .../interfaces/type/TypeFactoryTest.java | 1 - 58 files changed, 130 insertions(+), 156 deletions(-) diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToFileConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToFileConverter.java index 6d87aacf4..edda6dd02 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToFileConverter.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToFileConverter.java @@ -8,12 +8,12 @@ package org.apache.antlib.core; import java.io.File; +import org.apache.aut.converter.AbstractConverter; +import org.apache.aut.converter.ConverterException; import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.api.TaskException; -import org.apache.aut.converter.AbstractConverter; -import org.apache.aut.converter.ConverterException; /** * String to file converter diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/DefaultFileSet.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/DefaultFileSet.java index 36f36a330..df4b7cc08 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/DefaultFileSet.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/DefaultFileSet.java @@ -8,6 +8,7 @@ package org.apache.antlib.vfile; import java.util.ArrayList; +import org.apache.antlib.vfile.selectors.AndFileSelector; import org.apache.aut.vfs.FileObject; import org.apache.aut.vfs.FileSystemException; import org.apache.aut.vfs.FileType; @@ -15,7 +16,6 @@ import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.api.TaskException; -import org.apache.antlib.vfile.selectors.AndFileSelector; /** * A file set, that contains those files under a directory that match diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/FilteredFileList.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/FilteredFileList.java index 7db65d9e6..8bd99bd46 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/FilteredFileList.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/FilteredFileList.java @@ -8,10 +8,10 @@ package org.apache.antlib.vfile; import java.util.ArrayList; +import org.apache.antlib.vfile.selectors.AndFileSelector; import org.apache.aut.vfs.FileObject; import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.api.TaskException; -import org.apache.antlib.vfile.selectors.AndFileSelector; /** * A file-list which filters another. @@ -67,6 +67,6 @@ public class FilteredFileList } } - return (FileObject[])acceptedFiles.toArray( new FileObject[acceptedFiles.size() ] ); + return (FileObject[])acceptedFiles.toArray( new FileObject[ acceptedFiles.size() ] ); } } diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/ListFilesTask.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/ListFilesTask.java index c313ce3fc..8c99dcb54 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/ListFilesTask.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/ListFilesTask.java @@ -40,7 +40,7 @@ public class ListFilesTask final FileObject[] files = m_files.listFiles( getContext() ); for( int i = 0; i < files.length; i++ ) { - FileObject file = files[i ]; + FileObject file = files[ i ]; getLogger().info( file.toString() ); } } diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/AbstractNameFileSelector.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/AbstractNameFileSelector.java index 4ff1e32c5..c57797b98 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/AbstractNameFileSelector.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/AbstractNameFileSelector.java @@ -7,7 +7,10 @@ */ package org.apache.antlib.vfile.selectors; +import org.apache.antlib.vfile.FileSelector; import org.apache.aut.vfs.FileObject; +import org.apache.avalon.excalibur.i18n.ResourceManager; +import org.apache.avalon.excalibur.i18n.Resources; import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.api.TaskException; import org.apache.oro.text.GlobCompiler; @@ -15,9 +18,6 @@ import org.apache.oro.text.regex.MalformedPatternException; import org.apache.oro.text.regex.Pattern; import org.apache.oro.text.regex.Perl5Compiler; import org.apache.oro.text.regex.Perl5Matcher; -import org.apache.avalon.excalibur.i18n.ResourceManager; -import org.apache.avalon.excalibur.i18n.Resources; -import org.apache.antlib.vfile.FileSelector; /** * An abstract file selector that selects files based on name. diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/AndFileSelector.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/AndFileSelector.java index 3a36ebb48..0d1d93b08 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/AndFileSelector.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/AndFileSelector.java @@ -8,10 +8,10 @@ package org.apache.antlib.vfile.selectors; import java.util.ArrayList; +import org.apache.antlib.vfile.FileSelector; import org.apache.aut.vfs.FileObject; import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.api.TaskException; -import org.apache.antlib.vfile.FileSelector; /** * A file selector that performs an AND of nested selectors. Performs @@ -46,8 +46,8 @@ public class AndFileSelector { for( int i = 0; i < m_selectors.size(); i++ ) { - final FileSelector fileSelector = (FileSelector)m_selectors.get(i ); - if( ! fileSelector.accept( file, path, context ) ) + final FileSelector fileSelector = (FileSelector)m_selectors.get( i ); + if( !fileSelector.accept( file, path, context ) ) { return false; } diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/BaseNameFileSelector.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/BaseNameFileSelector.java index cb7977fa1..f06c5acf3 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/BaseNameFileSelector.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/BaseNameFileSelector.java @@ -8,7 +8,6 @@ package org.apache.antlib.vfile.selectors; import org.apache.aut.vfs.FileObject; -import org.apache.antlib.vfile.selectors.AbstractNameFileSelector; /** * A file selector that selects files based on their base-name. diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/ExistenceFileSelector.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/ExistenceFileSelector.java index 8bc4d91aa..2c0f9cbf1 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/ExistenceFileSelector.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/ExistenceFileSelector.java @@ -7,11 +7,11 @@ */ package org.apache.antlib.vfile.selectors; +import org.apache.antlib.vfile.FileSelector; import org.apache.aut.vfs.FileObject; import org.apache.aut.vfs.FileSystemException; import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.api.TaskException; -import org.apache.antlib.vfile.FileSelector; /** * A file selector that only selects files that exist. diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/IsEmptyFolderSelector.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/IsEmptyFolderSelector.java index 6aaaa9561..9a1b4e295 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/IsEmptyFolderSelector.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/IsEmptyFolderSelector.java @@ -9,8 +9,8 @@ package org.apache.antlib.vfile.selectors; import org.apache.antlib.vfile.FileSelector; import org.apache.aut.vfs.FileObject; -import org.apache.aut.vfs.FileType; import org.apache.aut.vfs.FileSystemException; +import org.apache.aut.vfs.FileType; import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.api.TaskException; @@ -37,8 +37,8 @@ public class IsEmptyFolderSelector try { return ( file.exists() - && file.getType() == FileType.FOLDER - && file.getChildren().length == 0 ); + && file.getType() == FileType.FOLDER + && file.getChildren().length == 0 ); } catch( FileSystemException e ) { diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/IsFileSelector.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/IsFileSelector.java index 1f1ae5822..51a4913f5 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/IsFileSelector.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/IsFileSelector.java @@ -7,12 +7,12 @@ */ package org.apache.antlib.vfile.selectors; +import org.apache.antlib.vfile.FileSelector; import org.apache.aut.vfs.FileObject; import org.apache.aut.vfs.FileSystemException; import org.apache.aut.vfs.FileType; import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.api.TaskException; -import org.apache.antlib.vfile.FileSelector; /** * A file selector which only selects files, not folders. diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/IsFolderSelector.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/IsFolderSelector.java index 21a828529..50b07c443 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/IsFolderSelector.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/IsFolderSelector.java @@ -7,12 +7,12 @@ */ package org.apache.antlib.vfile.selectors; +import org.apache.antlib.vfile.FileSelector; import org.apache.aut.vfs.FileObject; import org.apache.aut.vfs.FileSystemException; import org.apache.aut.vfs.FileType; import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.api.TaskException; -import org.apache.antlib.vfile.FileSelector; /** * A file selector which only selects folders, not files. diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/NameFileSelector.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/NameFileSelector.java index be6168a13..a3e1de741 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/NameFileSelector.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/NameFileSelector.java @@ -8,7 +8,6 @@ package org.apache.antlib.vfile.selectors; import org.apache.aut.vfs.FileObject; -import org.apache.antlib.vfile.selectors.AbstractNameFileSelector; /** * A file selector that selects files based on their name. diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/NotFileSelector.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/NotFileSelector.java index c8963ed61..7202d3e4b 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/NotFileSelector.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/NotFileSelector.java @@ -7,10 +7,10 @@ */ package org.apache.antlib.vfile.selectors; +import org.apache.antlib.vfile.FileSelector; import org.apache.aut.vfs.FileObject; import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.api.TaskException; -import org.apache.antlib.vfile.FileSelector; /** * A file selector that negates a nested file selector. @@ -46,6 +46,6 @@ public class NotFileSelector { throw new TaskException( "notfileselector.no-selector.error" ); } - return ! m_selector.accept( file, path, context ); + return !m_selector.accept( file, path, context ); } } diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/OrFileSelector.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/OrFileSelector.java index b9dde565a..8a420f092 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/OrFileSelector.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/OrFileSelector.java @@ -8,10 +8,10 @@ package org.apache.antlib.vfile.selectors; import java.util.ArrayList; +import org.apache.antlib.vfile.FileSelector; import org.apache.aut.vfs.FileObject; import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.api.TaskException; -import org.apache.antlib.vfile.FileSelector; /** * A file selector that performs an OR of nested selectors. Performs @@ -46,7 +46,7 @@ public class OrFileSelector { for( int i = 0; i < m_selectors.size(); i++ ) { - final FileSelector fileSelector = (FileSelector)m_selectors.get(i ); + final FileSelector fileSelector = (FileSelector)m_selectors.get( i ); if( fileSelector.accept( file, path, context ) ) { return true; @@ -54,6 +54,6 @@ public class OrFileSelector } // Return true if there are no selectors, false if there are - return (m_selectors.size() == 0); + return ( m_selectors.size() == 0 ); } } diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/UrlFileSelector.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/UrlFileSelector.java index b36b8c69b..7a6b6271b 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/UrlFileSelector.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/UrlFileSelector.java @@ -8,7 +8,6 @@ package org.apache.antlib.vfile.selectors; import org.apache.aut.vfs.FileObject; -import org.apache.antlib.vfile.selectors.AbstractNameFileSelector; /** * A file selector that selects files based on their URL. diff --git a/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/local/LocalFileSystemProvider.java b/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/local/LocalFileSystemProvider.java index aaf7023cb..7cd1ef5ff 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/local/LocalFileSystemProvider.java +++ b/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/local/LocalFileSystemProvider.java @@ -7,6 +7,7 @@ */ package org.apache.aut.vfs.provider.local; +import java.io.File; import org.apache.aut.vfs.FileObject; import org.apache.aut.vfs.FileSystemException; import org.apache.aut.vfs.provider.AbstractFileSystemProvider; @@ -14,7 +15,6 @@ import org.apache.aut.vfs.provider.DefaultFileName; import org.apache.aut.vfs.provider.FileSystem; import org.apache.aut.vfs.provider.FileSystemProvider; import org.apache.aut.vfs.provider.ParsedUri; -import java.io.File; /** * A file system provider, which uses direct file access. diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultConfigurer.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultConfigurer.java index c4deb0437..b3902b75c 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultConfigurer.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultConfigurer.java @@ -415,7 +415,7 @@ public class DefaultConfigurer // Convert the value to the appropriate type final Class type = setter.getType(); - if( ! type.isInstance( objValue ) ) + if( !type.isInstance( objValue ) ) { objValue = m_converter.convert( type, objValue, context ); } @@ -478,7 +478,7 @@ public class DefaultConfigurer configureObject( child, element, context ); // Convert the object, if necessary - if( ! type.isInstance( child ) ) + if( !type.isInstance( child ) ) { child = m_converter.convert( type, child, context ); } @@ -540,7 +540,8 @@ public class DefaultConfigurer // Map the expected type to a role. If found, instantiate the default // type for that role final RoleInfo roleInfo = m_roleManager.getRoleByType( type ); - if( roleInfo != null ) { + if( roleInfo != null ) + { final String typeName = roleInfo.getDefaultType(); if( typeName != null ) { @@ -582,7 +583,7 @@ public class DefaultConfigurer // Use the generic 'data-type' role. final TypeFactory factory = m_typeManager.getFactory( DataType.class ); - if( ! factory.canCreate( name ) ) + if( !factory.canCreate( name ) ) { throw new NoSuchPropertyException(); } diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/NoSuchPropertyException.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/NoSuchPropertyException.java index f3162a5f8..5a7ff4fed 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/NoSuchPropertyException.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/NoSuchPropertyException.java @@ -7,8 +7,6 @@ */ package org.apache.myrmidon.components.configurer; - - /** * A marker exception that is thrown when an unknown property is encountered. * diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/converter/DefaultMasterConverter.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/converter/DefaultMasterConverter.java index c4c79f6e6..836ece30f 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/converter/DefaultMasterConverter.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/converter/DefaultMasterConverter.java @@ -140,7 +140,7 @@ public class DefaultMasterConverter ArrayList queue = new ArrayList(); queue.add( originalClass ); - while( ! queue.isEmpty() ) + while( !queue.isEmpty() ) { Class clazz = (Class)queue.remove( 0 ); @@ -152,7 +152,7 @@ public class DefaultMasterConverter final Class[] interfaces = clazz.getInterfaces(); for( int i = 0; i < interfaces.length; i++ ) { - queue.add( interfaces[i ] ); + queue.add( interfaces[ i ] ); } // Check if we can convert from current class to destination diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/DefaultClassLoaderManager.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/DefaultClassLoaderManager.java index e001893c8..bb53bfcf2 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/DefaultClassLoaderManager.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/DefaultClassLoaderManager.java @@ -24,9 +24,9 @@ import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; import org.apache.avalon.framework.activity.Initializable; import org.apache.avalon.framework.logger.AbstractLogEnabled; -import org.apache.avalon.framework.service.Serviceable; import org.apache.avalon.framework.service.ServiceException; import org.apache.avalon.framework.service.ServiceManager; +import org.apache.avalon.framework.service.Serviceable; import org.apache.myrmidon.interfaces.deployer.DeploymentException; import org.apache.myrmidon.interfaces.extensions.ExtensionManager; diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/DefaultDeployer.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/DefaultDeployer.java index 08f0afd66..4cef3a4bf 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/DefaultDeployer.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/DefaultDeployer.java @@ -145,7 +145,7 @@ public class DefaultDeployer throws Exception { final String roleShorthand = definition.getRoleShorthand(); - final String roleName = getRole( roleShorthand ).getName(); + final String roleName = getRole( roleShorthand ).getName(); final String factoryClassName = definition.getFactoryClass(); handleType( deployment, ServiceFactory.class, roleName, factoryClassName ); } @@ -277,7 +277,7 @@ public class DefaultDeployer private RoleInfo getRole( final String roleShorthand ) throws DeploymentException { - final RoleInfo roleInfo = m_roleManager.getRoleByShorthandName( roleShorthand ); + final RoleInfo roleInfo = m_roleManager.getRoleByShorthandName( roleShorthand ); if( null == roleInfo ) { final String message = REZ.getString( "unknown-role4name.error", roleShorthand ); diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/AspectAwareExecutor.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/AspectAwareExecutor.java index 59912d71a..74ad5a25c 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/AspectAwareExecutor.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/AspectAwareExecutor.java @@ -16,8 +16,8 @@ import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.avalon.framework.configuration.DefaultConfiguration; import org.apache.avalon.framework.logger.Logger; import org.apache.avalon.framework.parameters.Parameters; -import org.apache.avalon.framework.service.ServiceManager; import org.apache.avalon.framework.service.ServiceException; +import org.apache.avalon.framework.service.ServiceManager; import org.apache.myrmidon.api.Task; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.interfaces.aspect.AspectManager; diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/role/RoleInfo.java b/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/role/RoleInfo.java index f04dc33d1..fa1ebc43d 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/role/RoleInfo.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/role/RoleInfo.java @@ -7,8 +7,6 @@ */ package org.apache.myrmidon.interfaces.role; - - /** * A role definition. Role definitions are immutable. * @@ -87,7 +85,7 @@ public final class RoleInfo { return false; } - if( ! m_name.equals( role.m_name ) ) + if( !m_name.equals( role.m_name ) ) { return false; } @@ -95,7 +93,7 @@ public final class RoleInfo { return false; } - if( m_shorthand != null && ! m_shorthand.equals( role.m_shorthand ) ) + if( m_shorthand != null && !m_shorthand.equals( role.m_shorthand ) ) { return false; } diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/listeners/NoPrefixProjectListener.java b/proposal/myrmidon/src/java/org/apache/myrmidon/listeners/NoPrefixProjectListener.java index 6f85f57ce..245da1ad3 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/listeners/NoPrefixProjectListener.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/listeners/NoPrefixProjectListener.java @@ -13,7 +13,7 @@ package org.apache.myrmidon.listeners; * @author Adam Murdoch * @version $Revision$ $Date$ * @ant:type type="listener" name="noprefix" - */ + */ public class NoPrefixProjectListener extends DefaultProjectListener { diff --git a/proposal/myrmidon/src/test/org/apache/antlib/core/PropertyTest.java b/proposal/myrmidon/src/test/org/apache/antlib/core/PropertyTest.java index baaf073df..31dfcc9f5 100644 --- a/proposal/myrmidon/src/test/org/apache/antlib/core/PropertyTest.java +++ b/proposal/myrmidon/src/test/org/apache/antlib/core/PropertyTest.java @@ -12,7 +12,6 @@ import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; import org.apache.myrmidon.AbstractProjectTest; import org.apache.myrmidon.LogMessageTracker; -import org.apache.myrmidon.components.configurer.DefaultConfigurer; /** * Test cases for task. @@ -42,17 +41,17 @@ public class PropertyTest // Set by attribute LogMessageTracker tracker = new LogMessageTracker(); - tracker.addExpectedMessage( "set-attr", "test-prop = [some value]"); + tracker.addExpectedMessage( "set-attr", "test-prop = [some value]" ); executeTarget( projectFile, "set-attr", tracker ); // Set by text content tracker = new LogMessageTracker(); - tracker.addExpectedMessage( "set-content", "test-prop2 = [some value]"); + tracker.addExpectedMessage( "set-content", "test-prop2 = [some value]" ); executeTarget( projectFile, "set-content", tracker ); // Set by nested element tracker = new LogMessageTracker(); - tracker.addExpectedMessage( "set-element", "test-prop3 = [value=[some value]]"); + tracker.addExpectedMessage( "set-element", "test-prop3 = [value=[some value]]" ); executeTarget( projectFile, "set-element", tracker ); } diff --git a/proposal/myrmidon/src/test/org/apache/antlib/vfile/CopyFilesTaskTest.java b/proposal/myrmidon/src/test/org/apache/antlib/vfile/CopyFilesTaskTest.java index 87f7030ae..5be210545 100644 --- a/proposal/myrmidon/src/test/org/apache/antlib/vfile/CopyFilesTaskTest.java +++ b/proposal/myrmidon/src/test/org/apache/antlib/vfile/CopyFilesTaskTest.java @@ -7,8 +7,8 @@ */ package org.apache.antlib.vfile; -import org.apache.myrmidon.AbstractProjectTest; import java.io.File; +import org.apache.myrmidon.AbstractProjectTest; /** * Test cases for the task. diff --git a/proposal/myrmidon/src/test/org/apache/aut/vfs/AbstractFileSystemTest.java b/proposal/myrmidon/src/test/org/apache/aut/vfs/AbstractFileSystemTest.java index 9bf3aefbf..5660f5afc 100644 --- a/proposal/myrmidon/src/test/org/apache/aut/vfs/AbstractFileSystemTest.java +++ b/proposal/myrmidon/src/test/org/apache/aut/vfs/AbstractFileSystemTest.java @@ -9,14 +9,11 @@ package org.apache.aut.vfs; import java.io.ByteArrayOutputStream; import java.io.InputStream; -import java.io.Reader; -import java.io.StringWriter; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; -import junit.framework.TestCase; import org.apache.aut.vfs.impl.DefaultFileSystemManager; import org.apache.myrmidon.AbstractMyrmidonTest; @@ -203,21 +200,21 @@ public abstract class AbstractFileSystemTest /** * Checks that a relative name resolves to the expected absolute path. */ - private void assertSameName(String expectedPath, - FileName baseName, - String relName ) throws Exception + private void assertSameName( String expectedPath, + FileName baseName, + String relName ) throws Exception { - FileName name = baseName.resolveName(relName); + FileName name = baseName.resolveName( relName ); assertEquals( expectedPath, name.getPath() ); // Replace the separators - relName.replace('\\', '/'); - name = baseName.resolveName(relName); + relName.replace( '\\', '/' ); + name = baseName.resolveName( relName ); assertEquals( expectedPath, name.getPath() ); // And again - relName.replace('/', '\\'); - name = baseName.resolveName(relName); + relName.replace( '/', '\\' ); + name = baseName.resolveName( relName ); assertEquals( expectedPath, name.getPath() ); } @@ -457,12 +454,12 @@ public abstract class AbstractFileSystemTest // Test non-empty file FileObject file = m_baseFolder.resolveFile( "file1.txt" ); FileContent content = file.getContent(); - assertSameContent(m_charContent, content); + assertSameContent( m_charContent, content ); // Test empty file file = m_baseFolder.resolveFile( "empty.txt" ); content = file.getContent(); - assertSameContent("", content); + assertSameContent( "", content ); } /** diff --git a/proposal/myrmidon/src/test/org/apache/aut/vfs/AbstractWritableFileSystemTest.java b/proposal/myrmidon/src/test/org/apache/aut/vfs/AbstractWritableFileSystemTest.java index 2481390df..8243bb32e 100644 --- a/proposal/myrmidon/src/test/org/apache/aut/vfs/AbstractWritableFileSystemTest.java +++ b/proposal/myrmidon/src/test/org/apache/aut/vfs/AbstractWritableFileSystemTest.java @@ -7,7 +7,6 @@ */ package org.apache.aut.vfs; -import java.io.Writer; import java.io.OutputStream; import java.util.HashSet; import java.util.Set; diff --git a/proposal/myrmidon/src/test/org/apache/aut/zip/ZipEntryTest.java b/proposal/myrmidon/src/test/org/apache/aut/zip/ZipEntryTest.java index 68f4a2e0c..24e919ee0 100644 --- a/proposal/myrmidon/src/test/org/apache/aut/zip/ZipEntryTest.java +++ b/proposal/myrmidon/src/test/org/apache/aut/zip/ZipEntryTest.java @@ -7,8 +7,8 @@ */ package org.apache.aut.zip; -import junit.framework.TestCase; import java.util.NoSuchElementException; +import junit.framework.TestCase; /** * JUnit testcases ZipEntry. diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/AbstractMyrmidonTest.java b/proposal/myrmidon/src/test/org/apache/myrmidon/AbstractMyrmidonTest.java index 60ef00a53..b833ffd5e 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/AbstractMyrmidonTest.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/AbstractMyrmidonTest.java @@ -39,9 +39,9 @@ public abstract class AbstractMyrmidonTest final String baseDirProp = System.getProperty( "test.basedir" ); m_baseDir = new File( baseDirProp ); String packagePath = getClass().getName(); - int idx = packagePath.lastIndexOf('.'); - packagePath = packagePath.substring(0, idx); - packagePath = packagePath.replace('.', File.separatorChar); + int idx = packagePath.lastIndexOf( '.' ); + packagePath = packagePath.substring( 0, idx ); + packagePath = packagePath.replace( '.', File.separatorChar ); m_testBaseDir = new File( m_baseDir, packagePath ); } diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/AbstractProjectTest.java b/proposal/myrmidon/src/test/org/apache/myrmidon/AbstractProjectTest.java index 426aa58da..ef6f324c6 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/AbstractProjectTest.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/AbstractProjectTest.java @@ -77,7 +77,7 @@ public class AbstractProjectTest final String targetName, final String message ) { - executeTargetExpectError( projectFile, targetName, new String[] { message } ); + executeTargetExpectError( projectFile, targetName, new String[]{message} ); } /** diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/DependencyMetricsTest.java b/proposal/myrmidon/src/test/org/apache/myrmidon/DependencyMetricsTest.java index 1423825dc..7051f834a 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/DependencyMetricsTest.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/DependencyMetricsTest.java @@ -171,17 +171,17 @@ public class DependencyMetricsTest * Make sure that antlib package does not have any * unwanted dependencies. */ -/* - public void testAntlibDecoupled() - { - final String packageName = "org.apache.antlib"; - final String[] badEfferents = new String[] + /* + public void testAntlibDecoupled() { - "org.apache.tools.ant" - }; - doTestDecoupled( packageName, badEfferents ); - } -*/ + final String packageName = "org.apache.antlib"; + final String[] badEfferents = new String[] + { + "org.apache.tools.ant" + }; + doTestDecoupled( packageName, badEfferents ); + } + */ /** * Make sure there are no circular dependencies between packages because * circular dependencies are evil!!! diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/ConfigTest4.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/ConfigTest4.java index 4d7cfd299..6a83b1513 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/ConfigTest4.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/ConfigTest4.java @@ -7,8 +7,6 @@ */ package org.apache.myrmidon.components.configurer; - - /** * Simple class to test typed adder. * diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/ConfigTestMultiTypedAdder.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/ConfigTestMultiTypedAdder.java index 0eb4c5d41..3e10e476b 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/ConfigTestMultiTypedAdder.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/ConfigTestMultiTypedAdder.java @@ -7,8 +7,6 @@ */ package org.apache.myrmidon.components.configurer; - - /** * Simple class with more than one typed adder method. * diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/ConfigTestPrimConvert.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/ConfigTestPrimConvert.java index 4a204f7f6..3c2b8d6c9 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/ConfigTestPrimConvert.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/ConfigTestPrimConvert.java @@ -36,7 +36,7 @@ public class ConfigTestPrimConvert { return false; } - if ( !AbstractComponentTest.equals( m_integerProp, test.m_integerProp ) ) + if( !AbstractComponentTest.equals( m_integerProp, test.m_integerProp ) ) { return false; } diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/DefaultConfigurerTest.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/DefaultConfigurerTest.java index b569488b6..ea1483eb4 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/DefaultConfigurerTest.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/DefaultConfigurerTest.java @@ -103,7 +103,7 @@ public class DefaultConfigurerTest // Check result final ConfigTestPrimConvert expected = new ConfigTestPrimConvert(); expected.setIntProp( 90 ); - expected.setIntegerProp( new Integer(-401) ); + expected.setIntegerProp( new Integer( -401 ) ); assertEquals( expected, test ); } @@ -381,7 +381,7 @@ public class DefaultConfigurerTest final ConfigTestInterfaceProp test = new ConfigTestInterfaceProp(); // Configure object - m_configurer.configure( test, config, m_context ); + m_configurer.configure( test, config, m_context ); // Check result final ConfigTestInterfaceProp expected = new ConfigTestInterfaceProp(); @@ -442,7 +442,7 @@ public class DefaultConfigurerTest REZ.getString( "bad-configure-element.error", "test" ), REZ.getString( "multiple-adder-methods-for-element.error", ConfigTestMultiTypedAdder.class.getName(), - "") + "" ) }; assertSameMessage( messages, ce ); } @@ -541,7 +541,7 @@ public class DefaultConfigurerTest config.setAttribute( "my-role1", "some value" ); // Set up the converter and role - registerRole( new RoleInfo("my-role1", MyRole1.class ) ); + registerRole( new RoleInfo( "my-role1", MyRole1.class ) ); registerConverter( ObjectToMyRole1Converter.class, String.class, MyRole1.class ); final ConfigTestTypedProp test = new ConfigTestTypedProp(); diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/deployer/DefaultDeployerTest.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/deployer/DefaultDeployerTest.java index 3416c45f6..26f2b5505 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/deployer/DefaultDeployerTest.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/deployer/DefaultDeployerTest.java @@ -69,13 +69,13 @@ public class DefaultDeployerTest // Determine the shorthand for the DataType role // Create the type definition - final TypeDefinition typeDef = new TypeDefinition( typeName, DATA_TYPE_ROLE, classname ); + final TypeDefinition typeDef = new TypeDefinition( typeName, DATA_TYPE_ROLE, classname ); final ClassLoader classLoader = getClass().getClassLoader(); final TypeDeployer typeDeployer = m_deployer.createDeployer( classLoader ); // Make sure the test types have not been deployed - assertTypesNotRegistered( ); + assertTypesNotRegistered(); // Deploy the type typeDeployer.deployType( typeDef ); @@ -103,7 +103,7 @@ public class DefaultDeployerTest final TypeDeployer typeDeployer = m_deployer.createDeployer( classLoader ); // Make sure the test types have not been deployed - assertTypesNotRegistered( ); + assertTypesNotRegistered(); // Deploy the type typeDeployer.deployType( typeDef ); @@ -176,7 +176,7 @@ public class DefaultDeployerTest * Ensures the types from the test typelib descriptor have been correctly * deployed. */ - private void assertTypesRegistered( ) throws Exception + private void assertTypesRegistered() throws Exception { // Check the data-type TypeFactory typeFactory = getTypeManager().getFactory( DataType.class ); diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/embeddor/DefaultEmbeddorTest.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/embeddor/DefaultEmbeddorTest.java index 2345c658d..91289c5d1 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/embeddor/DefaultEmbeddorTest.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/embeddor/DefaultEmbeddorTest.java @@ -50,11 +50,11 @@ public class DefaultEmbeddorTest final Target implicitTarget = project.getImplicitTarget(); assertEquals( 1, implicitTarget.getTasks().length ); - assertEquals( "property", implicitTarget.getTasks()[0].getName() ); + assertEquals( "property", implicitTarget.getTasks()[ 0 ].getName() ); final Target target = project.getTarget( "main-target" ); assertEquals( 1, target.getTasks().length ); - assertEquals( "log", target.getTasks()[0].getName() ); + assertEquals( "log", target.getTasks()[ 0 ].getName() ); } /** diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/role/DefaultRoleManagerTest.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/role/DefaultRoleManagerTest.java index 509a52118..e2332b1ae 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/role/DefaultRoleManagerTest.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/role/DefaultRoleManagerTest.java @@ -7,13 +7,13 @@ */ package org.apache.myrmidon.components.role; +import org.apache.avalon.excalibur.i18n.ResourceManager; +import org.apache.avalon.excalibur.i18n.Resources; import org.apache.myrmidon.AbstractMyrmidonTest; import org.apache.myrmidon.api.Task; -import org.apache.myrmidon.interfaces.role.RoleManager; -import org.apache.myrmidon.interfaces.role.RoleInfo; import org.apache.myrmidon.interfaces.role.RoleException; -import org.apache.avalon.excalibur.i18n.Resources; -import org.apache.avalon.excalibur.i18n.ResourceManager; +import org.apache.myrmidon.interfaces.role.RoleInfo; +import org.apache.myrmidon.interfaces.role.RoleManager; /** * Test cases for the DefaultRoleManager. @@ -51,7 +51,7 @@ public class DefaultRoleManagerTest // Lookup the role RoleInfo role = m_roleManager.getRole( roleName ); - assertTrue( origRole.equals(role) ); + assertTrue( origRole.equals( role ) ); // Lookup the role by shorthand role = m_roleManager.getRoleByShorthandName( shorthand ); diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/service/InstantiatingServiceManagerTest.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/service/InstantiatingServiceManagerTest.java index 75dc65aa4..8ce1fb3cb 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/service/InstantiatingServiceManagerTest.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/service/InstantiatingServiceManagerTest.java @@ -113,7 +113,7 @@ public class InstantiatingServiceManagerTest { // Make sure that hasService() works correctly final String serviceRole = "some-unknown-service"; - assertTrue( ! m_serviceManager.hasService( serviceRole ) ); + assertTrue( !m_serviceManager.hasService( serviceRole ) ); // Make sure that lookup() fails try diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/interfaces/type/TypeFactoryTest.java b/proposal/myrmidon/src/test/org/apache/myrmidon/interfaces/type/TypeFactoryTest.java index facea850f..a73626251 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/interfaces/type/TypeFactoryTest.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/interfaces/type/TypeFactoryTest.java @@ -9,7 +9,6 @@ package org.apache.myrmidon.interfaces.type; import java.io.File; import java.net.URL; -import junit.framework.TestCase; import org.apache.myrmidon.AbstractMyrmidonTest; /** diff --git a/proposal/myrmidon/src/testcases/org/apache/antlib/core/PropertyTest.java b/proposal/myrmidon/src/testcases/org/apache/antlib/core/PropertyTest.java index baaf073df..31dfcc9f5 100644 --- a/proposal/myrmidon/src/testcases/org/apache/antlib/core/PropertyTest.java +++ b/proposal/myrmidon/src/testcases/org/apache/antlib/core/PropertyTest.java @@ -12,7 +12,6 @@ import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; import org.apache.myrmidon.AbstractProjectTest; import org.apache.myrmidon.LogMessageTracker; -import org.apache.myrmidon.components.configurer.DefaultConfigurer; /** * Test cases for task. @@ -42,17 +41,17 @@ public class PropertyTest // Set by attribute LogMessageTracker tracker = new LogMessageTracker(); - tracker.addExpectedMessage( "set-attr", "test-prop = [some value]"); + tracker.addExpectedMessage( "set-attr", "test-prop = [some value]" ); executeTarget( projectFile, "set-attr", tracker ); // Set by text content tracker = new LogMessageTracker(); - tracker.addExpectedMessage( "set-content", "test-prop2 = [some value]"); + tracker.addExpectedMessage( "set-content", "test-prop2 = [some value]" ); executeTarget( projectFile, "set-content", tracker ); // Set by nested element tracker = new LogMessageTracker(); - tracker.addExpectedMessage( "set-element", "test-prop3 = [value=[some value]]"); + tracker.addExpectedMessage( "set-element", "test-prop3 = [value=[some value]]" ); executeTarget( projectFile, "set-element", tracker ); } diff --git a/proposal/myrmidon/src/testcases/org/apache/antlib/vfile/CopyFilesTaskTest.java b/proposal/myrmidon/src/testcases/org/apache/antlib/vfile/CopyFilesTaskTest.java index 87f7030ae..5be210545 100644 --- a/proposal/myrmidon/src/testcases/org/apache/antlib/vfile/CopyFilesTaskTest.java +++ b/proposal/myrmidon/src/testcases/org/apache/antlib/vfile/CopyFilesTaskTest.java @@ -7,8 +7,8 @@ */ package org.apache.antlib.vfile; -import org.apache.myrmidon.AbstractProjectTest; import java.io.File; +import org.apache.myrmidon.AbstractProjectTest; /** * Test cases for the task. diff --git a/proposal/myrmidon/src/testcases/org/apache/aut/vfs/AbstractFileSystemTest.java b/proposal/myrmidon/src/testcases/org/apache/aut/vfs/AbstractFileSystemTest.java index 9bf3aefbf..5660f5afc 100644 --- a/proposal/myrmidon/src/testcases/org/apache/aut/vfs/AbstractFileSystemTest.java +++ b/proposal/myrmidon/src/testcases/org/apache/aut/vfs/AbstractFileSystemTest.java @@ -9,14 +9,11 @@ package org.apache.aut.vfs; import java.io.ByteArrayOutputStream; import java.io.InputStream; -import java.io.Reader; -import java.io.StringWriter; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; -import junit.framework.TestCase; import org.apache.aut.vfs.impl.DefaultFileSystemManager; import org.apache.myrmidon.AbstractMyrmidonTest; @@ -203,21 +200,21 @@ public abstract class AbstractFileSystemTest /** * Checks that a relative name resolves to the expected absolute path. */ - private void assertSameName(String expectedPath, - FileName baseName, - String relName ) throws Exception + private void assertSameName( String expectedPath, + FileName baseName, + String relName ) throws Exception { - FileName name = baseName.resolveName(relName); + FileName name = baseName.resolveName( relName ); assertEquals( expectedPath, name.getPath() ); // Replace the separators - relName.replace('\\', '/'); - name = baseName.resolveName(relName); + relName.replace( '\\', '/' ); + name = baseName.resolveName( relName ); assertEquals( expectedPath, name.getPath() ); // And again - relName.replace('/', '\\'); - name = baseName.resolveName(relName); + relName.replace( '/', '\\' ); + name = baseName.resolveName( relName ); assertEquals( expectedPath, name.getPath() ); } @@ -457,12 +454,12 @@ public abstract class AbstractFileSystemTest // Test non-empty file FileObject file = m_baseFolder.resolveFile( "file1.txt" ); FileContent content = file.getContent(); - assertSameContent(m_charContent, content); + assertSameContent( m_charContent, content ); // Test empty file file = m_baseFolder.resolveFile( "empty.txt" ); content = file.getContent(); - assertSameContent("", content); + assertSameContent( "", content ); } /** diff --git a/proposal/myrmidon/src/testcases/org/apache/aut/vfs/AbstractWritableFileSystemTest.java b/proposal/myrmidon/src/testcases/org/apache/aut/vfs/AbstractWritableFileSystemTest.java index 2481390df..8243bb32e 100644 --- a/proposal/myrmidon/src/testcases/org/apache/aut/vfs/AbstractWritableFileSystemTest.java +++ b/proposal/myrmidon/src/testcases/org/apache/aut/vfs/AbstractWritableFileSystemTest.java @@ -7,7 +7,6 @@ */ package org.apache.aut.vfs; -import java.io.Writer; import java.io.OutputStream; import java.util.HashSet; import java.util.Set; diff --git a/proposal/myrmidon/src/testcases/org/apache/aut/zip/ZipEntryTest.java b/proposal/myrmidon/src/testcases/org/apache/aut/zip/ZipEntryTest.java index 68f4a2e0c..24e919ee0 100644 --- a/proposal/myrmidon/src/testcases/org/apache/aut/zip/ZipEntryTest.java +++ b/proposal/myrmidon/src/testcases/org/apache/aut/zip/ZipEntryTest.java @@ -7,8 +7,8 @@ */ package org.apache.aut.zip; -import junit.framework.TestCase; import java.util.NoSuchElementException; +import junit.framework.TestCase; /** * JUnit testcases ZipEntry. diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/AbstractMyrmidonTest.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/AbstractMyrmidonTest.java index 60ef00a53..b833ffd5e 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/AbstractMyrmidonTest.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/AbstractMyrmidonTest.java @@ -39,9 +39,9 @@ public abstract class AbstractMyrmidonTest final String baseDirProp = System.getProperty( "test.basedir" ); m_baseDir = new File( baseDirProp ); String packagePath = getClass().getName(); - int idx = packagePath.lastIndexOf('.'); - packagePath = packagePath.substring(0, idx); - packagePath = packagePath.replace('.', File.separatorChar); + int idx = packagePath.lastIndexOf( '.' ); + packagePath = packagePath.substring( 0, idx ); + packagePath = packagePath.replace( '.', File.separatorChar ); m_testBaseDir = new File( m_baseDir, packagePath ); } diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/AbstractProjectTest.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/AbstractProjectTest.java index 426aa58da..ef6f324c6 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/AbstractProjectTest.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/AbstractProjectTest.java @@ -77,7 +77,7 @@ public class AbstractProjectTest final String targetName, final String message ) { - executeTargetExpectError( projectFile, targetName, new String[] { message } ); + executeTargetExpectError( projectFile, targetName, new String[]{message} ); } /** diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/DependencyMetricsTest.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/DependencyMetricsTest.java index 1423825dc..7051f834a 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/DependencyMetricsTest.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/DependencyMetricsTest.java @@ -171,17 +171,17 @@ public class DependencyMetricsTest * Make sure that antlib package does not have any * unwanted dependencies. */ -/* - public void testAntlibDecoupled() - { - final String packageName = "org.apache.antlib"; - final String[] badEfferents = new String[] + /* + public void testAntlibDecoupled() { - "org.apache.tools.ant" - }; - doTestDecoupled( packageName, badEfferents ); - } -*/ + final String packageName = "org.apache.antlib"; + final String[] badEfferents = new String[] + { + "org.apache.tools.ant" + }; + doTestDecoupled( packageName, badEfferents ); + } + */ /** * Make sure there are no circular dependencies between packages because * circular dependencies are evil!!! diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/ConfigTest4.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/ConfigTest4.java index 4d7cfd299..6a83b1513 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/ConfigTest4.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/ConfigTest4.java @@ -7,8 +7,6 @@ */ package org.apache.myrmidon.components.configurer; - - /** * Simple class to test typed adder. * diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/ConfigTestMultiTypedAdder.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/ConfigTestMultiTypedAdder.java index 0eb4c5d41..3e10e476b 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/ConfigTestMultiTypedAdder.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/ConfigTestMultiTypedAdder.java @@ -7,8 +7,6 @@ */ package org.apache.myrmidon.components.configurer; - - /** * Simple class with more than one typed adder method. * diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/ConfigTestPrimConvert.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/ConfigTestPrimConvert.java index 4a204f7f6..3c2b8d6c9 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/ConfigTestPrimConvert.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/ConfigTestPrimConvert.java @@ -36,7 +36,7 @@ public class ConfigTestPrimConvert { return false; } - if ( !AbstractComponentTest.equals( m_integerProp, test.m_integerProp ) ) + if( !AbstractComponentTest.equals( m_integerProp, test.m_integerProp ) ) { return false; } diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/DefaultConfigurerTest.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/DefaultConfigurerTest.java index b569488b6..ea1483eb4 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/DefaultConfigurerTest.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/DefaultConfigurerTest.java @@ -103,7 +103,7 @@ public class DefaultConfigurerTest // Check result final ConfigTestPrimConvert expected = new ConfigTestPrimConvert(); expected.setIntProp( 90 ); - expected.setIntegerProp( new Integer(-401) ); + expected.setIntegerProp( new Integer( -401 ) ); assertEquals( expected, test ); } @@ -381,7 +381,7 @@ public class DefaultConfigurerTest final ConfigTestInterfaceProp test = new ConfigTestInterfaceProp(); // Configure object - m_configurer.configure( test, config, m_context ); + m_configurer.configure( test, config, m_context ); // Check result final ConfigTestInterfaceProp expected = new ConfigTestInterfaceProp(); @@ -442,7 +442,7 @@ public class DefaultConfigurerTest REZ.getString( "bad-configure-element.error", "test" ), REZ.getString( "multiple-adder-methods-for-element.error", ConfigTestMultiTypedAdder.class.getName(), - "") + "" ) }; assertSameMessage( messages, ce ); } @@ -541,7 +541,7 @@ public class DefaultConfigurerTest config.setAttribute( "my-role1", "some value" ); // Set up the converter and role - registerRole( new RoleInfo("my-role1", MyRole1.class ) ); + registerRole( new RoleInfo( "my-role1", MyRole1.class ) ); registerConverter( ObjectToMyRole1Converter.class, String.class, MyRole1.class ); final ConfigTestTypedProp test = new ConfigTestTypedProp(); diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/deployer/DefaultDeployerTest.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/deployer/DefaultDeployerTest.java index 3416c45f6..26f2b5505 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/deployer/DefaultDeployerTest.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/deployer/DefaultDeployerTest.java @@ -69,13 +69,13 @@ public class DefaultDeployerTest // Determine the shorthand for the DataType role // Create the type definition - final TypeDefinition typeDef = new TypeDefinition( typeName, DATA_TYPE_ROLE, classname ); + final TypeDefinition typeDef = new TypeDefinition( typeName, DATA_TYPE_ROLE, classname ); final ClassLoader classLoader = getClass().getClassLoader(); final TypeDeployer typeDeployer = m_deployer.createDeployer( classLoader ); // Make sure the test types have not been deployed - assertTypesNotRegistered( ); + assertTypesNotRegistered(); // Deploy the type typeDeployer.deployType( typeDef ); @@ -103,7 +103,7 @@ public class DefaultDeployerTest final TypeDeployer typeDeployer = m_deployer.createDeployer( classLoader ); // Make sure the test types have not been deployed - assertTypesNotRegistered( ); + assertTypesNotRegistered(); // Deploy the type typeDeployer.deployType( typeDef ); @@ -176,7 +176,7 @@ public class DefaultDeployerTest * Ensures the types from the test typelib descriptor have been correctly * deployed. */ - private void assertTypesRegistered( ) throws Exception + private void assertTypesRegistered() throws Exception { // Check the data-type TypeFactory typeFactory = getTypeManager().getFactory( DataType.class ); diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/embeddor/DefaultEmbeddorTest.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/embeddor/DefaultEmbeddorTest.java index 2345c658d..91289c5d1 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/embeddor/DefaultEmbeddorTest.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/embeddor/DefaultEmbeddorTest.java @@ -50,11 +50,11 @@ public class DefaultEmbeddorTest final Target implicitTarget = project.getImplicitTarget(); assertEquals( 1, implicitTarget.getTasks().length ); - assertEquals( "property", implicitTarget.getTasks()[0].getName() ); + assertEquals( "property", implicitTarget.getTasks()[ 0 ].getName() ); final Target target = project.getTarget( "main-target" ); assertEquals( 1, target.getTasks().length ); - assertEquals( "log", target.getTasks()[0].getName() ); + assertEquals( "log", target.getTasks()[ 0 ].getName() ); } /** diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/role/DefaultRoleManagerTest.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/role/DefaultRoleManagerTest.java index 509a52118..e2332b1ae 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/role/DefaultRoleManagerTest.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/role/DefaultRoleManagerTest.java @@ -7,13 +7,13 @@ */ package org.apache.myrmidon.components.role; +import org.apache.avalon.excalibur.i18n.ResourceManager; +import org.apache.avalon.excalibur.i18n.Resources; import org.apache.myrmidon.AbstractMyrmidonTest; import org.apache.myrmidon.api.Task; -import org.apache.myrmidon.interfaces.role.RoleManager; -import org.apache.myrmidon.interfaces.role.RoleInfo; import org.apache.myrmidon.interfaces.role.RoleException; -import org.apache.avalon.excalibur.i18n.Resources; -import org.apache.avalon.excalibur.i18n.ResourceManager; +import org.apache.myrmidon.interfaces.role.RoleInfo; +import org.apache.myrmidon.interfaces.role.RoleManager; /** * Test cases for the DefaultRoleManager. @@ -51,7 +51,7 @@ public class DefaultRoleManagerTest // Lookup the role RoleInfo role = m_roleManager.getRole( roleName ); - assertTrue( origRole.equals(role) ); + assertTrue( origRole.equals( role ) ); // Lookup the role by shorthand role = m_roleManager.getRoleByShorthandName( shorthand ); diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/service/InstantiatingServiceManagerTest.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/service/InstantiatingServiceManagerTest.java index 75dc65aa4..8ce1fb3cb 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/service/InstantiatingServiceManagerTest.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/service/InstantiatingServiceManagerTest.java @@ -113,7 +113,7 @@ public class InstantiatingServiceManagerTest { // Make sure that hasService() works correctly final String serviceRole = "some-unknown-service"; - assertTrue( ! m_serviceManager.hasService( serviceRole ) ); + assertTrue( !m_serviceManager.hasService( serviceRole ) ); // Make sure that lookup() fails try diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/interfaces/type/TypeFactoryTest.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/interfaces/type/TypeFactoryTest.java index facea850f..a73626251 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/interfaces/type/TypeFactoryTest.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/interfaces/type/TypeFactoryTest.java @@ -9,7 +9,6 @@ package org.apache.myrmidon.interfaces.type; import java.io.File; import java.net.URL; -import junit.framework.TestCase; import org.apache.myrmidon.AbstractMyrmidonTest; /**