donaldp 02/02/14 02:53:54
Modified: proposal/myrmidon/src/java/org/apache/antlib/core
Property.java
proposal/myrmidon/src/java/org/apache/antlib/file
CopyTask.java FilteredCopyTask.java
proposal/myrmidon/src/java/org/apache/antlib/runtime
Facility.java
proposal/myrmidon/src/java/org/apache/antlib/sound
SoundTask.java
proposal/myrmidon/src/java/org/apache/aut/converter
Converter.java
proposal/myrmidon/src/java/org/apache/aut/manifest
ManifestUtil.java
proposal/myrmidon/src/java/org/apache/aut/vfs/provider
AbstractFileObject.java
proposal/myrmidon/src/java/org/apache/aut/vfs/provider/ftp
FtpFileObject.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/builder
DefaultProjectBuilder.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer
DefaultConfigurer.java DefaultObjectConfigurer.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer
DefaultDeployer.java RoleDescriptorBuilder.java
ServiceDescriptorBuilder.java
TypeDescriptorBuilder.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/embeddor
DefaultEmbeddor.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/service
DefaultServiceManager.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace
LogTargetToListenerAdapter.java
ProjectListenerSupport.java
proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/type
DefaultTypeFactory.java
proposal/myrmidon/src/java/org/apache/myrmidon/listeners
ClassicProjectListener.java
DefaultProjectListener.java
NoPrefixProjectListener.java ProjectEvent.java
TargetEvent.java
Log:
Ran style-formatter over codebase
Revision Changes Path
1.10 +1 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/Property.java
Index: Property.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/Property.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Property.java 14 Feb 2002 10:21:12 -0000 1.9
+++ Property.java 14 Feb 2002 10:53:53 -0000 1.10
@@ -16,7 +16,6 @@
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.framework.AbstractContainerTask;
import org.apache.myrmidon.framework.DataType;
-import org.apache.myrmidon.interfaces.type.TypeFactory;
/**
* This is the property "task" to declare a binding of a datatype to a name.
@@ -24,7 +23,7 @@
* TODO: Determine final format of property task.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.9 $ $Date: 2002/02/14 10:21:12 $
+ * @version $Revision: 1.10 $ $Date: 2002/02/14 10:53:53 $
* @ant:task name="property"
*/
public class Property
1.3 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/file/CopyTask.java
Index: CopyTask.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/file/CopyTask.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CopyTask.java 9 Feb 2002 05:32:20 -0000 1.2
+++ CopyTask.java 14 Feb 2002 10:53:53 -0000 1.3
@@ -36,7 +36,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Stefan Bodewig</a>
* @author <A href="[EMAIL PROTECTED]">Michael McCallum</A>
* @author <a href="mailto:[EMAIL PROTECTED]">Magesh Umasankar</a>
- * @version $Revision: 1.2 $ $Date: 2002/02/09 05:32:20 $
+ * @version $Revision: 1.3 $ $Date: 2002/02/14 10:53:53 $
*/
public class CopyTask
extends AbstractTask
@@ -423,7 +423,7 @@
* to a destination.
*/
protected void doOperation( final String sourceFilename,
- final String destinationFilename )
+ final String destinationFilename )
throws IOException
{
final File source = new File( sourceFilename );
1.3 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/file/FilteredCopyTask.java
Index: FilteredCopyTask.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/file/FilteredCopyTask.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FilteredCopyTask.java 14 Feb 2002 10:50:59 -0000 1.2
+++ FilteredCopyTask.java 14 Feb 2002 10:53:53 -0000 1.3
@@ -23,8 +23,8 @@
import java.util.ArrayList;
import org.apache.avalon.excalibur.io.IOUtil;
import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.types.FilterSet;
import org.apache.myrmidon.framework.FilterSetCollection;
+import org.apache.tools.ant.types.FilterSet;
/**
* A task used to copy files and simultaneously apply a
@@ -32,7 +32,7 @@
*
* @ant:task name="filtered-copy"
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.2 $ $Date: 2002/02/14 10:50:59 $
+ * @version $Revision: 1.3 $ $Date: 2002/02/14 10:53:53 $
*/
public class FilteredCopyTask
extends CopyTask
1.9 +0 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/runtime/Facility.java
Index: Facility.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/runtime/Facility.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Facility.java 14 Feb 2002 10:21:12 -0000 1.8
+++ Facility.java 14 Feb 2002 10:53:53 -0000 1.9
@@ -16,7 +16,6 @@
import org.apache.myrmidon.aspects.AspectHandler;
import org.apache.myrmidon.framework.AbstractContainerTask;
import org.apache.myrmidon.interfaces.aspect.AspectManager;
-import org.apache.myrmidon.interfaces.type.TypeFactory;
/**
* Task that definesMethod to register a single converter.
1.2 +3 -3
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/sound/SoundTask.java
Index: SoundTask.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/sound/SoundTask.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SoundTask.java 14 Feb 2002 09:37:34 -0000 1.1
+++ SoundTask.java 14 Feb 2002 10:53:53 -0000 1.2
@@ -10,11 +10,11 @@
import java.io.File;
import java.util.ArrayList;
import java.util.Random;
+import org.apache.avalon.excalibur.i18n.ResourceManager;
+import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.interfaces.workspace.Workspace;
-import org.apache.avalon.excalibur.i18n.Resources;
-import org.apache.avalon.excalibur.i18n.ResourceManager;
/**
* This is an example of an AntTask that makes of use of the AntSoundPlayer.
@@ -29,7 +29,7 @@
* @ant:task name="sound-listener"
* @author Nick Pellow
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.1 $, $Date: 2002/02/14 09:37:34 $
+ * @version $Revision: 1.2 $, $Date: 2002/02/14 10:53:53 $
*/
public class SoundTask
extends AbstractTask
1.3 +1 -4
jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/converter/Converter.java
Index: Converter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/converter/Converter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Converter.java 14 Feb 2002 10:07:50 -0000 1.2
+++ Converter.java 14 Feb 2002 10:53:53 -0000 1.3
@@ -7,14 +7,11 @@
*/
package org.apache.aut.converter;
-import org.apache.avalon.framework.context.Context;
-import java.util.Map;
-
/**
* Instances of this interface are used to convert between different types.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.2 $ $Date: 2002/02/14 10:07:50 $
+ * @version $Revision: 1.3 $ $Date: 2002/02/14 10:53:53 $
* @ant:role shorthand="converter"
*/
public interface Converter
1.2 +2 -3
jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/manifest/ManifestUtil.java
Index: ManifestUtil.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/manifest/ManifestUtil.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ManifestUtil.java 10 Feb 2002 00:27:10 -0000 1.1
+++ ManifestUtil.java 14 Feb 2002 10:53:53 -0000 1.2
@@ -7,15 +7,14 @@
*/
package org.apache.aut.manifest;
+import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.PrintWriter;
import java.io.Reader;
import java.io.UnsupportedEncodingException;
-import java.io.BufferedReader;
import java.util.jar.Attributes;
-import org.apache.myrmidon.api.TaskException;
import org.apache.tools.ant.taskdefs.manifest.Manifest;
import org.apache.tools.ant.taskdefs.manifest.Section;
@@ -25,7 +24,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Conor MacNeill</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Stefan Bodewig</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.1 $ $Date: 2002/02/10 00:27:10 $
+ * @version $Revision: 1.2 $ $Date: 2002/02/14 10:53:53 $
*/
public final class ManifestUtil
{
1.5 +0 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/AbstractFileObject.java
Index: AbstractFileObject.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/AbstractFileObject.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractFileObject.java 9 Feb 2002 22:49:55 -0000 1.4
+++ AbstractFileObject.java 14 Feb 2002 10:53:53 -0000 1.5
@@ -39,7 +39,6 @@
private AbstractFileSystem m_fs;
private DefaultFileContent m_content;
-
// Cached info
private boolean m_attached;
private AbstractFileObject m_parent;
1.4 +0 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/ftp/FtpFileObject.java
Index: FtpFileObject.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/ftp/FtpFileObject.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FtpFileObject.java 9 Feb 2002 02:51:49 -0000 1.3
+++ FtpFileObject.java 14 Feb 2002 10:53:53 -0000 1.4
@@ -36,7 +36,6 @@
private FTPFile m_fileInfo;
private FTPFile[] m_children;
-
public FtpFileObject( final FileName name, final FtpFileSystem
fileSystem )
{
super( name, fileSystem );
1.31 +3 -3
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java
Index: DefaultProjectBuilder.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- DefaultProjectBuilder.java 13 Feb 2002 02:47:36 -0000 1.30
+++ DefaultProjectBuilder.java 14 Feb 2002 10:53:53 -0000 1.31
@@ -15,8 +15,8 @@
import javax.xml.parsers.SAXParserFactory;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
-import org.apache.avalon.excalibur.util.StringUtil;
import org.apache.avalon.excalibur.io.FileUtil;
+import org.apache.avalon.excalibur.util.StringUtil;
import org.apache.avalon.framework.CascadingException;
import org.apache.avalon.framework.Version;
import org.apache.avalon.framework.configuration.Configuration;
@@ -34,7 +34,7 @@
* Default implementation to construct project from a build file.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.30 $ $Date: 2002/02/13 02:47:36 $
+ * @version $Revision: 1.31 $ $Date: 2002/02/14 10:53:53 $
*/
public class DefaultProjectBuilder
extends AbstractLogEnabled
@@ -129,7 +129,7 @@
//get project-level attributes
final String projectName = configuration.getAttribute( "name",
-
FileUtil.removeExtension(file.getName()) );
+
FileUtil.removeExtension( file.getName() ) );
final String baseDirectoryName = configuration.getAttribute(
"basedir", null );
final String defaultTarget = configuration.getAttribute( "default",
"main" );
final Version version = getVersion( configuration );
1.26 +6 -6
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultConfigurer.java
Index: DefaultConfigurer.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultConfigurer.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- DefaultConfigurer.java 8 Feb 2002 22:19:59 -0000 1.25
+++ DefaultConfigurer.java 14 Feb 2002 10:53:53 -0000 1.26
@@ -23,19 +23,19 @@
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.logger.LogEnabled;
+import org.apache.myrmidon.framework.DataType;
import org.apache.myrmidon.interfaces.configurer.Configurer;
import org.apache.myrmidon.interfaces.converter.MasterConverter;
+import org.apache.myrmidon.interfaces.role.RoleManager;
import org.apache.myrmidon.interfaces.type.TypeException;
import org.apache.myrmidon.interfaces.type.TypeFactory;
import org.apache.myrmidon.interfaces.type.TypeManager;
-import org.apache.myrmidon.interfaces.role.RoleManager;
-import org.apache.myrmidon.framework.DataType;
/**
* Class used to configure tasks.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.25 $ $Date: 2002/02/08 22:19:59 $
+ * @version $Revision: 1.26 $ $Date: 2002/02/14 10:53:53 $
*/
public class DefaultConfigurer
extends AbstractLogEnabled
@@ -472,10 +472,10 @@
// Try a typed property
final PropertyConfigurer propertyConfigurer =
configurer.getTypedProperty();
- if( ! ignoreRoleName )
+ if( !ignoreRoleName )
{
final String roleShorthand = m_roleManager.getNameForRole(
propertyConfigurer.getType().getName() );
- if( ! name.equalsIgnoreCase(roleShorthand) )
+ if( !name.equalsIgnoreCase( roleShorthand ) )
{
// Rethrow the original exception
throw exc;
@@ -510,7 +510,7 @@
}
// Check the types
- if( ! type.isInstance( obj ) )
+ if( !type.isInstance( obj ) )
{
final String message =
REZ.getString( "mismatched-typed-object.error", name,
type.getName() );
1.11 +3 -3
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultObjectConfigurer.java
Index: DefaultObjectConfigurer.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultObjectConfigurer.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DefaultObjectConfigurer.java 8 Feb 2002 22:19:59 -0000 1.10
+++ DefaultObjectConfigurer.java 14 Feb 2002 10:53:53 -0000 1.11
@@ -26,7 +26,7 @@
* of a class.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Adam Murdoch</a>
- * @version $Revision: 1.10 $ $Date: 2002/02/08 22:19:59 $
+ * @version $Revision: 1.11 $ $Date: 2002/02/14 10:53:53 $
*/
class DefaultObjectConfigurer
implements ObjectConfigurer
@@ -124,7 +124,7 @@
type = addMethod.getParameterTypes()[ 0 ];
}
- final boolean isTypedProp = (propName.length() == 0);
+ final boolean isTypedProp = ( propName.length() == 0 );
if( isTypedProp && !type.isInterface() )
{
final String message =
@@ -190,7 +190,7 @@
// Extract property name
final String propName = extractName( 3, methodName );
- final Class type = method.getParameterTypes()[0];
+ final Class type = method.getParameterTypes()[ 0 ];
// Add to the adders map
if( adders.containsKey( propName ) )
1.25 +2 -2
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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- DefaultDeployer.java 14 Feb 2002 02:07:02 -0000 1.24
+++ DefaultDeployer.java 14 Feb 2002 10:53:54 -0000 1.25
@@ -35,7 +35,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Adam Murdoch</a>
- * @version $Revision: 1.24 $ $Date: 2002/02/14 02:07:02 $
+ * @version $Revision: 1.25 $ $Date: 2002/02/14 10:53:54 $
*/
public class DefaultDeployer
extends AbstractLogEnabled
@@ -76,7 +76,7 @@
public Deployer createChildDeployer( ComponentManager componentManager )
throws ComponentException
{
- final DefaultDeployer child = new DefaultDeployer( );
+ final DefaultDeployer child = new DefaultDeployer();
setupLogger( child );
child.compose( componentManager );
return child;
1.2 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/RoleDescriptorBuilder.java
Index: RoleDescriptorBuilder.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/RoleDescriptorBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RoleDescriptorBuilder.java 12 Feb 2002 10:40:08 -0000 1.1
+++ RoleDescriptorBuilder.java 14 Feb 2002 10:53:54 -0000 1.2
@@ -17,7 +17,7 @@
* Builds typelib role descriptors.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Adam Murdoch</a>
- * @version $Revision: 1.1 $ $Date: 2002/02/12 10:40:08 $
+ * @version $Revision: 1.2 $ $Date: 2002/02/14 10:53:54 $
*/
class RoleDescriptorBuilder
implements DescriptorBuilder
@@ -39,7 +39,7 @@
// Check version
final String versionString = config.getAttribute( "version" );
final Version version = Version.getVersion( versionString );
- if( ! ROLE_DESCRIPTOR_VERSION.complies( version ) )
+ if( !ROLE_DESCRIPTOR_VERSION.complies( version ) )
{
final String message = REZ.getString(
"role-descriptor-version.error", version, ROLE_DESCRIPTOR_VERSION );
throw new DeploymentException( message );
1.3 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/ServiceDescriptorBuilder.java
Index: ServiceDescriptorBuilder.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/ServiceDescriptorBuilder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ServiceDescriptorBuilder.java 14 Feb 2002 02:07:02 -0000 1.2
+++ ServiceDescriptorBuilder.java 14 Feb 2002 10:53:54 -0000 1.3
@@ -17,7 +17,7 @@
* Builds typelib service descriptors.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Adam Murdoch</a>
- * @version $Revision: 1.2 $ $Date: 2002/02/14 02:07:02 $
+ * @version $Revision: 1.3 $ $Date: 2002/02/14 10:53:54 $
*/
class ServiceDescriptorBuilder
implements DescriptorBuilder
@@ -39,7 +39,7 @@
// Check version
final String versionString = config.getAttribute( "version" );
final Version version = Version.getVersion( versionString );
- if( ! SERVICE_DESCRIPTOR_VERSION.complies( version ) )
+ if( !SERVICE_DESCRIPTOR_VERSION.complies( version ) )
{
final String message = REZ.getString(
"service-descriptor-version.error", version, SERVICE_DESCRIPTOR_VERSION );
throw new DeploymentException( message );
1.2 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/TypeDescriptorBuilder.java
Index: TypeDescriptorBuilder.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/TypeDescriptorBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TypeDescriptorBuilder.java 12 Feb 2002 10:40:08 -0000 1.1
+++ TypeDescriptorBuilder.java 14 Feb 2002 10:53:54 -0000 1.2
@@ -20,7 +20,7 @@
* Builds typelib type descriptors.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Adam Murdoch</a>
- * @version $Revision: 1.1 $ $Date: 2002/02/12 10:40:08 $
+ * @version $Revision: 1.2 $ $Date: 2002/02/14 10:53:54 $
*/
class TypeDescriptorBuilder
implements DescriptorBuilder
@@ -42,7 +42,7 @@
// Check version
final String versionString = config.getAttribute( "version" );
final Version version = Version.getVersion( versionString );
- if( ! TYPE_DESCRIPTOR_VERSION.complies( version ) )
+ if( !TYPE_DESCRIPTOR_VERSION.complies( version ) )
{
final String message = REZ.getString(
"type-descriptor-version.error", version, TYPE_DESCRIPTOR_VERSION );
throw new DeploymentException( message );
1.25 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/embeddor/DefaultEmbeddor.java
Index: DefaultEmbeddor.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/embeddor/DefaultEmbeddor.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- DefaultEmbeddor.java 14 Feb 2002 02:07:02 -0000 1.24
+++ DefaultEmbeddor.java 14 Feb 2002 10:53:54 -0000 1.25
@@ -49,7 +49,7 @@
* Instantiate this to embed inside other applications.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.24 $ $Date: 2002/02/14 02:07:02 $
+ * @version $Revision: 1.25 $ $Date: 2002/02/14 10:53:54 $
*/
public class DefaultEmbeddor
extends AbstractLogEnabled
@@ -369,7 +369,7 @@
final String message = REZ.getString( "bad-type.error",
component, clazz.getName() );
throw new Exception( message );
}
- if( !( object instanceof Component) )
+ if( !( object instanceof Component ) )
{
final String message = REZ.getString( "bad-type.error",
component, Component.class.getName() );
throw new Exception( message );
1.2 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/service/DefaultServiceManager.java
Index: DefaultServiceManager.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/service/DefaultServiceManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultServiceManager.java 14 Feb 2002 02:03:25 -0000 1.1
+++ DefaultServiceManager.java 14 Feb 2002 10:53:54 -0000 1.2
@@ -32,7 +32,7 @@
* <p>This implementation uses a TypeManager to locate the service factories.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Adam Murdoch</a>
- * @version $Revision: 1.1 $ $Date: 2002/02/14 02:03:25 $
+ * @version $Revision: 1.2 $ $Date: 2002/02/14 10:53:54 $
*/
public class DefaultServiceManager
implements ServiceManager, Composable, Disposable
@@ -128,7 +128,7 @@
// Create the service
final Object service = factory.createService();
- if( ! serviceType.isInstance( service ) )
+ if( !serviceType.isInstance( service ) )
{
final String message = REZ.getString(
"mismatched-service-type.error", serviceType.getName(),
service.getClass().getName() );
throw new ServiceException( message );
1.7 +1 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/LogTargetToListenerAdapter.java
Index: LogTargetToListenerAdapter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/LogTargetToListenerAdapter.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- LogTargetToListenerAdapter.java 13 Feb 2002 03:02:54 -0000 1.6
+++ LogTargetToListenerAdapter.java 14 Feb 2002 10:53:54 -0000 1.7
@@ -9,13 +9,12 @@
import org.apache.log.LogEvent;
import org.apache.log.LogTarget;
-import org.apache.myrmidon.listeners.ProjectListener;
/**
* Adapter between Avalon LogKit and Project listener interfaces.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.6 $ $Date: 2002/02/13 03:02:54 $
+ * @version $Revision: 1.7 $ $Date: 2002/02/14 10:53:54 $
*/
public class LogTargetToListenerAdapter
implements LogTarget
1.9 +4 -6
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ProjectListenerSupport.java 13 Feb 2002 03:02:54 -0000 1.8
+++ ProjectListenerSupport.java 14 Feb 2002 10:53:54 -0000 1.9
@@ -7,17 +7,14 @@
*/
package org.apache.myrmidon.components.workspace;
-import org.apache.myrmidon.listeners.ProjectListener;
-import org.apache.myrmidon.listeners.ProjectEvent;
-import org.apache.myrmidon.listeners.TargetEvent;
-import org.apache.myrmidon.listeners.TaskEvent;
import org.apache.myrmidon.listeners.LogEvent;
+import org.apache.myrmidon.listeners.ProjectListener;
/**
* Support for the project listener event dispatching.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.8 $ $Date: 2002/02/13 03:02:54 $
+ * @version $Revision: 1.9 $ $Date: 2002/02/14 10:53:54 $
*/
public class ProjectListenerSupport
implements LogEvent
@@ -112,7 +109,8 @@
public void targetStarted( final String projectName, final String
targetName )
{
m_projectName = projectName;
- m_targetName = targetName;;
+ m_targetName = targetName;
+ ;
m_taskName = null;
for( int i = 0; i < m_listeners.length; i++ )
1.10 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/type/DefaultTypeFactory.java
Index: DefaultTypeFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/type/DefaultTypeFactory.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DefaultTypeFactory.java 14 Feb 2002 02:00:07 -0000 1.9
+++ DefaultTypeFactory.java 14 Feb 2002 10:53:54 -0000 1.10
@@ -15,7 +15,7 @@
* Create a type instance based on name.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version CVS $Revision: 1.9 $ $Date: 2002/02/14 02:00:07 $
+ * @version CVS $Revision: 1.10 $ $Date: 2002/02/14 10:53:54 $
*/
public class DefaultTypeFactory
implements TypeFactory
@@ -100,7 +100,7 @@
private String getClassName( final String name )
{
- return (String)m_classNames.get( name );
+ return (String)m_classNames.get( name );
}
protected ClassLoader getClassLoader()
1.8 +3 -3
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/listeners/ClassicProjectListener.java
Index: ClassicProjectListener.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/listeners/ClassicProjectListener.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ClassicProjectListener.java 13 Feb 2002 03:02:55 -0000 1.7
+++ ClassicProjectListener.java 14 Feb 2002 10:53:54 -0000 1.8
@@ -7,14 +7,14 @@
*/
package org.apache.myrmidon.listeners;
-import org.apache.avalon.framework.ExceptionUtil;
import java.io.PrintWriter;
+import org.apache.avalon.framework.ExceptionUtil;
/**
* Classic listener that emulates the default ant1.x listener.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.7 $ $Date: 2002/02/13 03:02:55 $
+ * @version $Revision: 1.8 $ $Date: 2002/02/14 10:53:54 $
*/
public class ClassicProjectListener
extends AbstractProjectListener
@@ -45,7 +45,7 @@
/**
* Notify listener of log message event.
*/
- public void log( final LogEvent event )
+ public void log( final LogEvent event )
{
writeMessage( event );
writeThrowable( event );
1.11 +1 -3
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/listeners/DefaultProjectListener.java
Index: DefaultProjectListener.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/listeners/DefaultProjectListener.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DefaultProjectListener.java 13 Feb 2002 03:02:55 -0000 1.10
+++ DefaultProjectListener.java 14 Feb 2002 10:53:54 -0000 1.11
@@ -7,13 +7,11 @@
*/
package org.apache.myrmidon.listeners;
-import org.apache.avalon.framework.ExceptionUtil;
-
/**
* Default listener that emulates the Ant 1.x no banner listener.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.10 $ $Date: 2002/02/13 03:02:55 $
+ * @version $Revision: 1.11 $ $Date: 2002/02/14 10:53:54 $
*/
public class DefaultProjectListener
extends ClassicProjectListener
1.2 +1 -4
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/listeners/NoPrefixProjectListener.java
Index: NoPrefixProjectListener.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/listeners/NoPrefixProjectListener.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NoPrefixProjectListener.java 13 Feb 2002 03:02:55 -0000 1.1
+++ NoPrefixProjectListener.java 14 Feb 2002 10:53:54 -0000 1.2
@@ -7,14 +7,11 @@
*/
package org.apache.myrmidon.listeners;
-import java.io.PrintStream;
-import java.io.PrintWriter;
-
/**
* A project listener that emulated the Ant 1.x -emacs mode.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Adam Murdoch</a>
- * @version $Revision: 1.1 $ $Date: 2002/02/13 03:02:55 $
+ * @version $Revision: 1.2 $ $Date: 2002/02/14 10:53:54 $
*/
public class NoPrefixProjectListener
extends DefaultProjectListener
1.3 +1 -3
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/listeners/ProjectEvent.java
Index: ProjectEvent.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/listeners/ProjectEvent.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ProjectEvent.java 14 Feb 2002 10:10:06 -0000 1.2
+++ ProjectEvent.java 14 Feb 2002 10:53:54 -0000 1.3
@@ -7,13 +7,11 @@
*/
package org.apache.myrmidon.listeners;
-import org.apache.myrmidon.interfaces.model.Project;
-
/**
* A project level event.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Adam Murdoch</a>
- * @version $Revision: 1.2 $ $Date: 2002/02/14 10:10:06 $
+ * @version $Revision: 1.3 $ $Date: 2002/02/14 10:53:54 $
*/
public interface ProjectEvent
{
1.3 +1 -3
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/listeners/TargetEvent.java
Index: TargetEvent.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/listeners/TargetEvent.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TargetEvent.java 14 Feb 2002 10:10:06 -0000 1.2
+++ TargetEvent.java 14 Feb 2002 10:53:54 -0000 1.3
@@ -7,13 +7,11 @@
*/
package org.apache.myrmidon.listeners;
-import org.apache.myrmidon.interfaces.model.Target;
-
/**
* A target level event.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Adam Murdoch</a>
- * @version $Revision: 1.2 $ $Date: 2002/02/14 10:10:06 $
+ * @version $Revision: 1.3 $ $Date: 2002/02/14 10:53:54 $
*/
public interface TargetEvent
extends ProjectEvent
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
