diff --git a/proposal/myrmidon/src/java/org/apache/antlib/build/Patch.java b/proposal/myrmidon/src/java/org/apache/antlib/build/Patch.java index 1687034ae..7bfacfcdf 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/build/Patch.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/build/Patch.java @@ -9,11 +9,11 @@ package org.apache.antlib.build; import java.io.File; import java.io.IOException; +import org.apache.aut.nativelib.ExecManager; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.taskdefs.exec.Execute2; import org.apache.tools.ant.types.Commandline; -import org.apache.aut.nativelib.ExecManager; /** * Task as a layer on top of patch. Patch applies a diff file to an original. diff --git a/proposal/myrmidon/src/java/org/apache/antlib/cvslib/Cvs.java b/proposal/myrmidon/src/java/org/apache/antlib/cvslib/Cvs.java index 167d8c495..167d5173a 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/cvslib/Cvs.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/cvslib/Cvs.java @@ -10,12 +10,12 @@ package org.apache.antlib.cvslib; import java.io.File; import java.io.IOException; import java.util.Properties; +import org.apache.aut.nativelib.ExecManager; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.taskdefs.exec.Execute2; import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.util.FileUtils; -import org.apache.aut.nativelib.ExecManager; /** * Task to interact with a CVS repository. @@ -151,8 +151,9 @@ public class Cvs final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final Execute2 exe = new Execute2( execManager ); setupLogger( exe ); - if( m_dest == null ) { - m_dest = getBaseDirectory(); + if( m_dest == null ) + { + m_dest = getBaseDirectory(); } exe.setWorkingDirectory( m_dest ); diff --git a/proposal/myrmidon/src/java/org/apache/antlib/nativelib/Exec.java b/proposal/myrmidon/src/java/org/apache/antlib/nativelib/Exec.java index 432e1d5f4..d14681e44 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/nativelib/Exec.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/nativelib/Exec.java @@ -10,8 +10,8 @@ package org.apache.antlib.nativelib; import java.io.File; import java.io.IOException; import java.util.Properties; -import org.apache.aut.nativelib.Os; import org.apache.aut.nativelib.ExecManager; +import org.apache.aut.nativelib.Os; import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; import org.apache.myrmidon.api.AbstractTask; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/security/GenerateKey.java b/proposal/myrmidon/src/java/org/apache/antlib/security/GenerateKey.java index b9b9a550b..f27020e7d 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/security/GenerateKey.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/security/GenerateKey.java @@ -8,11 +8,11 @@ package org.apache.antlib.security; import java.io.IOException; +import org.apache.aut.nativelib.ExecManager; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.taskdefs.exec.Execute2; import org.apache.tools.ant.types.Commandline; -import org.apache.aut.nativelib.ExecManager; /** * Generates a key. diff --git a/proposal/myrmidon/src/java/org/apache/antlib/security/SignJar.java b/proposal/myrmidon/src/java/org/apache/antlib/security/SignJar.java index b6459fa57..89d4b5762 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/security/SignJar.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/security/SignJar.java @@ -13,6 +13,7 @@ import java.util.ArrayList; import java.util.Enumeration; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; +import org.apache.aut.nativelib.ExecManager; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.taskdefs.exec.Execute2; @@ -20,7 +21,6 @@ import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.ScannerUtil; -import org.apache.aut.nativelib.ExecManager; /** * Sign a archive. diff --git a/proposal/myrmidon/src/java/org/apache/antlib/xml/TraXLiaison.java b/proposal/myrmidon/src/java/org/apache/antlib/xml/TraXLiaison.java index 8f9fb35e5..3db86c201 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/xml/TraXLiaison.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/xml/TraXLiaison.java @@ -182,7 +182,8 @@ public class TraXLiaison if( e.getLocator().getSystemId() != null ) { String url = e.getLocator().getSystemId(); - if( url.startsWith( "file:///" ) ) { + if( url.startsWith( "file:///" ) ) + { url = url.substring( 8 ); } msg.append( url ); diff --git a/proposal/myrmidon/src/java/org/apache/antlib/xml/XMLValidateTask.java b/proposal/myrmidon/src/java/org/apache/antlib/xml/XMLValidateTask.java index 11af5e7ce..0815e986b 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/xml/XMLValidateTask.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/xml/XMLValidateTask.java @@ -8,32 +8,26 @@ package org.apache.antlib.xml; import java.io.File; - - import java.io.FileReader; import java.io.IOException; - - import java.net.URL; import java.net.URLClassLoader; import java.util.ArrayList; import java.util.Enumeration; import java.util.Hashtable; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.Task; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.PathUtil; import org.apache.tools.ant.types.ScannerUtil; import org.xml.sax.EntityResolver; - import org.xml.sax.InputSource; import org.xml.sax.Parser; import org.xml.sax.SAXException; import org.xml.sax.SAXNotRecognizedException; import org.xml.sax.SAXNotSupportedException; - import org.xml.sax.XMLReader; import org.xml.sax.helpers.ParserAdapter; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/xml/XSLTParam.java b/proposal/myrmidon/src/java/org/apache/antlib/xml/XSLTParam.java index 7f0b966a4..0adf87a58 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/xml/XSLTParam.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/xml/XSLTParam.java @@ -7,8 +7,6 @@ */ package org.apache.antlib.xml; - - public final class XSLTParam { private String m_name; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/xml/XSLTProcess.java b/proposal/myrmidon/src/java/org/apache/antlib/xml/XSLTProcess.java index 40aa2af7f..e6578a5f2 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/xml/XSLTProcess.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/xml/XSLTProcess.java @@ -8,8 +8,8 @@ package org.apache.antlib.xml; import java.io.File; -import java.net.URLClassLoader; import java.net.URL; +import java.net.URLClassLoader; import java.util.ArrayList; import java.util.Iterator; import org.apache.myrmidon.api.TaskException; @@ -244,7 +244,8 @@ public class XSLTProcess for( int j = 0; j < dirs.length; ++j ) { list = new File( m_baseDir, dirs[ j ] ).list(); - for( int i = 0; i < list.length; ++i ) { + for( int i = 0; i < list.length; ++i ) + { process( m_baseDir, list[ i ], m_destDir, stylesheet ); } } @@ -471,7 +472,8 @@ public class XSLTProcess catch( Exception ex ) { getLogger().info( "Failed to process " + inFile ); - if( outFile != null ) { + if( outFile != null ) + { outFile.delete(); } throw new TaskException( "Error", ex ); diff --git a/proposal/myrmidon/src/java/org/apache/aut/bzip2/CBZip2InputStream.java b/proposal/myrmidon/src/java/org/apache/aut/bzip2/CBZip2InputStream.java index cb09ea0df..f9582c492 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/bzip2/CBZip2InputStream.java +++ b/proposal/myrmidon/src/java/org/apache/aut/bzip2/CBZip2InputStream.java @@ -175,7 +175,8 @@ public class CBZip2InputStream m_blockSize100k = newSize100k; - if( newSize100k == 0 ) { + if( newSize100k == 0 ) + { return; } @@ -303,7 +304,8 @@ public class CBZip2InputStream { m_rNToGo = RAND_NUMS[ m_rTPos ]; m_rTPos++; - if( m_rTPos == 512 ) { + if( m_rTPos == 512 ) + { m_rTPos = 0; } } @@ -342,7 +344,8 @@ public class CBZip2InputStream { m_rNToGo = RAND_NUMS[ m_rTPos ]; m_rTPos++; - if( m_rTPos == 512 ) { + if( m_rTPos == 512 ) + { m_rTPos = 0; } } @@ -467,11 +470,14 @@ public class CBZip2InputStream int N = 1; do { - if( nextSym == RUNA ) { + if( nextSym == RUNA ) + { s = s + ( 0 + 1 ) * N; - } else if( nextSym == RUNB ) { + } + else if( nextSym == RUNB ) + { s = s + ( 1 + 1 ) * N; - } + } N = N * 2; if( groupPos == 0 ) diff --git a/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/LogOutputStream.java b/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/LogOutputStream.java index 82d788118..a511df7eb 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/LogOutputStream.java +++ b/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/LogOutputStream.java @@ -12,7 +12,6 @@ import java.io.IOException; import java.io.OutputStream; import org.apache.aut.nativelib.ExecOutputHandler; - /** * Logs each line written to this stream to the specified * ExecOutputHandler. Tries to be smart about diff --git a/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/ProcessMonitor.java b/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/ProcessMonitor.java index 0213d9f54..dc2423d5f 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/ProcessMonitor.java +++ b/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/ProcessMonitor.java @@ -256,8 +256,9 @@ class ProcessMonitor try { final int available = input.available(); - if( 0 >= available ) { - return; + if( 0 >= available ) + { + return; } final byte[] data = new byte[ available ]; diff --git a/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/CommandLauncher.java b/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/CommandLauncher.java index 8c7a5ad7a..5bb44ba99 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/CommandLauncher.java +++ b/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/CommandLauncher.java @@ -8,8 +8,8 @@ package org.apache.aut.nativelib.impl.launchers; import java.io.IOException; -import org.apache.aut.nativelib.ExecMetaData; import org.apache.aut.nativelib.ExecException; +import org.apache.aut.nativelib.ExecMetaData; /** * This is the interface implemented by objects which are capable of diff --git a/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/DefaultCommandLauncher.java b/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/DefaultCommandLauncher.java index f8ecca178..0669e3cee 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/DefaultCommandLauncher.java +++ b/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/DefaultCommandLauncher.java @@ -11,12 +11,10 @@ import java.io.File; import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; - -import org.apache.avalon.excalibur.i18n.ResourceManager; -import org.apache.avalon.excalibur.i18n.Resources; - import org.apache.aut.nativelib.ExecException; import org.apache.aut.nativelib.ExecMetaData; +import org.apache.avalon.excalibur.i18n.ResourceManager; +import org.apache.avalon.excalibur.i18n.Resources; /** * A command launcher for a particular JVM/OS platform. This class is a diff --git a/proposal/myrmidon/src/java/org/apache/aut/vfs/FileType.java b/proposal/myrmidon/src/java/org/apache/aut/vfs/FileType.java index 310885967..79d7327ec 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/vfs/FileType.java +++ b/proposal/myrmidon/src/java/org/apache/aut/vfs/FileType.java @@ -9,8 +9,8 @@ */ package org.apache.aut.vfs; -import org.apache.avalon.excalibur.i18n.Resources; import org.apache.avalon.excalibur.i18n.ResourceManager; +import org.apache.avalon.excalibur.i18n.Resources; /** * An enumeration that represents a file's type. diff --git a/proposal/myrmidon/src/java/org/apache/aut/vfs/impl/DefaultFileSystemManager.java b/proposal/myrmidon/src/java/org/apache/aut/vfs/impl/DefaultFileSystemManager.java index 63cc0e8e5..33d1bd193 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/vfs/impl/DefaultFileSystemManager.java +++ b/proposal/myrmidon/src/java/org/apache/aut/vfs/impl/DefaultFileSystemManager.java @@ -7,20 +7,20 @@ */ package org.apache.aut.vfs.impl; +import java.io.File; import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import java.io.File; import org.apache.aut.vfs.FileObject; import org.apache.aut.vfs.FileSystemException; import org.apache.aut.vfs.FileSystemManager; -import org.apache.aut.vfs.provider.local.LocalFileSystemProvider; +import org.apache.aut.vfs.provider.FileSystem; import org.apache.aut.vfs.provider.FileSystemProvider; -import org.apache.aut.vfs.provider.UriParser; import org.apache.aut.vfs.provider.FileSystemProviderContext; -import org.apache.aut.vfs.provider.FileSystem; -import org.apache.avalon.excalibur.i18n.Resources; +import org.apache.aut.vfs.provider.UriParser; +import org.apache.aut.vfs.provider.local.LocalFileSystemProvider; import org.apache.avalon.excalibur.i18n.ResourceManager; +import org.apache.avalon.excalibur.i18n.Resources; /** * A default file system manager implementation. diff --git a/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/AbstractFileObject.java b/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/AbstractFileObject.java index 2e5543729..62cc77fd7 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/AbstractFileObject.java +++ b/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/AbstractFileObject.java @@ -19,8 +19,8 @@ import org.apache.aut.vfs.FileObject; import org.apache.aut.vfs.FileSystemException; import org.apache.aut.vfs.FileType; import org.apache.aut.vfs.NameScope; -import org.apache.avalon.excalibur.i18n.Resources; import org.apache.avalon.excalibur.i18n.ResourceManager; +import org.apache.avalon.excalibur.i18n.Resources; /** * A partial file object implementation. @@ -348,7 +348,7 @@ public abstract class AbstractFileObject implements FileObject } // Update cached info - updateType(null); + updateType( null ); } /** @@ -462,7 +462,7 @@ public abstract class AbstractFileObject implements FileObject } // Update cached info - updateType(type); + updateType( type ); } /** @@ -604,7 +604,7 @@ public abstract class AbstractFileObject implements FileObject /** * Update cached info when this file's type changes. */ - private void updateType(FileType type) + private void updateType( FileType type ) { // Notify parent that its child list may no longer be valid notifyParent(); diff --git a/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/AbstractFileSystemProvider.java b/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/AbstractFileSystemProvider.java index eb21f2222..50e4de8cb 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/AbstractFileSystemProvider.java +++ b/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/AbstractFileSystemProvider.java @@ -9,8 +9,8 @@ package org.apache.aut.vfs.provider; import org.apache.aut.vfs.FileObject; import org.apache.aut.vfs.FileSystemException; -import org.apache.avalon.excalibur.i18n.Resources; import org.apache.avalon.excalibur.i18n.ResourceManager; +import org.apache.avalon.excalibur.i18n.Resources; /** * A partial file system provider implementation. diff --git a/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/UriParser.java b/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/UriParser.java index 6fc81ebac..7ceadd264 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/UriParser.java +++ b/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/UriParser.java @@ -10,8 +10,8 @@ package org.apache.aut.vfs.provider; import java.util.HashSet; import java.util.Iterator; import org.apache.aut.vfs.FileSystemException; -import org.apache.avalon.excalibur.i18n.Resources; import org.apache.avalon.excalibur.i18n.ResourceManager; +import org.apache.avalon.excalibur.i18n.Resources; /** * A name parser which parses absolute URIs. See RFC 2396 for details. diff --git a/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/ftp/FtpFileNameParser.java b/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/ftp/FtpFileNameParser.java index a397d4f88..eb9b7e7b1 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/ftp/FtpFileNameParser.java +++ b/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/ftp/FtpFileNameParser.java @@ -7,9 +7,9 @@ */ package org.apache.aut.vfs.provider.ftp; -import org.apache.aut.vfs.provider.UriParser; -import org.apache.aut.vfs.provider.ParsedUri; import org.apache.aut.vfs.FileSystemException; +import org.apache.aut.vfs.provider.ParsedUri; +import org.apache.aut.vfs.provider.UriParser; /** * A parser for FTP URI. @@ -32,15 +32,15 @@ public class FtpFileNameParser extends UriParser String userInfo = uri.getUserInfo(); if( userInfo != null ) { - int idx = userInfo.indexOf(':'); + int idx = userInfo.indexOf( ':' ); if( idx == -1 ) { uri.setUserName( userInfo ); } else { - String userName = userInfo.substring(0, idx); - String password = userInfo.substring(idx+1); + String userName = userInfo.substring( 0, idx ); + String password = userInfo.substring( idx + 1 ); uri.setUserName( userName ); uri.setPassword( password ); } diff --git a/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/ftp/FtpFileObject.java b/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/ftp/FtpFileObject.java index b06abfb60..9cfaebc98 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/ftp/FtpFileObject.java +++ b/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/ftp/FtpFileObject.java @@ -14,8 +14,8 @@ import org.apache.aut.vfs.FileName; import org.apache.aut.vfs.FileSystemException; import org.apache.aut.vfs.FileType; import org.apache.aut.vfs.provider.AbstractFileObject; -import org.apache.avalon.excalibur.i18n.Resources; import org.apache.avalon.excalibur.i18n.ResourceManager; +import org.apache.avalon.excalibur.i18n.Resources; /** * An FTP file. diff --git a/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/ftp/FtpFileSystem.java b/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/ftp/FtpFileSystem.java index 6b0f5a8d5..0b6c96220 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/ftp/FtpFileSystem.java +++ b/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/ftp/FtpFileSystem.java @@ -15,8 +15,8 @@ import org.apache.aut.vfs.FileName; import org.apache.aut.vfs.FileObject; import org.apache.aut.vfs.FileSystemException; import org.apache.aut.vfs.provider.AbstractFileSystem; -import org.apache.avalon.excalibur.i18n.Resources; import org.apache.avalon.excalibur.i18n.ResourceManager; +import org.apache.avalon.excalibur.i18n.Resources; /** * An FTP file system. diff --git a/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/local/LocalFile.java b/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/local/LocalFile.java index 4ff461891..5ca6ad562 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/local/LocalFile.java +++ b/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/local/LocalFile.java @@ -17,8 +17,8 @@ import org.apache.aut.vfs.FileObject; import org.apache.aut.vfs.FileSystemException; import org.apache.aut.vfs.FileType; import org.apache.aut.vfs.provider.AbstractFileObject; -import org.apache.avalon.excalibur.i18n.Resources; import org.apache.avalon.excalibur.i18n.ResourceManager; +import org.apache.avalon.excalibur.i18n.Resources; /** * A file object implementation which uses direct file access. diff --git a/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/local/LocalFileNameParser.java b/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/local/LocalFileNameParser.java index 40c0ec696..3eeee412f 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/local/LocalFileNameParser.java +++ b/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/local/LocalFileNameParser.java @@ -11,8 +11,8 @@ import java.io.File; import org.apache.aut.vfs.FileSystemException; import org.apache.aut.vfs.provider.ParsedUri; import org.apache.aut.vfs.provider.UriParser; -import org.apache.avalon.excalibur.i18n.Resources; import org.apache.avalon.excalibur.i18n.ResourceManager; +import org.apache.avalon.excalibur.i18n.Resources; /** * A name parser. diff --git a/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/smb/SmbFileNameParser.java b/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/smb/SmbFileNameParser.java index 0e4f5a175..1c4d87333 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/smb/SmbFileNameParser.java +++ b/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/smb/SmbFileNameParser.java @@ -10,8 +10,8 @@ package org.apache.aut.vfs.provider.smb; import org.apache.aut.vfs.FileSystemException; import org.apache.aut.vfs.provider.ParsedUri; import org.apache.aut.vfs.provider.UriParser; -import org.apache.avalon.excalibur.i18n.Resources; import org.apache.avalon.excalibur.i18n.ResourceManager; +import org.apache.avalon.excalibur.i18n.Resources; /** * A parser for SMB URI. diff --git a/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/zip/ZipFileSystem.java b/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/zip/ZipFileSystem.java index 919003a91..78f11077d 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/zip/ZipFileSystem.java +++ b/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/zip/ZipFileSystem.java @@ -18,8 +18,8 @@ import org.apache.aut.vfs.FileSystemException; import org.apache.aut.vfs.provider.AbstractFileSystem; import org.apache.aut.vfs.provider.DefaultFileName; import org.apache.aut.vfs.provider.FileSystem; -import org.apache.avalon.excalibur.i18n.Resources; import org.apache.avalon.excalibur.i18n.ResourceManager; +import org.apache.avalon.excalibur.i18n.Resources; /** * A read-only file system for Zip/Jar files. diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/ATIProjectBuilder.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/ATIProjectBuilder.java index ecc5e5149..066000670 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/ATIProjectBuilder.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/ATIProjectBuilder.java @@ -73,11 +73,15 @@ public class ATIProjectBuilder 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 ) { diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/converter/DefaultConverterRegistry.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/converter/DefaultConverterRegistry.java index b14bfd12f..9594ba5fc 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/converter/DefaultConverterRegistry.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/converter/DefaultConverterRegistry.java @@ -23,8 +23,9 @@ public class DefaultConverterRegistry 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 ); } 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 96cb6507b..257cef685 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 @@ -149,7 +149,7 @@ public class DefaultDeployer 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; diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/Deployment.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/Deployment.java index b2138de0c..1344f6b8f 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/Deployment.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/Deployment.java @@ -142,7 +142,7 @@ class Deployment 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 @@ class Deployment /** * 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 ); 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 5fb6f1c28..6f0bd974e 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 @@ -138,14 +138,17 @@ public class AspectAwareExecutor 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 @@ public class AspectAwareExecutor Configuration[] elements = null; - if( null == elementList ) { + if( null == elementList ) + { elements = EMPTY_ELEMENTS; - } else + } + else { elements = (Configuration[])elementList.toArray( EMPTY_ELEMENTS ); } diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/role/DefaultRoleManager.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/role/DefaultRoleManager.java index f78ad8221..3d1316e21 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/role/DefaultRoleManager.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/role/DefaultRoleManager.java @@ -99,14 +99,14 @@ public class DefaultRoleManager 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 ); diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/ProjectListenerSupport.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/ProjectListenerSupport.java index 03b3f7ecb..340dc0818 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/ProjectListenerSupport.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/ProjectListenerSupport.java @@ -50,8 +50,9 @@ public class ProjectListenerSupport } } - if( -1 == found ) { - return; + if( -1 == found ) + { + return; } final ProjectListener[] listeners = new ProjectListener[ m_listeners.length - 1 ]; diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Pattern.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Pattern.java index 842bea1b8..8ed864b77 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Pattern.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Pattern.java @@ -108,7 +108,6 @@ public class Pattern return null; } - public String toString() { String result = "Pattern['" + m_name + "',"; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/Project.java b/proposal/myrmidon/src/main/org/apache/tools/ant/Project.java index d2e86f2f9..455e57744 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/Project.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/Project.java @@ -96,7 +96,8 @@ public class Project */ public String getProperty( String name ) { - if( name == null ) { + if( name == null ) + { return null; } String property = (String)properties.get( name ); diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Available.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Available.java index 1dd22b319..2ffea86c0 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Available.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Available.java @@ -11,10 +11,8 @@ import java.io.File; import java.net.URL; import java.net.URLClassLoader; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.AbstractTask; import org.apache.tools.ant.Task; import org.apache.tools.ant.taskdefs.condition.Condition; - import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.PathUtil; @@ -55,13 +53,13 @@ public class Available public void addClasspath( Path classpath ) throws TaskException { - if ( m_classpath == null ) + if( m_classpath == null ) { m_classpath = classpath; } else { - m_classpath.addPath(classpath); + m_classpath.addPath( classpath ); } } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Checksum.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Checksum.java index 09b5e4ce8..1c47537cc 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Checksum.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Checksum.java @@ -11,9 +11,9 @@ import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; -import java.io.InputStreamReader; import java.io.IOException; import java.io.InputStream; +import java.io.InputStreamReader; import java.security.DigestInputStream; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; @@ -23,7 +23,6 @@ import java.util.Enumeration; import java.util.Hashtable; import org.apache.avalon.excalibur.io.IOUtil; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.AbstractTask; import org.apache.tools.ant.taskdefs.condition.Condition; import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.types.FileSet; @@ -285,7 +284,6 @@ public class Checksum final byte[] fileDigest = buildDigest( fis ); IOUtil.shutdownStream( fis ); - String checksum = ""; for( int i = 0; i < fileDigest.length; i++ ) { diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ConditionTask.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ConditionTask.java index b7d9eb1b0..de252f57a 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ConditionTask.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ConditionTask.java @@ -8,7 +8,6 @@ package org.apache.tools.ant.taskdefs; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.AbstractTask; import org.apache.tools.ant.taskdefs.condition.Condition; import org.apache.tools.ant.taskdefs.condition.ConditionBase; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/DependSet.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/DependSet.java index 4a0caa3a1..c91806149 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/DependSet.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/DependSet.java @@ -11,8 +11,8 @@ import java.io.File; import java.util.ArrayList; import java.util.Date; import java.util.Iterator; -import org.apache.myrmidon.api.TaskException; import org.apache.aut.nativelib.Os; +import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.types.FileList; import org.apache.tools.ant.types.FileSet; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java index 434d96162..95f5ec73d 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java @@ -14,8 +14,8 @@ import java.net.URLClassLoader; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.Path; -import org.apache.tools.ant.types.SysProperties; import org.apache.tools.ant.types.PathUtil; +import org.apache.tools.ant.types.SysProperties; /* * @author thomas.haas@softwired-inc.com diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Get.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Get.java index 330e797c0..d0d087cf9 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Get.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Get.java @@ -239,7 +239,8 @@ public class Get extends Task if( is == null ) { getLogger().info( "Can't get " + source + " to " + dest ); - if( ignoreErrors ) { + if( ignoreErrors ) + { return; } throw new TaskException( "Can't get " + source + " to " + dest ); @@ -251,11 +252,13 @@ public class Get extends Task while( ( length = is.read( buffer ) ) >= 0 ) { fos.write( buffer, 0, length ); - if( verbose ) { + if( verbose ) + { System.out.print( "." ); } } - if( verbose ) { + if( verbose ) + { System.out.println(); } fos.close(); @@ -282,7 +285,8 @@ public class Get extends Task catch( IOException ioe ) { getLogger().info( "Error getting " + source + " to " + dest ); - if( ignoreErrors ) { + if( ignoreErrors ) + { return; } throw new TaskException( "Error", ioe ); diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Input.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Input.java index fe2dda378..1b8cf707c 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Input.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Input.java @@ -13,7 +13,6 @@ import java.io.InputStreamReader; import java.util.ArrayList; import java.util.StringTokenizer; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.AbstractTask; import org.apache.tools.ant.Task; /** diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Java.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Java.java index 1fcd89bbb..c15e9bfe2 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Java.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Java.java @@ -11,6 +11,7 @@ import java.io.File; import java.io.IOException; import java.io.PrintStream; import java.util.ArrayList; +import org.apache.aut.nativelib.ExecManager; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.taskdefs.exec.Execute2; @@ -19,7 +20,6 @@ import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.CommandlineJava; import org.apache.tools.ant.types.EnvironmentVariable; import org.apache.tools.ant.types.Path; -import org.apache.aut.nativelib.ExecManager; /** * This task acts as a loader for java applications but allows to use the same diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javac.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javac.java index db9cce286..252d37cb8 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javac.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javac.java @@ -10,16 +10,16 @@ package org.apache.tools.ant.taskdefs; import java.io.File; import java.util.ArrayList; import java.util.Iterator; +import org.apache.aut.nativelib.Os; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.JavaVersion; -import org.apache.aut.nativelib.Os; -import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.taskdefs.compilers.CompilerAdapter; import org.apache.tools.ant.taskdefs.compilers.CompilerAdapterFactory; import org.apache.tools.ant.types.Argument; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.types.Path; -import org.apache.tools.ant.util.mappers.GlobPatternMapper; import org.apache.tools.ant.types.SourceFileScanner; +import org.apache.tools.ant.util.mappers.GlobPatternMapper; /** * Task to compile Java source files. This task can take the following diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/PathConvert.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/PathConvert.java index a9eda7d20..9348b6c3b 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/PathConvert.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/PathConvert.java @@ -10,7 +10,6 @@ package org.apache.tools.ant.taskdefs; import java.io.File; import java.util.ArrayList; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.AbstractTask; import org.apache.tools.ant.Task; import org.apache.tools.ant.types.Path; @@ -150,7 +149,8 @@ public class PathConvert extends Task elem = elem.replace( fromDirSep, toDirSep ); - if( i != 0 ) { + if( i != 0 ) + { rslt.append( m_pathSep ); } rslt.append( elem ); @@ -212,17 +212,20 @@ public class PathConvert extends Task throws TaskException { - if( m_path == null ) { + if( m_path == null ) + { throw new TaskException( "You must specify a path to convert" ); } - if( m_property == null ) { + if( m_property == null ) + { throw new TaskException( "You must specify a property" ); } // Must either have a target OS or both a dirSep and pathSep - if( m_targetOS == null && m_pathSep == null && m_dirSep == null ) { + if( m_targetOS == null && m_pathSep == null && m_dirSep == null ) + { throw new TaskException( "You must specify at least one of targetOS, dirSep, or pathSep" ); } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Property.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Property.java index 39adf76b7..7928ba740 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Property.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Property.java @@ -15,7 +15,6 @@ import java.net.URLClassLoader; import java.util.Iterator; import java.util.Properties; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.AbstractTask; import org.apache.tools.ant.Task; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.PathUtil; @@ -82,7 +81,8 @@ public class Property getContext().setProperty( name, value ); } - if( m_resource != null ) { + if( m_resource != null ) + { loadResource( m_resource ); } } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Recorder.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Recorder.java index fc2833c7f..1c41a2b1d 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Recorder.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Recorder.java @@ -13,9 +13,9 @@ import java.io.IOException; import java.io.PrintStream; import java.util.Hashtable; import org.apache.myrmidon.api.TaskException; +import org.apache.myrmidon.framework.LogLevel; import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; -import org.apache.myrmidon.framework.LogLevel; /** * This task is the manager for RecorderEntry's. It is this class that holds all diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Rmic.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Rmic.java index 5fd1ffe1c..a1ae90238 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Rmic.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Rmic.java @@ -9,19 +9,19 @@ package org.apache.tools.ant.taskdefs; import java.io.File; import java.io.IOException; -import java.net.URLClassLoader; import java.net.URL; +import java.net.URLClassLoader; import java.rmi.Remote; import java.util.ArrayList; import org.apache.avalon.excalibur.io.FileUtil; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.taskdefs.rmic.RmicAdapter; import org.apache.tools.ant.taskdefs.rmic.RmicAdapterFactory; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.types.Path; -import org.apache.tools.ant.util.mappers.FileNameMapper; -import org.apache.tools.ant.types.SourceFileScanner; import org.apache.tools.ant.types.PathUtil; +import org.apache.tools.ant.types.SourceFileScanner; +import org.apache.tools.ant.util.mappers.FileNameMapper; /** * Task to compile RMI stubs and skeletons. This task can take the following diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SQLExec.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SQLExec.java index 871806cd7..e45fddae6 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SQLExec.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SQLExec.java @@ -18,8 +18,8 @@ import java.io.InputStreamReader; import java.io.PrintStream; import java.io.Reader; import java.io.StringReader; -import java.net.URLClassLoader; import java.net.URL; +import java.net.URLClassLoader; import java.sql.Connection; import java.sql.DatabaseMetaData; import java.sql.Driver; @@ -33,8 +33,8 @@ import java.util.Iterator; import java.util.Properties; import java.util.StringTokenizer; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.Task; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.types.EnumeratedAttribute; import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.Path; @@ -469,7 +469,8 @@ public class SQLExec throw new SQLException( "No suitable Driver for " + url ); } - if( !isValidRdbms( conn ) ) { + if( !isValidRdbms( conn ) ) + { return; } @@ -565,7 +566,8 @@ public class SQLExec */ protected boolean isValidRdbms( Connection conn ) { - if( rdbms == null && version == null ) { + if( rdbms == null && version == null ) + { return true; } @@ -620,7 +622,8 @@ public class SQLExec throws SQLException { // Check and ignore empty statements - if( "".equals( sql.trim() ) ) { + if( "".equals( sql.trim() ) ) + { return; } @@ -651,7 +654,8 @@ public class SQLExec catch( SQLException e ) { getLogger().error( "Failed to execute: " + sql ); - if( !onError.equals( "continue" ) ) { + if( !onError.equals( "continue" ) ) + { throw e; } getLogger().error( e.toString() ); @@ -731,10 +735,12 @@ public class SQLExec { line = line.trim(); line = "" + resolveValue( line ); - if( line.startsWith( "//" ) ) { + if( line.startsWith( "//" ) ) + { continue; } - if( line.startsWith( "--" ) ) { + if( line.startsWith( "--" ) ) + { continue; } StringTokenizer st = new StringTokenizer( line ); @@ -753,7 +759,8 @@ public class SQLExec // SQL defines "--" as a comment to EOL // and in Oracle it may contain a hint // so we cannot just remove it, instead we must end it - if( line.indexOf( "--" ) >= 0 ) { + if( line.indexOf( "--" ) >= 0 ) + { sql += "\n"; } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tstamp.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tstamp.java index eb87ad308..3a5353309 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tstamp.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tstamp.java @@ -18,7 +18,6 @@ import java.util.NoSuchElementException; import java.util.StringTokenizer; import java.util.TimeZone; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.AbstractTask; import org.apache.tools.ant.Task; import org.apache.tools.ant.types.EnumeratedAttribute; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/UpToDate.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/UpToDate.java index 2e42a08ce..54fd094d8 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/UpToDate.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/UpToDate.java @@ -11,15 +11,14 @@ import java.io.File; import java.util.ArrayList; import java.util.Iterator; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.AbstractTask; -import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.taskdefs.condition.Condition; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.types.FileSet; -import org.apache.tools.ant.util.mappers.Mapper; +import org.apache.tools.ant.types.ScannerUtil; +import org.apache.tools.ant.types.SourceFileScanner; import org.apache.tools.ant.util.mappers.FileNameMapper; +import org.apache.tools.ant.util.mappers.Mapper; import org.apache.tools.ant.util.mappers.MergingMapper; -import org.apache.tools.ant.types.SourceFileScanner; -import org.apache.tools.ant.types.ScannerUtil; /** * Will set the given property if the specified target has a timestamp greater @@ -121,7 +120,8 @@ public class UpToDate extends MatchingTask implements Condition } // if not there then it can't be up to date - if( _targetFile != null && !_targetFile.exists() ) { + if( _targetFile != null && !_targetFile.exists() ) + { return false; } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/WaitFor.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/WaitFor.java index 5ba60368e..5ee5e37a4 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/WaitFor.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/WaitFor.java @@ -9,7 +9,6 @@ package org.apache.tools.ant.taskdefs; import java.util.Hashtable; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.AbstractTask; import org.apache.tools.ant.taskdefs.condition.Condition; import org.apache.tools.ant.taskdefs.condition.ConditionBase; import org.apache.tools.ant.types.EnumeratedAttribute; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Ear.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Ear.java index 9693574cd..dfeb35551 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Ear.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Ear.java @@ -9,8 +9,8 @@ package org.apache.tools.ant.taskdefs.archive; import java.io.File; import java.io.IOException; -import org.apache.myrmidon.api.TaskException; import org.apache.aut.zip.ZipOutputStream; +import org.apache.myrmidon.api.TaskException; /** * Creates a EAR archive. Based on WAR task diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Jar.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Jar.java index fc0545817..a7d8fdd08 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Jar.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Jar.java @@ -20,11 +20,11 @@ import java.io.Reader; import java.util.Enumeration; import java.util.Iterator; import java.util.zip.ZipFile; +import org.apache.aut.zip.ZipOutputStream; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.types.FileScanner; import org.apache.tools.ant.taskdefs.Manifest; import org.apache.tools.ant.taskdefs.ManifestException; -import org.apache.aut.zip.ZipOutputStream; +import org.apache.tools.ant.types.FileScanner; /** * Creates a JAR archive. diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Tar.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Tar.java index c2a326b11..202b4e5dd 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Tar.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Tar.java @@ -17,10 +17,10 @@ import org.apache.aut.tar.TarEntry; import org.apache.aut.tar.TarOutputStream; import org.apache.avalon.excalibur.io.IOUtil; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.types.SourceFileScanner; +import org.apache.tools.ant.taskdefs.MatchingTask; import org.apache.tools.ant.types.ScannerUtil; +import org.apache.tools.ant.types.SourceFileScanner; import org.apache.tools.ant.util.mappers.MergingMapper; -import org.apache.tools.ant.taskdefs.MatchingTask; /** * Creates a TAR archive. diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/War.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/War.java index 6907a213e..2b906c3da 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/War.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/War.java @@ -9,8 +9,8 @@ package org.apache.tools.ant.taskdefs.archive; import java.io.File; import java.io.IOException; -import org.apache.myrmidon.api.TaskException; import org.apache.aut.zip.ZipOutputStream; +import org.apache.myrmidon.api.TaskException; /** * Creates a WAR archive. @@ -41,7 +41,7 @@ public class War throw new TaskException( message ); } - addFileAs(descr, "WEB-INF/web.xml" ); + addFileAs( descr, "WEB-INF/web.xml" ); } public void addClasses( final ZipFileSet fs ) diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Zip.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Zip.java index 1403d66e5..5ae0126d1 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Zip.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Zip.java @@ -22,15 +22,15 @@ import java.util.zip.CRC32; import java.util.zip.ZipInputStream; import org.apache.aut.zip.ZipEntry; import org.apache.aut.zip.ZipOutputStream; +import org.apache.avalon.excalibur.io.IOUtil; import org.apache.myrmidon.api.TaskException; +import org.apache.tools.ant.taskdefs.MatchingTask; import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.types.FileScanner; import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.ScannerUtil; import org.apache.tools.ant.types.SourceFileScanner; import org.apache.tools.ant.util.mappers.MergingMapper; -import org.apache.tools.ant.taskdefs.MatchingTask; -import org.apache.avalon.excalibur.io.IOUtil; /** * Create a ZIP archive. diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java index 4b87f7295..182094591 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java @@ -11,6 +11,7 @@ import java.io.File; import java.io.FileWriter; import java.io.IOException; import java.io.PrintWriter; +import org.apache.aut.nativelib.ExecManager; import org.apache.avalon.excalibur.io.IOUtil; import org.apache.avalon.excalibur.util.StringUtil; import org.apache.avalon.framework.logger.AbstractLogEnabled; @@ -21,7 +22,6 @@ import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.PathUtil; import org.apache.tools.ant.util.FileUtils; -import org.apache.aut.nativelib.ExecManager; /** * This is the default implementation for the CompilerAdapter interface. diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java index f1e9b5a14..fe50cf976 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java @@ -83,7 +83,8 @@ public class Jikes Commandline cmd = new Commandline(); cmd.setExecutable( "jikes" ); - if( m_deprecation == true ) { + if( m_deprecation == true ) + { cmd.addArgument( "-deprecation" ); } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/ExecTask.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/ExecTask.java index 65d15584e..72e4a2f8f 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/ExecTask.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/ExecTask.java @@ -18,7 +18,6 @@ import java.util.Iterator; import java.util.Properties; import org.apache.avalon.excalibur.util.StringUtil; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.AbstractTask; import org.apache.tools.ant.Task; import org.apache.tools.ant.types.Argument; import org.apache.tools.ant.types.Commandline; @@ -316,10 +315,12 @@ public class ExecTask { try { - if( m_ouput != null ) { + if( m_ouput != null ) + { m_ouput.close(); } - if( m_byteArrayOutput != null ) { + if( m_byteArrayOutput != null ) + { m_byteArrayOutput.close(); } } @@ -350,8 +351,9 @@ public class ExecTask throws TaskException { // default directory to the project's base directory - if( m_workingDirectory == null ) { - m_workingDirectory = getBaseDirectory(); + if( m_workingDirectory == null ) + { + m_workingDirectory = getBaseDirectory(); } // show the command getLogger().debug( m_command.toString() ); diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/ExecuteOn.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/ExecuteOn.java index 68e1a3787..f722f44c5 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/ExecuteOn.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/ExecuteOn.java @@ -13,12 +13,11 @@ import java.util.ArrayList; import java.util.Hashtable; import org.apache.avalon.excalibur.util.StringUtil; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.AbstractTask; import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.Marker; -import org.apache.tools.ant.types.SourceFileScanner; import org.apache.tools.ant.types.ScannerUtil; +import org.apache.tools.ant.types.SourceFileScanner; import org.apache.tools.ant.util.mappers.FileNameMapper; import org.apache.tools.ant.util.mappers.Mapper; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Move.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Move.java index 63b03387a..3d72024ba 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Move.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Move.java @@ -50,7 +50,8 @@ public class Move throws TaskException { String[] list = d.list(); - if( list == null ) { + if( list == null ) + { return; }// on an io error list() can return null @@ -225,7 +226,8 @@ public class Move protected boolean okToDelete( File d ) { String[] list = d.list(); - if( list == null ) { + if( list == null ) + { return false; }// maybe io error? @@ -235,7 +237,8 @@ public class Move File f = new File( d, s ); if( f.isDirectory() ) { - if( !okToDelete( f ) ) { + if( !okToDelete( f ) ) + { return false; } } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java index bdbaf48ba..cbc329cc7 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java @@ -15,19 +15,19 @@ import java.io.PrintWriter; import java.util.ArrayList; import java.util.Iterator; import java.util.StringTokenizer; +import org.apache.aut.nativelib.ExecManager; +import org.apache.aut.nativelib.ExecOutputHandler; +import org.apache.aut.nativelib.Os; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.Pattern; -import org.apache.aut.nativelib.Os; -import org.apache.aut.nativelib.ExecOutputHandler; -import org.apache.aut.nativelib.ExecManager; -import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.Task; -import org.apache.tools.ant.util.FileUtils; import org.apache.tools.ant.taskdefs.exec.Execute2; import org.apache.tools.ant.types.Commandline; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.ScannerUtil; +import org.apache.tools.ant.util.FileUtils; /** * This task makes it easy to generate Javadoc documentation for a collection of @@ -567,17 +567,19 @@ public class Javadoc // Build the classpath to pass to Javadoc Path classpath = new Path(); classpath.addPath( m_sourcePath ); - if ( m_classpath != null ) + if( m_classpath != null ) { classpath.addPath( m_classpath ); } cmd.addArgument( "-classpath" ); cmd.addArgument( classpath.toString() ); - if( m_version && m_doclet == null ) { + if( m_version && m_doclet == null ) + { cmd.addArgument( "-version" ); } - if( m_author && m_doclet == null ) { + if( m_author && m_doclet == null ) + { cmd.addArgument( "-author" ); } @@ -938,7 +940,8 @@ public class Javadoc ArrayList addedPackages = new ArrayList(); String[] list = sourcePath.list(); - if( list == null ) { + if( list == null ) + { list = new String[ 0 ]; } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java index ae16782f5..33144dd01 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java @@ -12,15 +12,15 @@ import java.io.File; import java.io.FileReader; import java.io.IOException; import java.net.URL; +import org.apache.aut.nativelib.ExecManager; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.Task; import org.apache.tools.ant.taskdefs.ExecuteJava; import org.apache.tools.ant.taskdefs.exec.Execute2; import org.apache.tools.ant.types.Argument; +import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.CommandlineJava; import org.apache.tools.ant.types.Path; -import org.apache.tools.ant.types.Commandline; -import org.apache.aut.nativelib.ExecManager; /** * ANTLR task. diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java index c5a41097b..8cb2aa241 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java @@ -14,13 +14,13 @@ import java.io.OutputStream; import java.io.PrintWriter; import java.util.ArrayList; import java.util.Iterator; -import org.apache.aut.nativelib.Os; import org.apache.aut.nativelib.ExecManager; +import org.apache.aut.nativelib.Os; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.taskdefs.MatchingTask; import org.apache.tools.ant.taskdefs.exec.Execute2; import org.apache.tools.ant.types.Commandline; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.ScannerUtil; @@ -198,7 +198,8 @@ public class Cab { String file = files.get( i ).toString(); if( new File( m_baseDir, file ).lastModified() > - m_cabFile.lastModified() ) { + m_cabFile.lastModified() ) + { upToDate = false; } } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Entry.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Entry.java index 463592b64..31952e596 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Entry.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Entry.java @@ -159,7 +159,8 @@ public class Entry GregorianCalendar value = new GregorianCalendar(); GregorianCalendar newValue = new GregorianCalendar(); - if( m_pattern == null ) { + if( m_pattern == null ) + { m_pattern = "yyyy/MM/dd HH:mm"; } DateFormat fmt = new SimpleDateFormat( m_pattern ); diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java index bfa2cb542..c0a151f01 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java @@ -12,9 +12,8 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.StringTokenizer; import org.apache.avalon.excalibur.util.StringUtil; - -import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.AbstractTask; +import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.util.FileUtils; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java index 0d5368b07..dbb7c0742 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java @@ -20,8 +20,8 @@ import netrexx.lang.Rexx; import org.apache.avalon.excalibur.io.FileUtil; import org.apache.avalon.excalibur.util.StringUtil; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.taskdefs.MatchingTask; +import org.apache.tools.ant.types.DirectoryScanner; /** * Task to compile NetRexx source files. This task can take the following @@ -169,7 +169,8 @@ public class NetRexxC extends MatchingTask public void setCompile( boolean compile ) { this.compile = compile; - if( !this.compile && !this.keep ) { + if( !this.compile && !this.keep ) + { this.keep = true; } } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Script.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Script.java index ca7052b13..87b019a65 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Script.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Script.java @@ -46,7 +46,8 @@ public class Script extends Task public void setSrc( String fileName ) { File file = new File( fileName ); - if( !file.exists() ) { + if( !file.exists() ) + { throw new TaskException( "file " + fileName + " not found." ); } @@ -140,11 +141,13 @@ public class Script extends Task boolean isValid = key.length() > 0 && Character.isJavaIdentifierStart( key.charAt( 0 ) ); - for( int i = 1; isValid && i < key.length(); i++ ) { + for( int i = 1; isValid && i < key.length(); i++ ) + { isValid = Character.isJavaIdentifierPart( key.charAt( i ) ); } - if( isValid ) { + if( isValid ) + { beans.put( key, dictionary.get( key ) ); } } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java index 271e726b6..76eb81c33 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java @@ -7,8 +7,8 @@ */ package org.apache.tools.ant.taskdefs.optional.ccm; -import org.apache.myrmidon.api.TaskException; import org.apache.aut.nativelib.ExecOutputHandler; +import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.types.Commandline; /** diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java index 956f14368..81539cec0 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java @@ -9,10 +9,10 @@ package org.apache.tools.ant.taskdefs.optional.ccm; import java.io.File; import java.io.IOException; +import org.apache.aut.nativelib.ExecManager; +import org.apache.aut.nativelib.ExecOutputHandler; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; -import org.apache.aut.nativelib.ExecOutputHandler; -import org.apache.aut.nativelib.ExecManager; import org.apache.tools.ant.taskdefs.exec.Execute2; import org.apache.tools.ant.types.Commandline; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java index 474f2696e..917df8aca 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java @@ -9,11 +9,11 @@ package org.apache.tools.ant.taskdefs.optional.clearcase; import java.io.File; import java.io.IOException; +import org.apache.aut.nativelib.ExecManager; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.Task; import org.apache.tools.ant.taskdefs.exec.Execute2; import org.apache.tools.ant.types.Commandline; -import org.apache.aut.nativelib.ExecManager; /** * A base class for creating tasks for executing commands on ClearCase.

diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java index 653135b2d..883c3c00a 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java @@ -21,8 +21,8 @@ import java.util.Enumeration; import java.util.Hashtable; import java.util.Iterator; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.taskdefs.MatchingTask; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.PathUtil; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java index af5447d46..7d61dc51a 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java @@ -9,9 +9,9 @@ package org.apache.tools.ant.taskdefs.optional.dotnet; import java.io.File; import org.apache.myrmidon.api.TaskException; +import org.apache.tools.ant.taskdefs.MatchingTask; import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.types.Path; -import org.apache.tools.ant.taskdefs.MatchingTask; // ==================================================================== @@ -420,7 +420,8 @@ public class CSharp throws TaskException { //demand create pathlist - if( _referenceFiles == null ) { + if( _referenceFiles == null ) + { _referenceFiles = new Path(); } _referenceFiles.append( path ); @@ -462,7 +463,8 @@ public class CSharp { _targetType = targetType; } - else { + else + { throw new TaskException( "targetType " + targetType + " is not a valid type" ); } } @@ -650,8 +652,9 @@ public class CSharp public void execute() throws TaskException { - if( _srcDir == null ) { - _srcDir = getBaseDirectory(); + if( _srcDir == null ) + { + _srcDir = getBaseDirectory(); } NetCommand command = new NetCommand( this, "CSC", csc_exe_name ); @@ -710,9 +713,12 @@ public class CSharp */ protected String getAdditionalModulesParameter() { - if( notEmpty( _additionalModules ) ) { + if( notEmpty( _additionalModules ) ) + { return "/addmodule:" + _additionalModules; - } else { + } + else + { return null; } } @@ -740,7 +746,8 @@ public class CSharp s.append( DEFAULT_REFERENCE_LIST ); return new String( s ); } - else { + else + { return null; } } @@ -752,9 +759,12 @@ public class CSharp */ protected String getDefinitionsParameter() { - if( notEmpty( _definitions ) ) { + if( notEmpty( _definitions ) ) + { return "/define:" + _definitions; - } else { + } + else + { return null; } } @@ -766,9 +776,12 @@ public class CSharp */ protected String getDocFileParameter() { - if( _docFile != null ) { + if( _docFile != null ) + { return "/doc:" + _docFile.toString(); - } else { + } + else + { return null; } } @@ -780,9 +793,12 @@ public class CSharp */ protected String getExtraOptionsParameter() { - if( _extraOptions != null && _extraOptions.length() != 0 ) { + if( _extraOptions != null && _extraOptions.length() != 0 ) + { return _extraOptions; - } else { + } + else + { return null; } } @@ -819,9 +835,12 @@ public class CSharp */ protected String getMainClassParameter() { - if( _mainClass != null && _mainClass.length() != 0 ) { + if( _mainClass != null && _mainClass.length() != 0 ) + { return "/main:" + _mainClass; - } else { + } + else + { return null; } } @@ -853,7 +872,8 @@ public class CSharp File f = _outputFile; return "/out:" + f.toString(); } - else { + else + { return null; } } @@ -866,7 +886,8 @@ public class CSharp protected String getReferenceFilesParameter() { //bail on no references - if( _references == null ) { + if( _references == null ) + { return null; } //iterate through the ref list & generate an entry for each @@ -875,7 +896,8 @@ public class CSharp String refpath = _references.toString(); //bail on no references listed - if( refpath.length() == 0 ) { + if( refpath.length() == 0 ) + { return null; } @@ -892,9 +914,12 @@ public class CSharp protected String getReferencesParameter() { //bail on no references - if( notEmpty( _references ) ) { + if( notEmpty( _references ) ) + { return "/reference:" + _references; - } else { + } + else + { return null; } } @@ -906,9 +931,12 @@ public class CSharp */ protected String getTargetTypeParameter() { - if( notEmpty( _targetType ) ) { + if( notEmpty( _targetType ) ) + { return "/target:" + _targetType; - } else { + } + else + { return null; } } @@ -945,9 +973,12 @@ public class CSharp */ protected String getWin32IconParameter() { - if( _win32icon != null ) { + if( _win32icon != null ) + { return "/win32icon:" + _win32icon.toString(); - } else { + } + else + { return null; } } @@ -959,9 +990,12 @@ public class CSharp */ protected String getWin32ResParameter() { - if( _win32res != null ) { + if( _win32res != null ) + { return "/win32res:" + _win32res.toString(); - } else { + } + else + { return null; } } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java index 8014b1a96..34c47fd46 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java @@ -226,7 +226,8 @@ public class Ilasm { _targetType = targetType; } - else { + else + { throw new TaskException( "targetType " + targetType + " is not a valid type" ); } } @@ -306,8 +307,9 @@ public class Ilasm public void execute() throws TaskException { - if( _srcDir == null ) { - _srcDir = getBaseDirectory(); + if( _srcDir == null ) + { + _srcDir = getBaseDirectory(); } //get dependencies list. @@ -375,9 +377,12 @@ public class Ilasm */ protected String getExtraOptionsParameter() { - if( _extraOptions != null && _extraOptions.length() != 0 ) { + if( _extraOptions != null && _extraOptions.length() != 0 ) + { return _extraOptions; - } else { + } + else + { return null; } } @@ -389,9 +394,12 @@ public class Ilasm */ protected String getKeyfileParameter() { - if( _keyfile != null ) { + if( _keyfile != null ) + { return "/keyfile:" + _keyfile.toString(); - } else { + } + else + { return null; } } @@ -413,7 +421,8 @@ public class Ilasm */ protected String getOutputFileParameter() { - if( _outputFile == null || _outputFile.length() == 0 ) { + if( _outputFile == null || _outputFile.length() == 0 ) + { return null; } File f = _outputFile; @@ -440,16 +449,22 @@ public class Ilasm protected String getTargetTypeParameter() { - if( !notEmpty( _targetType ) ) { + if( !notEmpty( _targetType ) ) + { return null; } - if( _targetType.equals( "exe" ) ) { + if( _targetType.equals( "exe" ) ) + { return "/exe"; - } else if( _targetType.equals( "library" ) ) { + } + else if( _targetType.equals( "library" ) ) + { return "/dll"; - } else { + } + else + { return null; - } + } } /** diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java index bda07ed99..e3376e2d1 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java @@ -9,12 +9,12 @@ package org.apache.tools.ant.taskdefs.optional.dotnet;// imports import java.io.File; import java.io.IOException; +import org.apache.aut.nativelib.ExecManager; import org.apache.avalon.framework.logger.AbstractLogEnabled; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.Task; import org.apache.tools.ant.taskdefs.exec.Execute2; import org.apache.tools.ant.types.Commandline; -import org.apache.aut.nativelib.ExecManager; /** * This is a helper class to spawn net commands out. In its initial form it diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java index d31b6b22f..afc441986 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java @@ -16,6 +16,7 @@ import java.io.OutputStream; import java.util.ArrayList; import java.util.Hashtable; import java.util.Iterator; +import org.apache.aut.nativelib.ExecManager; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.taskdefs.Java; import org.apache.tools.ant.taskdefs.exec.Execute2; @@ -24,7 +25,6 @@ import org.apache.tools.ant.types.Argument; import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.util.FileUtils; -import org.apache.aut.nativelib.ExecManager; /** * BorlandDeploymentTool is dedicated to the Borland Application Server 4.5 and diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java index dd1c8e466..2c7ae2c6e 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java @@ -8,13 +8,13 @@ package org.apache.tools.ant.taskdefs.optional.ejb; import java.io.File; +import org.apache.aut.nativelib.ExecManager; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.Task; import org.apache.tools.ant.taskdefs.exec.Execute2; +import org.apache.tools.ant.types.Argument; import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.Path; -import org.apache.tools.ant.types.Argument; -import org.apache.aut.nativelib.ExecManager; /** * BorlandGenerateClient is dedicated to the Borland Application Server 4.5 This diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java index b9b5dc02b..92a65e9ff 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java @@ -9,10 +9,10 @@ package org.apache.tools.ant.taskdefs.optional.ejb; import java.io.File; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.taskdefs.Java; import org.apache.tools.ant.taskdefs.MatchingTask; import org.apache.tools.ant.types.Argument; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.types.Path; /** diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java index f1df04843..40a269dbc 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java @@ -15,8 +15,8 @@ import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.taskdefs.MatchingTask; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.types.EnumeratedAttribute; import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.Path; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java index 68e5d26f2..23f86dae9 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java @@ -9,10 +9,10 @@ package org.apache.tools.ant.taskdefs.optional.ejb; import java.io.File; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.taskdefs.Java; import org.apache.tools.ant.taskdefs.MatchingTask; import org.apache.tools.ant.types.Argument; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.types.Path; /** diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java index 124ecc31e..614b61447 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java @@ -12,8 +12,8 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; -import java.net.URLClassLoader; import java.net.URL; +import java.net.URLClassLoader; import java.util.ArrayList; import java.util.HashSet; import java.util.Hashtable; @@ -26,13 +26,12 @@ import java.util.jar.Manifest; import java.util.zip.ZipEntry; import javax.xml.parsers.SAXParser; import org.apache.avalon.framework.logger.AbstractLogEnabled; - -import org.apache.bcel.classfile.JavaClass; import org.apache.bcel.classfile.ClassParser; +import org.apache.bcel.classfile.JavaClass; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.PathUtil; @@ -608,7 +607,8 @@ public class GenericDeploymentTool while( i.hasNext() ) { String entryName = (String)i.next(); - if( entryName.endsWith( ".class" ) ) { + if( entryName.endsWith( ".class" ) ) + { newSet.add( entryName.substring( 0, entryName.length() - ".class".length() ).replace( File.separatorChar, '/' ) ); } } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java index 3df82e248..7e130174f 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java @@ -12,8 +12,8 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; -import java.net.URLClassLoader; import java.net.URL; +import java.net.URLClassLoader; import java.util.Hashtable; import java.util.Iterator; import java.util.jar.JarEntry; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java index a6013ab61..f944701e9 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java @@ -11,8 +11,8 @@ import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; -import java.net.URLClassLoader; import java.net.URL; +import java.net.URLClassLoader; import java.util.Hashtable; import java.util.Iterator; import java.util.jar.JarEntry; @@ -943,7 +943,8 @@ public class WebsphereDeploymentTool " " + tempdir + " " + destJar.getPath() + " " + getOptions(); - if( getCombinedClasspath() != null && getCombinedClasspath().toString().length() > 0 ) { + if( getCombinedClasspath() != null && getCombinedClasspath().toString().length() > 0 ) + { args += " -cp " + getCombinedClasspath(); } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java index 7451e069a..e7170e11d 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java @@ -20,8 +20,8 @@ import java.util.Hashtable; import java.util.Locale; import org.apache.avalon.excalibur.io.FileUtil; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.taskdefs.MatchingTask; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.ScannerUtil; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java index 988cdf0b3..37e25c0f1 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java @@ -44,7 +44,6 @@ import org.apache.tools.ant.BuildEvent; import org.apache.tools.ant.BuildListener; import org.apache.tools.ant.Project; - /** * This is a simple grafical user interface to provide the information needed by * ANT and to start the build-process within IBM VisualAge for Java.

@@ -1544,31 +1543,38 @@ public class VAJAntToolGUI extends Frame } } // MenuItems - if( e.getSource() == VAJAntToolGUI.this.getSaveMenuItem() ) { + if( e.getSource() == VAJAntToolGUI.this.getSaveMenuItem() ) + { saveBuildInfo(); } - if( e.getSource() == VAJAntToolGUI.this.getAboutMenuItem() ) { + if( e.getSource() == VAJAntToolGUI.this.getAboutMenuItem() ) + { getAboutDialog().show(); } - if( e.getSource() == VAJAntToolGUI.this.getShowLogMenuItem() ) { + if( e.getSource() == VAJAntToolGUI.this.getShowLogMenuItem() ) + { getMessageFrame().show(); } /* * #### About dialog #### */ - if( e.getSource() == VAJAntToolGUI.this.getAboutOkButton() ) { + if( e.getSource() == VAJAntToolGUI.this.getAboutOkButton() ) + { getAboutDialog().dispose(); } /* * #### Log frame #### */ - if( e.getSource() == VAJAntToolGUI.this.getMessageOkButton() ) { + if( e.getSource() == VAJAntToolGUI.this.getMessageOkButton() ) + { getMessageFrame().dispose(); } - if( e.getSource() == VAJAntToolGUI.this.getMessageClearLogButton() ) { + if( e.getSource() == VAJAntToolGUI.this.getMessageClearLogButton() ) + { getMessageTextArea().setText( "" ); } - if( e.getSource() == VAJAntToolGUI.this.getMessageOkButton() ) { + if( e.getSource() == VAJAntToolGUI.this.getMessageOkButton() ) + { getMessageFrame().dispose(); } } @@ -1587,13 +1593,16 @@ public class VAJAntToolGUI extends Frame { try { - if( e.getSource() == VAJAntToolGUI.this.getTargetList() ) { + if( e.getSource() == VAJAntToolGUI.this.getTargetList() ) + { getBuildButton().setEnabled( true ); } - if( e.getSource() == VAJAntToolGUI.this.getMessageOutputLevelChoice() ) { + if( e.getSource() == VAJAntToolGUI.this.getMessageOutputLevelChoice() ) + { getBuildInfo().setOutputMessageLevel( getMessageOutputLevelChoice().getSelectedIndex() ); } - if( e.getSource() == VAJAntToolGUI.this.getTargetList() ) { + if( e.getSource() == VAJAntToolGUI.this.getTargetList() ) + { getBuildInfo().setTarget( getTargetList().getSelectedItem() ); } } @@ -1610,10 +1619,12 @@ public class VAJAntToolGUI extends Frame */ public void propertyChange( java.beans.PropertyChangeEvent evt ) { - if( evt.getSource() == VAJAntToolGUI.this.getBuildInfo() && ( evt.getPropertyName().equals( "projectName" ) ) ) { + if( evt.getSource() == VAJAntToolGUI.this.getBuildInfo() && ( evt.getPropertyName().equals( "projectName" ) ) ) + { connectProjectNameToLabel(); } - if( evt.getSource() == VAJAntToolGUI.this.getBuildInfo() && ( evt.getPropertyName().equals( "buildFileName" ) ) ) { + if( evt.getSource() == VAJAntToolGUI.this.getBuildInfo() && ( evt.getPropertyName().equals( "buildFileName" ) ) ) + { connectBuildFileNameToTextField(); } } @@ -1625,7 +1636,8 @@ public class VAJAntToolGUI extends Frame */ public void textValueChanged( TextEvent e ) { - if( e.getSource() == VAJAntToolGUI.this.getBuildFileTextField() ) { + if( e.getSource() == VAJAntToolGUI.this.getBuildFileTextField() ) + { connectTextFieldToBuildFileName(); } } @@ -1652,10 +1664,12 @@ public class VAJAntToolGUI extends Frame dispose(); System.exit( 0 ); } - if( e.getSource() == VAJAntToolGUI.this.getAboutDialog() ) { + if( e.getSource() == VAJAntToolGUI.this.getAboutDialog() ) + { getAboutDialog().dispose(); } - if( e.getSource() == VAJAntToolGUI.this.getMessageFrame() ) { + if( e.getSource() == VAJAntToolGUI.this.getMessageFrame() ) + { getMessageFrame().dispose(); } } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJExport.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJExport.java index 1fdb9de90..e9592a5c4 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJExport.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJExport.java @@ -8,8 +8,8 @@ package org.apache.tools.ant.taskdefs.optional.ide; import java.io.File; -import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskContext; +import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.Pattern; import org.apache.myrmidon.framework.PatternSet; import org.apache.myrmidon.framework.PatternUtil; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java index e2e969432..4dbf860f7 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java @@ -11,15 +11,14 @@ import java.io.File; import java.io.IOException; import java.util.Enumeration; import java.util.Hashtable; +import org.apache.aut.nativelib.ExecManager; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.Task; import org.apache.tools.ant.taskdefs.exec.Execute2; - +import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.CommandlineJava; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.PathUtil; -import org.apache.tools.ant.types.Commandline; -import org.apache.aut.nativelib.ExecManager; /** * Taskdef for the JJTree compiler compiler. diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java index 58707dc06..9ced6b784 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java @@ -11,17 +11,14 @@ import java.io.File; import java.io.IOException; import java.util.Enumeration; import java.util.Hashtable; +import org.apache.aut.nativelib.ExecManager; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.Task; import org.apache.tools.ant.taskdefs.exec.Execute2; - - +import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.CommandlineJava; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.PathUtil; -import org.apache.tools.ant.types.Commandline; -import org.apache.avalon.excalibur.util.StringUtil; -import org.apache.aut.nativelib.ExecManager; /** * Taskdef for the JavaCC compiler compiler. diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java index 773118415..3479fa374 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java @@ -11,15 +11,14 @@ import java.io.File; import java.io.FileWriter; import java.io.IOException; import java.io.PrintWriter; +import org.apache.aut.nativelib.ExecManager; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.Task; import org.apache.tools.ant.taskdefs.exec.Execute2; - +import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.CommandlineJava; import org.apache.tools.ant.types.Path; -import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.util.FileUtils; -import org.apache.aut.nativelib.ExecManager; /** * Ant task to run JDepend tests.

@@ -234,7 +233,8 @@ public class JDependTask File f = new File( elements[ i ] ); // not necessary as JDepend would fail, but why loose some time? - if( !f.exists() || !f.isDirectory() ) { + if( !f.exists() || !f.isDirectory() ) + { throw new TaskException( "\"" + f.getPath() + "\" does not represent a valid directory. JDepend would fail." ); } commandline.addArgument( f.getPath() ); diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java index 696a03e6d..571f23309 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java @@ -11,10 +11,10 @@ import java.io.File; import java.util.ArrayList; import java.util.Date; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.taskdefs.MatchingTask; import org.apache.tools.ant.taskdefs.optional.jsp.compilers.CompilerAdapter; import org.apache.tools.ant.taskdefs.optional.jsp.compilers.CompilerAdapterFactory; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.types.Path; /** @@ -101,9 +101,12 @@ public class JspC extends MatchingTask public void setClasspath( Path cp ) throws TaskException { - if( classpath == null ) { + if( classpath == null ) + { classpath = cp; - } else { + } + else + { classpath.append( cp ); } } @@ -299,7 +302,8 @@ public class JspC extends MatchingTask public Path createClasspath() throws TaskException { - if( classpath == null ) { + if( classpath == null ) + { classpath = new Path(); } Path path1 = classpath; @@ -334,9 +338,11 @@ public class JspC extends MatchingTask // calculate where the files will end up: File dest = null; - if( packageName == null ) { + if( packageName == null ) + { dest = destDir; - } else + } + else { String path = destDir.getPath() + File.separatorChar + packageName.replace( '.', File.separatorChar ); diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java index 2febfaf40..b2d7529af 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java @@ -12,11 +12,11 @@ import java.util.ArrayList; import java.util.Date; import java.util.StringTokenizer; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.taskdefs.Java; import org.apache.tools.ant.taskdefs.MatchingTask; -import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.Argument; +import org.apache.tools.ant.types.DirectoryScanner; +import org.apache.tools.ant.types.Path; /** * Class to precompile JSP's using weblogic's jsp compiler (weblogic.jspc) diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java index b4ef1148a..5e455a015 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java @@ -10,8 +10,8 @@ package org.apache.tools.ant.taskdefs.optional.jsp.compilers; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.taskdefs.Java; import org.apache.tools.ant.taskdefs.optional.jsp.JspC; -import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.Argument; +import org.apache.tools.ant.types.Commandline; /** * The implementation of the jasper compiler. This is a cut-and-paste of the @@ -37,12 +37,14 @@ public class JasperC // the project log //FIXME Java java = null;//(Java)( getJspc().getProject() ).createTask( "java" ); - if( getJspc().getClasspath() != null ) { + if( getJspc().getClasspath() != null ) + { java.addClasspath( getJspc().getClasspath() ); } java.setClassname( "org.apache.jasper.JspC" ); String args[] = cmd.getArguments(); - for( int i = 0; i < args.length; i++ ) { + for( int i = 0; i < args.length; i++ ) + { java.addArg( new Argument( args[ i ] ) ); } java.execute(); diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java index f0b142f3a..1e3ad0532 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java @@ -13,7 +13,6 @@ import java.util.Arrays; import java.util.Iterator; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.types.DirectoryScanner; - import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.ScannerUtil; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java index f5027ac48..547193dad 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java @@ -19,20 +19,19 @@ import java.util.Hashtable; import java.util.Iterator; import java.util.Properties; import java.util.Random; +import org.apache.aut.nativelib.ExecManager; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.AbstractTask; import org.apache.tools.ant.Task; import org.apache.tools.ant.taskdefs.exec.Execute2; import org.apache.tools.ant.taskdefs.exec.LogOutputStream; import org.apache.tools.ant.types.Argument; +import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.CommandlineJava; import org.apache.tools.ant.types.EnumeratedAttribute; import org.apache.tools.ant.types.EnvironmentVariable; import org.apache.tools.ant.types.Path; -import org.apache.tools.ant.types.SysProperties; import org.apache.tools.ant.types.PathUtil; -import org.apache.tools.ant.types.Commandline; -import org.apache.aut.nativelib.ExecManager; +import org.apache.tools.ant.types.SysProperties; /** * Ant task to run JUnit tests.

@@ -671,7 +670,8 @@ public class JUnitTask extends Task } finally { - if( !propsFile.delete() ) { + if( !propsFile.delete() ) + { throw new TaskException( "Could not delete temporary properties file." ); } } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java index 814ea63b9..5c5baeabe 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java @@ -15,7 +15,6 @@ import java.text.NumberFormat; import java.util.Hashtable; import junit.framework.AssertionFailedError; import junit.framework.Test; - import org.apache.avalon.excalibur.util.StringUtil; import org.apache.myrmidon.api.TaskException; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java index c2c8d2591..84e69b750 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java @@ -18,7 +18,6 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import junit.framework.AssertionFailedError; import junit.framework.Test; - import org.apache.myrmidon.api.TaskException; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java index 65a2d7dc6..cbc2ac24f 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java @@ -19,8 +19,8 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import org.apache.avalon.framework.ExceptionUtil; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.Task; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.ScannerUtil; import org.w3c.dom.Document; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java index a32d8c500..a8d062828 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java @@ -15,17 +15,17 @@ import java.util.ArrayList; import java.util.Hashtable; import java.util.Iterator; import java.util.Random; +import org.apache.aut.nativelib.ExecManager; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.taskdefs.exec.Execute2; import org.apache.tools.ant.types.Argument; +import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.CommandlineJava; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.ScannerUtil; -import org.apache.tools.ant.types.Commandline; -import org.apache.aut.nativelib.ExecManager; /** * Somewhat abstract framework to be used for other metama 2.0 tasks. This diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java index aea779aa1..337fd59bd 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java @@ -13,15 +13,15 @@ import java.io.IOException; import java.io.PrintWriter; import java.util.ArrayList; import java.util.Random; +import org.apache.aut.nativelib.ExecManager; +import org.apache.avalon.excalibur.io.IOUtil; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.Task; import org.apache.tools.ant.taskdefs.exec.Execute2; import org.apache.tools.ant.types.Argument; +import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.CommandlineJava; import org.apache.tools.ant.types.Path; -import org.apache.tools.ant.types.Commandline; -import org.apache.avalon.excalibur.io.IOUtil; -import org.apache.aut.nativelib.ExecManager; /** * Simple Metamata MParse task based on the original written by 0 ) { + if( file != null && filesets.size() > 0 ) + { throw new TaskException( "You cannot supply the 'file' attribute and filesets at the same time." ); } int options = 0; - if( flags.indexOf( 'g' ) != -1 ) { + if( flags.indexOf( 'g' ) != -1 ) + { options |= Regexp.REPLACE_ALL; } - if( flags.indexOf( 'i' ) != -1 ) { + if( flags.indexOf( 'i' ) != -1 ) + { options |= Regexp.MATCH_CASE_INSENSITIVE; } - if( flags.indexOf( 'm' ) != -1 ) { + if( flags.indexOf( 'm' ) != -1 ) + { options |= Regexp.MATCH_MULTILINE; } - if( flags.indexOf( 's' ) != -1 ) { + if( flags.indexOf( 's' ) != -1 ) + { options |= Regexp.MATCH_SINGLELINE; } @@ -305,7 +317,8 @@ public class ReplaceRegExp extends Task while( ( line = lnr.readLine() ) != null ) { String res = doReplace( regex, subs, line, options ); - if( !res.equals( line ) ) { + if( !res.equals( line ) ) + { changes = true; } @@ -328,7 +341,8 @@ public class ReplaceRegExp extends Task String buf = new String( tmpBuf ); String res = doReplace( regex, subs, buf, options ); - if( !res.equals( buf ) ) { + if( !res.equals( buf ) ) + { changes = true; } @@ -355,7 +369,8 @@ public class ReplaceRegExp extends Task { try { - if( r != null ) { + if( r != null ) + { r.close(); } } @@ -366,7 +381,8 @@ public class ReplaceRegExp extends Task try { - if( w != null ) { + if( w != null ) + { r.close(); } } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/unix/Chmod.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/unix/Chmod.java index f5a89a4b3..5e00fa3a7 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/unix/Chmod.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/unix/Chmod.java @@ -11,7 +11,6 @@ import java.io.File; import java.io.IOException; import org.apache.aut.nativelib.Os; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.framework.Pattern; import org.apache.myrmidon.framework.PatternSet; import org.apache.tools.ant.taskdefs.exec.Execute; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/unix/Rpm.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/unix/Rpm.java index 782f06bd7..76fa4b979 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/unix/Rpm.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/unix/Rpm.java @@ -9,12 +9,11 @@ package org.apache.tools.ant.taskdefs.unix; import java.io.File; import java.io.IOException; +import org.apache.aut.nativelib.ExecManager; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.taskdefs.exec.Execute2; import org.apache.tools.ant.types.Commandline; -import org.apache.aut.nativelib.ExecManager; - /** * @author lucas@collab.net @@ -95,8 +94,9 @@ public class Rpm final Execute2 exe = new Execute2( execManager ); setupLogger( exe ); - if( m_topDir == null ) { - m_topDir = getBaseDirectory(); + if( m_topDir == null ) + { + m_topDir = getBaseDirectory(); } exe.setWorkingDirectory( m_topDir ); diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/types/Commandline.java b/proposal/myrmidon/src/main/org/apache/tools/ant/types/Commandline.java index 4a03f16ee..a7c90b2b8 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/types/Commandline.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/types/Commandline.java @@ -62,7 +62,8 @@ public class Commandline */ public void setExecutable( final String executable ) { - if( executable == null || executable.length() == 0 ) { + if( executable == null || executable.length() == 0 ) + { return; } m_executable = executable.replace( '/', File.separatorChar ) diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/types/DirectoryScanner.java b/proposal/myrmidon/src/main/org/apache/tools/ant/types/DirectoryScanner.java index ac6496e5d..d426431f3 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/types/DirectoryScanner.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/types/DirectoryScanner.java @@ -9,7 +9,6 @@ package org.apache.tools.ant.types; import java.io.File; import java.util.ArrayList; -import java.util.StringTokenizer; import org.apache.myrmidon.api.TaskException; /** diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/types/FileSet.java b/proposal/myrmidon/src/main/org/apache/tools/ant/types/FileSet.java index 0087d200d..21f9aee9c 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/types/FileSet.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/types/FileSet.java @@ -7,11 +7,6 @@ */ package org.apache.tools.ant.types; -import java.io.File; -import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.framework.Pattern; -import org.apache.myrmidon.framework.PatternSet; - /** * Moved out of MatchingTask to make it a standalone object that could be * referenced (by scripts for example). diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/types/Path.java b/proposal/myrmidon/src/main/org/apache/tools/ant/types/Path.java index 96bc86992..52c5ebd86 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/types/Path.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/types/Path.java @@ -8,10 +8,7 @@ package org.apache.tools.ant.types; import java.io.File; - - import java.util.ArrayList; - import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.DataType; import org.apache.tools.ant.util.FileUtils; @@ -241,7 +238,8 @@ public class Path final String[] list = list(); // empty path return empty string - if( list.length == 0 ) { + if( list.length == 0 ) + { return ""; } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/types/PathElement.java b/proposal/myrmidon/src/main/org/apache/tools/ant/types/PathElement.java index 28a6e8acb..dd6317e65 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/types/PathElement.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/types/PathElement.java @@ -8,9 +8,8 @@ package org.apache.tools.ant.types; import java.io.File; -import org.apache.tools.ant.util.FileUtils; - import org.apache.myrmidon.api.TaskException; +import org.apache.tools.ant.util.FileUtils; /** * Helper class, holds <> values. @@ -31,11 +30,11 @@ class PathElement } protected String[] getParts( final File baseDirectory ) - throws TaskException + throws TaskException { - if ( m_location != null ) + if( m_location != null ) { - return new String[] { m_location }; + return new String[]{m_location}; } return FileUtils.translatePath( baseDirectory, m_path ); } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/types/PathUtil.java b/proposal/myrmidon/src/main/org/apache/tools/ant/types/PathUtil.java index b9419d3d7..98cdfc135 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/types/PathUtil.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/types/PathUtil.java @@ -7,9 +7,9 @@ */ package org.apache.tools.ant.types; -import java.net.URL; import java.io.File; import java.io.IOException; +import java.net.URL; import java.util.Locale; import org.apache.myrmidon.api.TaskException; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/types/ScannerUtil.java b/proposal/myrmidon/src/main/org/apache/tools/ant/types/ScannerUtil.java index 59b284892..23abd7680 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/types/ScannerUtil.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/types/ScannerUtil.java @@ -13,7 +13,6 @@ import java.util.StringTokenizer; import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.PatternUtil; -import org.apache.myrmidon.framework.PatternSet; import org.apache.tools.ant.taskdefs.archive.TarFileSet; import org.apache.tools.ant.taskdefs.archive.ZipFileSet; import org.apache.tools.ant.taskdefs.archive.ZipScanner; @@ -600,7 +599,7 @@ public class ScannerUtil { final ZipScanner scanner = new ZipScanner(); scanner.setSrc( src ); - set.setDir( null ); + set.setDir( null ); setupDirectoryScanner( set, scanner, null ); scanner.init(); return scanner; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/types/SysProperties.java b/proposal/myrmidon/src/main/org/apache/tools/ant/types/SysProperties.java index 31165062c..b3712a118 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/types/SysProperties.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/types/SysProperties.java @@ -10,8 +10,8 @@ package org.apache.tools.ant.types; import java.util.ArrayList; import java.util.Iterator; import java.util.Properties; -import org.apache.myrmidon.api.TaskException; import org.apache.aut.nativelib.ExecException; +import org.apache.myrmidon.api.TaskException; /** * Specialized EnvironmentData class for System properties @@ -55,7 +55,8 @@ public class SysProperties throw new TaskException( ee.getMessage(), ee ); } - if( props == null ) { + if( props == null ) + { return null; } @@ -83,7 +84,8 @@ public class SysProperties public void restoreSystem() throws TaskException { - if( m_system == null ) { + if( m_system == null ) + { throw new TaskException( "Unbalanced nesting of SysProperties" ); } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/util/FileUtils.java b/proposal/myrmidon/src/main/org/apache/tools/ant/util/FileUtils.java index 576f7a05e..d7cd24663 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/util/FileUtils.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/util/FileUtils.java @@ -385,7 +385,8 @@ public class FileUtils */ public static String translateFile( final String source ) { - if( source == null ) { + if( source == null ) + { return ""; } @@ -423,7 +424,8 @@ public class FileUtils throws TaskException { final ArrayList result = new ArrayList(); - if( source == null ) { + if( source == null ) + { return new String[ 0 ]; } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/util/depend/Dependencies.java b/proposal/myrmidon/src/main/org/apache/tools/ant/util/depend/Dependencies.java index ace1fc7c6..2e8aae531 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/util/depend/Dependencies.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/util/depend/Dependencies.java @@ -14,13 +14,10 @@ import java.util.Iterator; import java.util.Set; import java.util.StringTokenizer; import java.util.TreeSet; - -import org.apache.bcel.classfile.Visitor; -import org.apache.bcel.classfile.ConstantPool; -import org.apache.bcel.classfile.JavaClass; import org.apache.bcel.classfile.ClassParser; import org.apache.bcel.classfile.Code; import org.apache.bcel.classfile.CodeException; +import org.apache.bcel.classfile.Constant; import org.apache.bcel.classfile.ConstantClass; import org.apache.bcel.classfile.ConstantDouble; import org.apache.bcel.classfile.ConstantFieldref; @@ -30,7 +27,7 @@ import org.apache.bcel.classfile.ConstantInterfaceMethodref; import org.apache.bcel.classfile.ConstantLong; import org.apache.bcel.classfile.ConstantMethodref; import org.apache.bcel.classfile.ConstantNameAndType; -import org.apache.bcel.classfile.Constant; +import org.apache.bcel.classfile.ConstantPool; import org.apache.bcel.classfile.ConstantString; import org.apache.bcel.classfile.ConstantUtf8; import org.apache.bcel.classfile.ConstantValue; @@ -39,16 +36,18 @@ import org.apache.bcel.classfile.ExceptionTable; import org.apache.bcel.classfile.Field; import org.apache.bcel.classfile.InnerClass; import org.apache.bcel.classfile.InnerClasses; -import org.apache.bcel.classfile.Method; +import org.apache.bcel.classfile.JavaClass; import org.apache.bcel.classfile.LineNumber; import org.apache.bcel.classfile.LineNumberTable; import org.apache.bcel.classfile.LocalVariable; import org.apache.bcel.classfile.LocalVariableTable; +import org.apache.bcel.classfile.Method; import org.apache.bcel.classfile.SourceFile; import org.apache.bcel.classfile.StackMap; import org.apache.bcel.classfile.StackMapEntry; import org.apache.bcel.classfile.Synthetic; import org.apache.bcel.classfile.Unknown; +import org.apache.bcel.classfile.Visitor; public class Dependencies implements Visitor { @@ -96,7 +95,8 @@ public class Dependencies implements Visitor for( int i = o; i < args.length; i++ ) { String fileName = args[ i ].substring( 0, args[ i ].length() - ".class".length() ); - if( base != null && fileName.startsWith( base ) ) { + if( base != null && fileName.startsWith( base ) ) + { fileName = fileName.substring( base.length() ); } newSet.add( fileName ); @@ -128,7 +128,8 @@ public class Dependencies implements Visitor public boolean accept( Object object ) { String fileName = object + ".class"; - if( base != null ) { + if( base != null ) + { fileName = base + fileName; } return new File( fileName ).exists(); @@ -213,7 +214,8 @@ public class Dependencies implements Visitor public void visitConstantPool( ConstantPool obj ) { - if( verbose ) { + if( verbose ) + { System.out.println( "visit ConstantPool" ); } this.constantPool = obj; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpMatcher.java b/proposal/myrmidon/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpMatcher.java index 8c3f7f666..14b2bc26c 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpMatcher.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpMatcher.java @@ -124,13 +124,16 @@ public class JakartaRegexpMatcher implements RegexpMatcher { int cOptions = RE.MATCH_NORMAL; - if( RegexpUtil.hasFlag( options, MATCH_CASE_INSENSITIVE ) ) { + if( RegexpUtil.hasFlag( options, MATCH_CASE_INSENSITIVE ) ) + { cOptions |= RE.MATCH_CASEINDEPENDENT; } - if( RegexpUtil.hasFlag( options, MATCH_MULTILINE ) ) { + if( RegexpUtil.hasFlag( options, MATCH_MULTILINE ) ) + { cOptions |= RE.MATCH_MULTILINE; } - if( RegexpUtil.hasFlag( options, MATCH_SINGLELINE ) ) { + if( RegexpUtil.hasFlag( options, MATCH_SINGLELINE ) ) + { cOptions |= RE.MATCH_SINGLELINE; } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpRegexp.java b/proposal/myrmidon/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpRegexp.java index 343fa5483..a5f3d6c31 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpRegexp.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpRegexp.java @@ -71,7 +71,8 @@ public class JakartaRegexpRegexp extends JakartaRegexpMatcher implements Regexp protected int getSubsOptions( int options ) { int subsOptions = RE.REPLACE_FIRSTONLY; - if( RegexpUtil.hasFlag( options, REPLACE_ALL ) ) { + if( RegexpUtil.hasFlag( options, REPLACE_ALL ) ) + { subsOptions = RE.REPLACE_ALL; } return subsOptions; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpMatcher.java b/proposal/myrmidon/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpMatcher.java index dbefcecf9..f9c085fe7 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpMatcher.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpMatcher.java @@ -148,13 +148,16 @@ public class Jdk14RegexpMatcher implements RegexpMatcher { int cOptions = 0; - if( RegexpUtil.hasFlag( options, MATCH_CASE_INSENSITIVE ) ) { + if( RegexpUtil.hasFlag( options, MATCH_CASE_INSENSITIVE ) ) + { cOptions |= Pattern.CASE_INSENSITIVE; } - if( RegexpUtil.hasFlag( options, MATCH_MULTILINE ) ) { + if( RegexpUtil.hasFlag( options, MATCH_MULTILINE ) ) + { cOptions |= Pattern.MULTILINE; } - if( RegexpUtil.hasFlag( options, MATCH_SINGLELINE ) ) { + if( RegexpUtil.hasFlag( options, MATCH_SINGLELINE ) ) + { cOptions |= Pattern.DOTALL; } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpRegexp.java b/proposal/myrmidon/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpRegexp.java index f41e6f620..d73cbe3bd 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpRegexp.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpRegexp.java @@ -91,7 +91,8 @@ public class Jdk14RegexpRegexp extends Jdk14RegexpMatcher implements Regexp protected int getSubsOptions( int options ) { int subsOptions = REPLACE_FIRST; - if( RegexpUtil.hasFlag( options, REPLACE_ALL ) ) { + if( RegexpUtil.hasFlag( options, REPLACE_ALL ) ) + { subsOptions = REPLACE_ALL; } return subsOptions; diff --git a/proposal/myrmidon/src/main/org/apache/tools/mail/MailMessage.java b/proposal/myrmidon/src/main/org/apache/tools/mail/MailMessage.java index 95cca6652..228811992 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/mail/MailMessage.java +++ b/proposal/myrmidon/src/main/org/apache/tools/mail/MailMessage.java @@ -373,13 +373,16 @@ public class MailMessage void disconnect() throws IOException { - if( out != null ) { + if( out != null ) + { out.close(); } - if( in != null ) { + if( in != null ) + { in.close(); } - if( socket != null ) { + if( socket != null ) + { socket.close(); } } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/Project.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/Project.java index d2e86f2f9..455e57744 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/Project.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/Project.java @@ -96,7 +96,8 @@ public class Project */ public String getProperty( String name ) { - if( name == null ) { + if( name == null ) + { return null; } String property = (String)properties.get( name ); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Available.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Available.java index 1dd22b319..2ffea86c0 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Available.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Available.java @@ -11,10 +11,8 @@ import java.io.File; import java.net.URL; import java.net.URLClassLoader; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.AbstractTask; import org.apache.tools.ant.Task; import org.apache.tools.ant.taskdefs.condition.Condition; - import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.PathUtil; @@ -55,13 +53,13 @@ public class Available public void addClasspath( Path classpath ) throws TaskException { - if ( m_classpath == null ) + if( m_classpath == null ) { m_classpath = classpath; } else { - m_classpath.addPath(classpath); + m_classpath.addPath( classpath ); } } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Checksum.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Checksum.java index 09b5e4ce8..1c47537cc 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Checksum.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Checksum.java @@ -11,9 +11,9 @@ import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; -import java.io.InputStreamReader; import java.io.IOException; import java.io.InputStream; +import java.io.InputStreamReader; import java.security.DigestInputStream; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; @@ -23,7 +23,6 @@ import java.util.Enumeration; import java.util.Hashtable; import org.apache.avalon.excalibur.io.IOUtil; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.AbstractTask; import org.apache.tools.ant.taskdefs.condition.Condition; import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.types.FileSet; @@ -285,7 +284,6 @@ public class Checksum final byte[] fileDigest = buildDigest( fis ); IOUtil.shutdownStream( fis ); - String checksum = ""; for( int i = 0; i < fileDigest.length; i++ ) { diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/ConditionTask.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/ConditionTask.java index b7d9eb1b0..de252f57a 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/ConditionTask.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/ConditionTask.java @@ -8,7 +8,6 @@ package org.apache.tools.ant.taskdefs; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.AbstractTask; import org.apache.tools.ant.taskdefs.condition.Condition; import org.apache.tools.ant.taskdefs.condition.ConditionBase; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/DependSet.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/DependSet.java index 4a0caa3a1..c91806149 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/DependSet.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/DependSet.java @@ -11,8 +11,8 @@ import java.io.File; import java.util.ArrayList; import java.util.Date; import java.util.Iterator; -import org.apache.myrmidon.api.TaskException; import org.apache.aut.nativelib.Os; +import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.types.FileList; import org.apache.tools.ant.types.FileSet; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/ExecuteJava.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/ExecuteJava.java index 434d96162..95f5ec73d 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/ExecuteJava.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/ExecuteJava.java @@ -14,8 +14,8 @@ import java.net.URLClassLoader; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.Path; -import org.apache.tools.ant.types.SysProperties; import org.apache.tools.ant.types.PathUtil; +import org.apache.tools.ant.types.SysProperties; /* * @author thomas.haas@softwired-inc.com diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Get.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Get.java index 330e797c0..d0d087cf9 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Get.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Get.java @@ -239,7 +239,8 @@ public class Get extends Task if( is == null ) { getLogger().info( "Can't get " + source + " to " + dest ); - if( ignoreErrors ) { + if( ignoreErrors ) + { return; } throw new TaskException( "Can't get " + source + " to " + dest ); @@ -251,11 +252,13 @@ public class Get extends Task while( ( length = is.read( buffer ) ) >= 0 ) { fos.write( buffer, 0, length ); - if( verbose ) { + if( verbose ) + { System.out.print( "." ); } } - if( verbose ) { + if( verbose ) + { System.out.println(); } fos.close(); @@ -282,7 +285,8 @@ public class Get extends Task catch( IOException ioe ) { getLogger().info( "Error getting " + source + " to " + dest ); - if( ignoreErrors ) { + if( ignoreErrors ) + { return; } throw new TaskException( "Error", ioe ); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Input.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Input.java index fe2dda378..1b8cf707c 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Input.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Input.java @@ -13,7 +13,6 @@ import java.io.InputStreamReader; import java.util.ArrayList; import java.util.StringTokenizer; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.AbstractTask; import org.apache.tools.ant.Task; /** diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Java.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Java.java index 1fcd89bbb..c15e9bfe2 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Java.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Java.java @@ -11,6 +11,7 @@ import java.io.File; import java.io.IOException; import java.io.PrintStream; import java.util.ArrayList; +import org.apache.aut.nativelib.ExecManager; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.taskdefs.exec.Execute2; @@ -19,7 +20,6 @@ import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.CommandlineJava; import org.apache.tools.ant.types.EnvironmentVariable; import org.apache.tools.ant.types.Path; -import org.apache.aut.nativelib.ExecManager; /** * This task acts as a loader for java applications but allows to use the same diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Javac.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Javac.java index db9cce286..252d37cb8 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Javac.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Javac.java @@ -10,16 +10,16 @@ package org.apache.tools.ant.taskdefs; import java.io.File; import java.util.ArrayList; import java.util.Iterator; +import org.apache.aut.nativelib.Os; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.JavaVersion; -import org.apache.aut.nativelib.Os; -import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.taskdefs.compilers.CompilerAdapter; import org.apache.tools.ant.taskdefs.compilers.CompilerAdapterFactory; import org.apache.tools.ant.types.Argument; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.types.Path; -import org.apache.tools.ant.util.mappers.GlobPatternMapper; import org.apache.tools.ant.types.SourceFileScanner; +import org.apache.tools.ant.util.mappers.GlobPatternMapper; /** * Task to compile Java source files. This task can take the following diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/PathConvert.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/PathConvert.java index a9eda7d20..9348b6c3b 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/PathConvert.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/PathConvert.java @@ -10,7 +10,6 @@ package org.apache.tools.ant.taskdefs; import java.io.File; import java.util.ArrayList; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.AbstractTask; import org.apache.tools.ant.Task; import org.apache.tools.ant.types.Path; @@ -150,7 +149,8 @@ public class PathConvert extends Task elem = elem.replace( fromDirSep, toDirSep ); - if( i != 0 ) { + if( i != 0 ) + { rslt.append( m_pathSep ); } rslt.append( elem ); @@ -212,17 +212,20 @@ public class PathConvert extends Task throws TaskException { - if( m_path == null ) { + if( m_path == null ) + { throw new TaskException( "You must specify a path to convert" ); } - if( m_property == null ) { + if( m_property == null ) + { throw new TaskException( "You must specify a property" ); } // Must either have a target OS or both a dirSep and pathSep - if( m_targetOS == null && m_pathSep == null && m_dirSep == null ) { + if( m_targetOS == null && m_pathSep == null && m_dirSep == null ) + { throw new TaskException( "You must specify at least one of targetOS, dirSep, or pathSep" ); } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Property.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Property.java index 39adf76b7..7928ba740 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Property.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Property.java @@ -15,7 +15,6 @@ import java.net.URLClassLoader; import java.util.Iterator; import java.util.Properties; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.AbstractTask; import org.apache.tools.ant.Task; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.PathUtil; @@ -82,7 +81,8 @@ public class Property getContext().setProperty( name, value ); } - if( m_resource != null ) { + if( m_resource != null ) + { loadResource( m_resource ); } } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Recorder.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Recorder.java index fc2833c7f..1c41a2b1d 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Recorder.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Recorder.java @@ -13,9 +13,9 @@ import java.io.IOException; import java.io.PrintStream; import java.util.Hashtable; import org.apache.myrmidon.api.TaskException; +import org.apache.myrmidon.framework.LogLevel; import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; -import org.apache.myrmidon.framework.LogLevel; /** * This task is the manager for RecorderEntry's. It is this class that holds all diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Rmic.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Rmic.java index 5fd1ffe1c..a1ae90238 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Rmic.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Rmic.java @@ -9,19 +9,19 @@ package org.apache.tools.ant.taskdefs; import java.io.File; import java.io.IOException; -import java.net.URLClassLoader; import java.net.URL; +import java.net.URLClassLoader; import java.rmi.Remote; import java.util.ArrayList; import org.apache.avalon.excalibur.io.FileUtil; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.taskdefs.rmic.RmicAdapter; import org.apache.tools.ant.taskdefs.rmic.RmicAdapterFactory; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.types.Path; -import org.apache.tools.ant.util.mappers.FileNameMapper; -import org.apache.tools.ant.types.SourceFileScanner; import org.apache.tools.ant.types.PathUtil; +import org.apache.tools.ant.types.SourceFileScanner; +import org.apache.tools.ant.util.mappers.FileNameMapper; /** * Task to compile RMI stubs and skeletons. This task can take the following diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/SQLExec.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/SQLExec.java index 871806cd7..e45fddae6 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/SQLExec.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/SQLExec.java @@ -18,8 +18,8 @@ import java.io.InputStreamReader; import java.io.PrintStream; import java.io.Reader; import java.io.StringReader; -import java.net.URLClassLoader; import java.net.URL; +import java.net.URLClassLoader; import java.sql.Connection; import java.sql.DatabaseMetaData; import java.sql.Driver; @@ -33,8 +33,8 @@ import java.util.Iterator; import java.util.Properties; import java.util.StringTokenizer; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.Task; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.types.EnumeratedAttribute; import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.Path; @@ -469,7 +469,8 @@ public class SQLExec throw new SQLException( "No suitable Driver for " + url ); } - if( !isValidRdbms( conn ) ) { + if( !isValidRdbms( conn ) ) + { return; } @@ -565,7 +566,8 @@ public class SQLExec */ protected boolean isValidRdbms( Connection conn ) { - if( rdbms == null && version == null ) { + if( rdbms == null && version == null ) + { return true; } @@ -620,7 +622,8 @@ public class SQLExec throws SQLException { // Check and ignore empty statements - if( "".equals( sql.trim() ) ) { + if( "".equals( sql.trim() ) ) + { return; } @@ -651,7 +654,8 @@ public class SQLExec catch( SQLException e ) { getLogger().error( "Failed to execute: " + sql ); - if( !onError.equals( "continue" ) ) { + if( !onError.equals( "continue" ) ) + { throw e; } getLogger().error( e.toString() ); @@ -731,10 +735,12 @@ public class SQLExec { line = line.trim(); line = "" + resolveValue( line ); - if( line.startsWith( "//" ) ) { + if( line.startsWith( "//" ) ) + { continue; } - if( line.startsWith( "--" ) ) { + if( line.startsWith( "--" ) ) + { continue; } StringTokenizer st = new StringTokenizer( line ); @@ -753,7 +759,8 @@ public class SQLExec // SQL defines "--" as a comment to EOL // and in Oracle it may contain a hint // so we cannot just remove it, instead we must end it - if( line.indexOf( "--" ) >= 0 ) { + if( line.indexOf( "--" ) >= 0 ) + { sql += "\n"; } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Tstamp.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Tstamp.java index eb87ad308..3a5353309 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Tstamp.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Tstamp.java @@ -18,7 +18,6 @@ import java.util.NoSuchElementException; import java.util.StringTokenizer; import java.util.TimeZone; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.AbstractTask; import org.apache.tools.ant.Task; import org.apache.tools.ant.types.EnumeratedAttribute; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/UpToDate.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/UpToDate.java index 2e42a08ce..54fd094d8 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/UpToDate.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/UpToDate.java @@ -11,15 +11,14 @@ import java.io.File; import java.util.ArrayList; import java.util.Iterator; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.AbstractTask; -import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.taskdefs.condition.Condition; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.types.FileSet; -import org.apache.tools.ant.util.mappers.Mapper; +import org.apache.tools.ant.types.ScannerUtil; +import org.apache.tools.ant.types.SourceFileScanner; import org.apache.tools.ant.util.mappers.FileNameMapper; +import org.apache.tools.ant.util.mappers.Mapper; import org.apache.tools.ant.util.mappers.MergingMapper; -import org.apache.tools.ant.types.SourceFileScanner; -import org.apache.tools.ant.types.ScannerUtil; /** * Will set the given property if the specified target has a timestamp greater @@ -121,7 +120,8 @@ public class UpToDate extends MatchingTask implements Condition } // if not there then it can't be up to date - if( _targetFile != null && !_targetFile.exists() ) { + if( _targetFile != null && !_targetFile.exists() ) + { return false; } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/WaitFor.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/WaitFor.java index 5ba60368e..5ee5e37a4 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/WaitFor.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/WaitFor.java @@ -9,7 +9,6 @@ package org.apache.tools.ant.taskdefs; import java.util.Hashtable; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.AbstractTask; import org.apache.tools.ant.taskdefs.condition.Condition; import org.apache.tools.ant.taskdefs.condition.ConditionBase; import org.apache.tools.ant.types.EnumeratedAttribute; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Ear.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Ear.java index 9693574cd..dfeb35551 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Ear.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Ear.java @@ -9,8 +9,8 @@ package org.apache.tools.ant.taskdefs.archive; import java.io.File; import java.io.IOException; -import org.apache.myrmidon.api.TaskException; import org.apache.aut.zip.ZipOutputStream; +import org.apache.myrmidon.api.TaskException; /** * Creates a EAR archive. Based on WAR task diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Jar.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Jar.java index fc0545817..a7d8fdd08 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Jar.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Jar.java @@ -20,11 +20,11 @@ import java.io.Reader; import java.util.Enumeration; import java.util.Iterator; import java.util.zip.ZipFile; +import org.apache.aut.zip.ZipOutputStream; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.types.FileScanner; import org.apache.tools.ant.taskdefs.Manifest; import org.apache.tools.ant.taskdefs.ManifestException; -import org.apache.aut.zip.ZipOutputStream; +import org.apache.tools.ant.types.FileScanner; /** * Creates a JAR archive. diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Tar.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Tar.java index c2a326b11..202b4e5dd 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Tar.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Tar.java @@ -17,10 +17,10 @@ import org.apache.aut.tar.TarEntry; import org.apache.aut.tar.TarOutputStream; import org.apache.avalon.excalibur.io.IOUtil; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.types.SourceFileScanner; +import org.apache.tools.ant.taskdefs.MatchingTask; import org.apache.tools.ant.types.ScannerUtil; +import org.apache.tools.ant.types.SourceFileScanner; import org.apache.tools.ant.util.mappers.MergingMapper; -import org.apache.tools.ant.taskdefs.MatchingTask; /** * Creates a TAR archive. diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/War.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/War.java index 6907a213e..2b906c3da 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/War.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/War.java @@ -9,8 +9,8 @@ package org.apache.tools.ant.taskdefs.archive; import java.io.File; import java.io.IOException; -import org.apache.myrmidon.api.TaskException; import org.apache.aut.zip.ZipOutputStream; +import org.apache.myrmidon.api.TaskException; /** * Creates a WAR archive. @@ -41,7 +41,7 @@ public class War throw new TaskException( message ); } - addFileAs(descr, "WEB-INF/web.xml" ); + addFileAs( descr, "WEB-INF/web.xml" ); } public void addClasses( final ZipFileSet fs ) diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Zip.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Zip.java index 1403d66e5..5ae0126d1 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Zip.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Zip.java @@ -22,15 +22,15 @@ import java.util.zip.CRC32; import java.util.zip.ZipInputStream; import org.apache.aut.zip.ZipEntry; import org.apache.aut.zip.ZipOutputStream; +import org.apache.avalon.excalibur.io.IOUtil; import org.apache.myrmidon.api.TaskException; +import org.apache.tools.ant.taskdefs.MatchingTask; import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.types.FileScanner; import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.ScannerUtil; import org.apache.tools.ant.types.SourceFileScanner; import org.apache.tools.ant.util.mappers.MergingMapper; -import org.apache.tools.ant.taskdefs.MatchingTask; -import org.apache.avalon.excalibur.io.IOUtil; /** * Create a ZIP archive. diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java index 4b87f7295..182094591 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java @@ -11,6 +11,7 @@ import java.io.File; import java.io.FileWriter; import java.io.IOException; import java.io.PrintWriter; +import org.apache.aut.nativelib.ExecManager; import org.apache.avalon.excalibur.io.IOUtil; import org.apache.avalon.excalibur.util.StringUtil; import org.apache.avalon.framework.logger.AbstractLogEnabled; @@ -21,7 +22,6 @@ import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.PathUtil; import org.apache.tools.ant.util.FileUtils; -import org.apache.aut.nativelib.ExecManager; /** * This is the default implementation for the CompilerAdapter interface. diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/Jikes.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/Jikes.java index f1e9b5a14..fe50cf976 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/Jikes.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/Jikes.java @@ -83,7 +83,8 @@ public class Jikes Commandline cmd = new Commandline(); cmd.setExecutable( "jikes" ); - if( m_deprecation == true ) { + if( m_deprecation == true ) + { cmd.addArgument( "-deprecation" ); } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/exec/ExecTask.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/exec/ExecTask.java index 65d15584e..72e4a2f8f 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/exec/ExecTask.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/exec/ExecTask.java @@ -18,7 +18,6 @@ import java.util.Iterator; import java.util.Properties; import org.apache.avalon.excalibur.util.StringUtil; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.AbstractTask; import org.apache.tools.ant.Task; import org.apache.tools.ant.types.Argument; import org.apache.tools.ant.types.Commandline; @@ -316,10 +315,12 @@ public class ExecTask { try { - if( m_ouput != null ) { + if( m_ouput != null ) + { m_ouput.close(); } - if( m_byteArrayOutput != null ) { + if( m_byteArrayOutput != null ) + { m_byteArrayOutput.close(); } } @@ -350,8 +351,9 @@ public class ExecTask throws TaskException { // default directory to the project's base directory - if( m_workingDirectory == null ) { - m_workingDirectory = getBaseDirectory(); + if( m_workingDirectory == null ) + { + m_workingDirectory = getBaseDirectory(); } // show the command getLogger().debug( m_command.toString() ); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/exec/ExecuteOn.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/exec/ExecuteOn.java index 68e1a3787..f722f44c5 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/exec/ExecuteOn.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/exec/ExecuteOn.java @@ -13,12 +13,11 @@ import java.util.ArrayList; import java.util.Hashtable; import org.apache.avalon.excalibur.util.StringUtil; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.AbstractTask; import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.Marker; -import org.apache.tools.ant.types.SourceFileScanner; import org.apache.tools.ant.types.ScannerUtil; +import org.apache.tools.ant.types.SourceFileScanner; import org.apache.tools.ant.util.mappers.FileNameMapper; import org.apache.tools.ant.util.mappers.Mapper; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Move.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Move.java index 63b03387a..3d72024ba 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Move.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Move.java @@ -50,7 +50,8 @@ public class Move throws TaskException { String[] list = d.list(); - if( list == null ) { + if( list == null ) + { return; }// on an io error list() can return null @@ -225,7 +226,8 @@ public class Move protected boolean okToDelete( File d ) { String[] list = d.list(); - if( list == null ) { + if( list == null ) + { return false; }// maybe io error? @@ -235,7 +237,8 @@ public class Move File f = new File( d, s ); if( f.isDirectory() ) { - if( !okToDelete( f ) ) { + if( !okToDelete( f ) ) + { return false; } } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java index bdbaf48ba..cbc329cc7 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java @@ -15,19 +15,19 @@ import java.io.PrintWriter; import java.util.ArrayList; import java.util.Iterator; import java.util.StringTokenizer; +import org.apache.aut.nativelib.ExecManager; +import org.apache.aut.nativelib.ExecOutputHandler; +import org.apache.aut.nativelib.Os; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.Pattern; -import org.apache.aut.nativelib.Os; -import org.apache.aut.nativelib.ExecOutputHandler; -import org.apache.aut.nativelib.ExecManager; -import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.Task; -import org.apache.tools.ant.util.FileUtils; import org.apache.tools.ant.taskdefs.exec.Execute2; import org.apache.tools.ant.types.Commandline; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.ScannerUtil; +import org.apache.tools.ant.util.FileUtils; /** * This task makes it easy to generate Javadoc documentation for a collection of @@ -567,17 +567,19 @@ public class Javadoc // Build the classpath to pass to Javadoc Path classpath = new Path(); classpath.addPath( m_sourcePath ); - if ( m_classpath != null ) + if( m_classpath != null ) { classpath.addPath( m_classpath ); } cmd.addArgument( "-classpath" ); cmd.addArgument( classpath.toString() ); - if( m_version && m_doclet == null ) { + if( m_version && m_doclet == null ) + { cmd.addArgument( "-version" ); } - if( m_author && m_doclet == null ) { + if( m_author && m_doclet == null ) + { cmd.addArgument( "-author" ); } @@ -938,7 +940,8 @@ public class Javadoc ArrayList addedPackages = new ArrayList(); String[] list = sourcePath.list(); - if( list == null ) { + if( list == null ) + { list = new String[ 0 ]; } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ANTLR.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ANTLR.java index ae16782f5..33144dd01 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ANTLR.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ANTLR.java @@ -12,15 +12,15 @@ import java.io.File; import java.io.FileReader; import java.io.IOException; import java.net.URL; +import org.apache.aut.nativelib.ExecManager; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.Task; import org.apache.tools.ant.taskdefs.ExecuteJava; import org.apache.tools.ant.taskdefs.exec.Execute2; import org.apache.tools.ant.types.Argument; +import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.CommandlineJava; import org.apache.tools.ant.types.Path; -import org.apache.tools.ant.types.Commandline; -import org.apache.aut.nativelib.ExecManager; /** * ANTLR task. diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Cab.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Cab.java index c5a41097b..8cb2aa241 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Cab.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Cab.java @@ -14,13 +14,13 @@ import java.io.OutputStream; import java.io.PrintWriter; import java.util.ArrayList; import java.util.Iterator; -import org.apache.aut.nativelib.Os; import org.apache.aut.nativelib.ExecManager; +import org.apache.aut.nativelib.Os; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.taskdefs.MatchingTask; import org.apache.tools.ant.taskdefs.exec.Execute2; import org.apache.tools.ant.types.Commandline; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.ScannerUtil; @@ -198,7 +198,8 @@ public class Cab { String file = files.get( i ).toString(); if( new File( m_baseDir, file ).lastModified() > - m_cabFile.lastModified() ) { + m_cabFile.lastModified() ) + { upToDate = false; } } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Entry.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Entry.java index 463592b64..31952e596 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Entry.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Entry.java @@ -159,7 +159,8 @@ public class Entry GregorianCalendar value = new GregorianCalendar(); GregorianCalendar newValue = new GregorianCalendar(); - if( m_pattern == null ) { + if( m_pattern == null ) + { m_pattern = "yyyy/MM/dd HH:mm"; } DateFormat fmt = new SimpleDateFormat( m_pattern ); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Javah.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Javah.java index bfa2cb542..c0a151f01 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Javah.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Javah.java @@ -12,9 +12,8 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.StringTokenizer; import org.apache.avalon.excalibur.util.StringUtil; - -import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.AbstractTask; +import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.util.FileUtils; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/NetRexxC.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/NetRexxC.java index 0d5368b07..dbb7c0742 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/NetRexxC.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/NetRexxC.java @@ -20,8 +20,8 @@ import netrexx.lang.Rexx; import org.apache.avalon.excalibur.io.FileUtil; import org.apache.avalon.excalibur.util.StringUtil; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.taskdefs.MatchingTask; +import org.apache.tools.ant.types.DirectoryScanner; /** * Task to compile NetRexx source files. This task can take the following @@ -169,7 +169,8 @@ public class NetRexxC extends MatchingTask public void setCompile( boolean compile ) { this.compile = compile; - if( !this.compile && !this.keep ) { + if( !this.compile && !this.keep ) + { this.keep = true; } } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Script.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Script.java index ca7052b13..87b019a65 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Script.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Script.java @@ -46,7 +46,8 @@ public class Script extends Task public void setSrc( String fileName ) { File file = new File( fileName ); - if( !file.exists() ) { + if( !file.exists() ) + { throw new TaskException( "file " + fileName + " not found." ); } @@ -140,11 +141,13 @@ public class Script extends Task boolean isValid = key.length() > 0 && Character.isJavaIdentifierStart( key.charAt( 0 ) ); - for( int i = 1; isValid && i < key.length(); i++ ) { + for( int i = 1; isValid && i < key.length(); i++ ) + { isValid = Character.isJavaIdentifierPart( key.charAt( i ) ); } - if( isValid ) { + if( isValid ) + { beans.put( key, dictionary.get( key ) ); } } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java index 271e726b6..76eb81c33 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java @@ -7,8 +7,8 @@ */ package org.apache.tools.ant.taskdefs.optional.ccm; -import org.apache.myrmidon.api.TaskException; import org.apache.aut.nativelib.ExecOutputHandler; +import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.types.Commandline; /** diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java index 956f14368..81539cec0 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java @@ -9,10 +9,10 @@ package org.apache.tools.ant.taskdefs.optional.ccm; import java.io.File; import java.io.IOException; +import org.apache.aut.nativelib.ExecManager; +import org.apache.aut.nativelib.ExecOutputHandler; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; -import org.apache.aut.nativelib.ExecOutputHandler; -import org.apache.aut.nativelib.ExecManager; import org.apache.tools.ant.taskdefs.exec.Execute2; import org.apache.tools.ant.types.Commandline; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java index 474f2696e..917df8aca 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java @@ -9,11 +9,11 @@ package org.apache.tools.ant.taskdefs.optional.clearcase; import java.io.File; import java.io.IOException; +import org.apache.aut.nativelib.ExecManager; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.Task; import org.apache.tools.ant.taskdefs.exec.Execute2; import org.apache.tools.ant.types.Commandline; -import org.apache.aut.nativelib.ExecManager; /** * A base class for creating tasks for executing commands on ClearCase.

diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/depend/Depend.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/depend/Depend.java index 653135b2d..883c3c00a 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/depend/Depend.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/depend/Depend.java @@ -21,8 +21,8 @@ import java.util.Enumeration; import java.util.Hashtable; import java.util.Iterator; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.taskdefs.MatchingTask; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.PathUtil; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java index af5447d46..7d61dc51a 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java @@ -9,9 +9,9 @@ package org.apache.tools.ant.taskdefs.optional.dotnet; import java.io.File; import org.apache.myrmidon.api.TaskException; +import org.apache.tools.ant.taskdefs.MatchingTask; import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.types.Path; -import org.apache.tools.ant.taskdefs.MatchingTask; // ==================================================================== @@ -420,7 +420,8 @@ public class CSharp throws TaskException { //demand create pathlist - if( _referenceFiles == null ) { + if( _referenceFiles == null ) + { _referenceFiles = new Path(); } _referenceFiles.append( path ); @@ -462,7 +463,8 @@ public class CSharp { _targetType = targetType; } - else { + else + { throw new TaskException( "targetType " + targetType + " is not a valid type" ); } } @@ -650,8 +652,9 @@ public class CSharp public void execute() throws TaskException { - if( _srcDir == null ) { - _srcDir = getBaseDirectory(); + if( _srcDir == null ) + { + _srcDir = getBaseDirectory(); } NetCommand command = new NetCommand( this, "CSC", csc_exe_name ); @@ -710,9 +713,12 @@ public class CSharp */ protected String getAdditionalModulesParameter() { - if( notEmpty( _additionalModules ) ) { + if( notEmpty( _additionalModules ) ) + { return "/addmodule:" + _additionalModules; - } else { + } + else + { return null; } } @@ -740,7 +746,8 @@ public class CSharp s.append( DEFAULT_REFERENCE_LIST ); return new String( s ); } - else { + else + { return null; } } @@ -752,9 +759,12 @@ public class CSharp */ protected String getDefinitionsParameter() { - if( notEmpty( _definitions ) ) { + if( notEmpty( _definitions ) ) + { return "/define:" + _definitions; - } else { + } + else + { return null; } } @@ -766,9 +776,12 @@ public class CSharp */ protected String getDocFileParameter() { - if( _docFile != null ) { + if( _docFile != null ) + { return "/doc:" + _docFile.toString(); - } else { + } + else + { return null; } } @@ -780,9 +793,12 @@ public class CSharp */ protected String getExtraOptionsParameter() { - if( _extraOptions != null && _extraOptions.length() != 0 ) { + if( _extraOptions != null && _extraOptions.length() != 0 ) + { return _extraOptions; - } else { + } + else + { return null; } } @@ -819,9 +835,12 @@ public class CSharp */ protected String getMainClassParameter() { - if( _mainClass != null && _mainClass.length() != 0 ) { + if( _mainClass != null && _mainClass.length() != 0 ) + { return "/main:" + _mainClass; - } else { + } + else + { return null; } } @@ -853,7 +872,8 @@ public class CSharp File f = _outputFile; return "/out:" + f.toString(); } - else { + else + { return null; } } @@ -866,7 +886,8 @@ public class CSharp protected String getReferenceFilesParameter() { //bail on no references - if( _references == null ) { + if( _references == null ) + { return null; } //iterate through the ref list & generate an entry for each @@ -875,7 +896,8 @@ public class CSharp String refpath = _references.toString(); //bail on no references listed - if( refpath.length() == 0 ) { + if( refpath.length() == 0 ) + { return null; } @@ -892,9 +914,12 @@ public class CSharp protected String getReferencesParameter() { //bail on no references - if( notEmpty( _references ) ) { + if( notEmpty( _references ) ) + { return "/reference:" + _references; - } else { + } + else + { return null; } } @@ -906,9 +931,12 @@ public class CSharp */ protected String getTargetTypeParameter() { - if( notEmpty( _targetType ) ) { + if( notEmpty( _targetType ) ) + { return "/target:" + _targetType; - } else { + } + else + { return null; } } @@ -945,9 +973,12 @@ public class CSharp */ protected String getWin32IconParameter() { - if( _win32icon != null ) { + if( _win32icon != null ) + { return "/win32icon:" + _win32icon.toString(); - } else { + } + else + { return null; } } @@ -959,9 +990,12 @@ public class CSharp */ protected String getWin32ResParameter() { - if( _win32res != null ) { + if( _win32res != null ) + { return "/win32res:" + _win32res.toString(); - } else { + } + else + { return null; } } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java index 8014b1a96..34c47fd46 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java @@ -226,7 +226,8 @@ public class Ilasm { _targetType = targetType; } - else { + else + { throw new TaskException( "targetType " + targetType + " is not a valid type" ); } } @@ -306,8 +307,9 @@ public class Ilasm public void execute() throws TaskException { - if( _srcDir == null ) { - _srcDir = getBaseDirectory(); + if( _srcDir == null ) + { + _srcDir = getBaseDirectory(); } //get dependencies list. @@ -375,9 +377,12 @@ public class Ilasm */ protected String getExtraOptionsParameter() { - if( _extraOptions != null && _extraOptions.length() != 0 ) { + if( _extraOptions != null && _extraOptions.length() != 0 ) + { return _extraOptions; - } else { + } + else + { return null; } } @@ -389,9 +394,12 @@ public class Ilasm */ protected String getKeyfileParameter() { - if( _keyfile != null ) { + if( _keyfile != null ) + { return "/keyfile:" + _keyfile.toString(); - } else { + } + else + { return null; } } @@ -413,7 +421,8 @@ public class Ilasm */ protected String getOutputFileParameter() { - if( _outputFile == null || _outputFile.length() == 0 ) { + if( _outputFile == null || _outputFile.length() == 0 ) + { return null; } File f = _outputFile; @@ -440,16 +449,22 @@ public class Ilasm protected String getTargetTypeParameter() { - if( !notEmpty( _targetType ) ) { + if( !notEmpty( _targetType ) ) + { return null; } - if( _targetType.equals( "exe" ) ) { + if( _targetType.equals( "exe" ) ) + { return "/exe"; - } else if( _targetType.equals( "library" ) ) { + } + else if( _targetType.equals( "library" ) ) + { return "/dll"; - } else { + } + else + { return null; - } + } } /** diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java index bda07ed99..e3376e2d1 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java @@ -9,12 +9,12 @@ package org.apache.tools.ant.taskdefs.optional.dotnet;// imports import java.io.File; import java.io.IOException; +import org.apache.aut.nativelib.ExecManager; import org.apache.avalon.framework.logger.AbstractLogEnabled; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.Task; import org.apache.tools.ant.taskdefs.exec.Execute2; import org.apache.tools.ant.types.Commandline; -import org.apache.aut.nativelib.ExecManager; /** * This is a helper class to spawn net commands out. In its initial form it diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java index d31b6b22f..afc441986 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java @@ -16,6 +16,7 @@ import java.io.OutputStream; import java.util.ArrayList; import java.util.Hashtable; import java.util.Iterator; +import org.apache.aut.nativelib.ExecManager; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.taskdefs.Java; import org.apache.tools.ant.taskdefs.exec.Execute2; @@ -24,7 +25,6 @@ import org.apache.tools.ant.types.Argument; import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.util.FileUtils; -import org.apache.aut.nativelib.ExecManager; /** * BorlandDeploymentTool is dedicated to the Borland Application Server 4.5 and diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java index dd1c8e466..2c7ae2c6e 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java @@ -8,13 +8,13 @@ package org.apache.tools.ant.taskdefs.optional.ejb; import java.io.File; +import org.apache.aut.nativelib.ExecManager; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.Task; import org.apache.tools.ant.taskdefs.exec.Execute2; +import org.apache.tools.ant.types.Argument; import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.Path; -import org.apache.tools.ant.types.Argument; -import org.apache.aut.nativelib.ExecManager; /** * BorlandGenerateClient is dedicated to the Borland Application Server 4.5 This diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java index b9b5dc02b..92a65e9ff 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java @@ -9,10 +9,10 @@ package org.apache.tools.ant.taskdefs.optional.ejb; import java.io.File; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.taskdefs.Java; import org.apache.tools.ant.taskdefs.MatchingTask; import org.apache.tools.ant.types.Argument; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.types.Path; /** diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java index f1df04843..40a269dbc 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java @@ -15,8 +15,8 @@ import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.taskdefs.MatchingTask; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.types.EnumeratedAttribute; import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.Path; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java index 68e5d26f2..23f86dae9 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java @@ -9,10 +9,10 @@ package org.apache.tools.ant.taskdefs.optional.ejb; import java.io.File; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.taskdefs.Java; import org.apache.tools.ant.taskdefs.MatchingTask; import org.apache.tools.ant.types.Argument; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.types.Path; /** diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java index 124ecc31e..614b61447 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java @@ -12,8 +12,8 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; -import java.net.URLClassLoader; import java.net.URL; +import java.net.URLClassLoader; import java.util.ArrayList; import java.util.HashSet; import java.util.Hashtable; @@ -26,13 +26,12 @@ import java.util.jar.Manifest; import java.util.zip.ZipEntry; import javax.xml.parsers.SAXParser; import org.apache.avalon.framework.logger.AbstractLogEnabled; - -import org.apache.bcel.classfile.JavaClass; import org.apache.bcel.classfile.ClassParser; +import org.apache.bcel.classfile.JavaClass; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.PathUtil; @@ -608,7 +607,8 @@ public class GenericDeploymentTool while( i.hasNext() ) { String entryName = (String)i.next(); - if( entryName.endsWith( ".class" ) ) { + if( entryName.endsWith( ".class" ) ) + { newSet.add( entryName.substring( 0, entryName.length() - ".class".length() ).replace( File.separatorChar, '/' ) ); } } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java index 3df82e248..7e130174f 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java @@ -12,8 +12,8 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; -import java.net.URLClassLoader; import java.net.URL; +import java.net.URLClassLoader; import java.util.Hashtable; import java.util.Iterator; import java.util.jar.JarEntry; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java index a6013ab61..f944701e9 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java @@ -11,8 +11,8 @@ import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; -import java.net.URLClassLoader; import java.net.URL; +import java.net.URLClassLoader; import java.util.Hashtable; import java.util.Iterator; import java.util.jar.JarEntry; @@ -943,7 +943,8 @@ public class WebsphereDeploymentTool " " + tempdir + " " + destJar.getPath() + " " + getOptions(); - if( getCombinedClasspath() != null && getCombinedClasspath().toString().length() > 0 ) { + if( getCombinedClasspath() != null && getCombinedClasspath().toString().length() > 0 ) + { args += " -cp " + getCombinedClasspath(); } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java index 7451e069a..e7170e11d 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java @@ -20,8 +20,8 @@ import java.util.Hashtable; import java.util.Locale; import org.apache.avalon.excalibur.io.FileUtil; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.taskdefs.MatchingTask; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.ScannerUtil; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java index 988cdf0b3..37e25c0f1 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java @@ -44,7 +44,6 @@ import org.apache.tools.ant.BuildEvent; import org.apache.tools.ant.BuildListener; import org.apache.tools.ant.Project; - /** * This is a simple grafical user interface to provide the information needed by * ANT and to start the build-process within IBM VisualAge for Java.

@@ -1544,31 +1543,38 @@ public class VAJAntToolGUI extends Frame } } // MenuItems - if( e.getSource() == VAJAntToolGUI.this.getSaveMenuItem() ) { + if( e.getSource() == VAJAntToolGUI.this.getSaveMenuItem() ) + { saveBuildInfo(); } - if( e.getSource() == VAJAntToolGUI.this.getAboutMenuItem() ) { + if( e.getSource() == VAJAntToolGUI.this.getAboutMenuItem() ) + { getAboutDialog().show(); } - if( e.getSource() == VAJAntToolGUI.this.getShowLogMenuItem() ) { + if( e.getSource() == VAJAntToolGUI.this.getShowLogMenuItem() ) + { getMessageFrame().show(); } /* * #### About dialog #### */ - if( e.getSource() == VAJAntToolGUI.this.getAboutOkButton() ) { + if( e.getSource() == VAJAntToolGUI.this.getAboutOkButton() ) + { getAboutDialog().dispose(); } /* * #### Log frame #### */ - if( e.getSource() == VAJAntToolGUI.this.getMessageOkButton() ) { + if( e.getSource() == VAJAntToolGUI.this.getMessageOkButton() ) + { getMessageFrame().dispose(); } - if( e.getSource() == VAJAntToolGUI.this.getMessageClearLogButton() ) { + if( e.getSource() == VAJAntToolGUI.this.getMessageClearLogButton() ) + { getMessageTextArea().setText( "" ); } - if( e.getSource() == VAJAntToolGUI.this.getMessageOkButton() ) { + if( e.getSource() == VAJAntToolGUI.this.getMessageOkButton() ) + { getMessageFrame().dispose(); } } @@ -1587,13 +1593,16 @@ public class VAJAntToolGUI extends Frame { try { - if( e.getSource() == VAJAntToolGUI.this.getTargetList() ) { + if( e.getSource() == VAJAntToolGUI.this.getTargetList() ) + { getBuildButton().setEnabled( true ); } - if( e.getSource() == VAJAntToolGUI.this.getMessageOutputLevelChoice() ) { + if( e.getSource() == VAJAntToolGUI.this.getMessageOutputLevelChoice() ) + { getBuildInfo().setOutputMessageLevel( getMessageOutputLevelChoice().getSelectedIndex() ); } - if( e.getSource() == VAJAntToolGUI.this.getTargetList() ) { + if( e.getSource() == VAJAntToolGUI.this.getTargetList() ) + { getBuildInfo().setTarget( getTargetList().getSelectedItem() ); } } @@ -1610,10 +1619,12 @@ public class VAJAntToolGUI extends Frame */ public void propertyChange( java.beans.PropertyChangeEvent evt ) { - if( evt.getSource() == VAJAntToolGUI.this.getBuildInfo() && ( evt.getPropertyName().equals( "projectName" ) ) ) { + if( evt.getSource() == VAJAntToolGUI.this.getBuildInfo() && ( evt.getPropertyName().equals( "projectName" ) ) ) + { connectProjectNameToLabel(); } - if( evt.getSource() == VAJAntToolGUI.this.getBuildInfo() && ( evt.getPropertyName().equals( "buildFileName" ) ) ) { + if( evt.getSource() == VAJAntToolGUI.this.getBuildInfo() && ( evt.getPropertyName().equals( "buildFileName" ) ) ) + { connectBuildFileNameToTextField(); } } @@ -1625,7 +1636,8 @@ public class VAJAntToolGUI extends Frame */ public void textValueChanged( TextEvent e ) { - if( e.getSource() == VAJAntToolGUI.this.getBuildFileTextField() ) { + if( e.getSource() == VAJAntToolGUI.this.getBuildFileTextField() ) + { connectTextFieldToBuildFileName(); } } @@ -1652,10 +1664,12 @@ public class VAJAntToolGUI extends Frame dispose(); System.exit( 0 ); } - if( e.getSource() == VAJAntToolGUI.this.getAboutDialog() ) { + if( e.getSource() == VAJAntToolGUI.this.getAboutDialog() ) + { getAboutDialog().dispose(); } - if( e.getSource() == VAJAntToolGUI.this.getMessageFrame() ) { + if( e.getSource() == VAJAntToolGUI.this.getMessageFrame() ) + { getMessageFrame().dispose(); } } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJExport.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJExport.java index 1fdb9de90..e9592a5c4 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJExport.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJExport.java @@ -8,8 +8,8 @@ package org.apache.tools.ant.taskdefs.optional.ide; import java.io.File; -import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskContext; +import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.Pattern; import org.apache.myrmidon.framework.PatternSet; import org.apache.myrmidon.framework.PatternUtil; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java index e2e969432..4dbf860f7 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java @@ -11,15 +11,14 @@ import java.io.File; import java.io.IOException; import java.util.Enumeration; import java.util.Hashtable; +import org.apache.aut.nativelib.ExecManager; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.Task; import org.apache.tools.ant.taskdefs.exec.Execute2; - +import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.CommandlineJava; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.PathUtil; -import org.apache.tools.ant.types.Commandline; -import org.apache.aut.nativelib.ExecManager; /** * Taskdef for the JJTree compiler compiler. diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java index 58707dc06..9ced6b784 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java @@ -11,17 +11,14 @@ import java.io.File; import java.io.IOException; import java.util.Enumeration; import java.util.Hashtable; +import org.apache.aut.nativelib.ExecManager; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.Task; import org.apache.tools.ant.taskdefs.exec.Execute2; - - +import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.CommandlineJava; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.PathUtil; -import org.apache.tools.ant.types.Commandline; -import org.apache.avalon.excalibur.util.StringUtil; -import org.apache.aut.nativelib.ExecManager; /** * Taskdef for the JavaCC compiler compiler. diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java index 773118415..3479fa374 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java @@ -11,15 +11,14 @@ import java.io.File; import java.io.FileWriter; import java.io.IOException; import java.io.PrintWriter; +import org.apache.aut.nativelib.ExecManager; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.Task; import org.apache.tools.ant.taskdefs.exec.Execute2; - +import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.CommandlineJava; import org.apache.tools.ant.types.Path; -import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.util.FileUtils; -import org.apache.aut.nativelib.ExecManager; /** * Ant task to run JDepend tests.

@@ -234,7 +233,8 @@ public class JDependTask File f = new File( elements[ i ] ); // not necessary as JDepend would fail, but why loose some time? - if( !f.exists() || !f.isDirectory() ) { + if( !f.exists() || !f.isDirectory() ) + { throw new TaskException( "\"" + f.getPath() + "\" does not represent a valid directory. JDepend would fail." ); } commandline.addArgument( f.getPath() ); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java index 696a03e6d..571f23309 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java @@ -11,10 +11,10 @@ import java.io.File; import java.util.ArrayList; import java.util.Date; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.taskdefs.MatchingTask; import org.apache.tools.ant.taskdefs.optional.jsp.compilers.CompilerAdapter; import org.apache.tools.ant.taskdefs.optional.jsp.compilers.CompilerAdapterFactory; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.types.Path; /** @@ -101,9 +101,12 @@ public class JspC extends MatchingTask public void setClasspath( Path cp ) throws TaskException { - if( classpath == null ) { + if( classpath == null ) + { classpath = cp; - } else { + } + else + { classpath.append( cp ); } } @@ -299,7 +302,8 @@ public class JspC extends MatchingTask public Path createClasspath() throws TaskException { - if( classpath == null ) { + if( classpath == null ) + { classpath = new Path(); } Path path1 = classpath; @@ -334,9 +338,11 @@ public class JspC extends MatchingTask // calculate where the files will end up: File dest = null; - if( packageName == null ) { + if( packageName == null ) + { dest = destDir; - } else + } + else { String path = destDir.getPath() + File.separatorChar + packageName.replace( '.', File.separatorChar ); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java index 2febfaf40..b2d7529af 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java @@ -12,11 +12,11 @@ import java.util.ArrayList; import java.util.Date; import java.util.StringTokenizer; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.taskdefs.Java; import org.apache.tools.ant.taskdefs.MatchingTask; -import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.Argument; +import org.apache.tools.ant.types.DirectoryScanner; +import org.apache.tools.ant.types.Path; /** * Class to precompile JSP's using weblogic's jsp compiler (weblogic.jspc) diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java index b4ef1148a..5e455a015 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java @@ -10,8 +10,8 @@ package org.apache.tools.ant.taskdefs.optional.jsp.compilers; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.taskdefs.Java; import org.apache.tools.ant.taskdefs.optional.jsp.JspC; -import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.Argument; +import org.apache.tools.ant.types.Commandline; /** * The implementation of the jasper compiler. This is a cut-and-paste of the @@ -37,12 +37,14 @@ public class JasperC // the project log //FIXME Java java = null;//(Java)( getJspc().getProject() ).createTask( "java" ); - if( getJspc().getClasspath() != null ) { + if( getJspc().getClasspath() != null ) + { java.addClasspath( getJspc().getClasspath() ); } java.setClassname( "org.apache.jasper.JspC" ); String args[] = cmd.getArguments(); - for( int i = 0; i < args.length; i++ ) { + for( int i = 0; i < args.length; i++ ) + { java.addArg( new Argument( args[ i ] ) ); } java.execute(); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java index f0b142f3a..1e3ad0532 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java @@ -13,7 +13,6 @@ import java.util.Arrays; import java.util.Iterator; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.types.DirectoryScanner; - import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.ScannerUtil; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java index f5027ac48..547193dad 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java @@ -19,20 +19,19 @@ import java.util.Hashtable; import java.util.Iterator; import java.util.Properties; import java.util.Random; +import org.apache.aut.nativelib.ExecManager; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.AbstractTask; import org.apache.tools.ant.Task; import org.apache.tools.ant.taskdefs.exec.Execute2; import org.apache.tools.ant.taskdefs.exec.LogOutputStream; import org.apache.tools.ant.types.Argument; +import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.CommandlineJava; import org.apache.tools.ant.types.EnumeratedAttribute; import org.apache.tools.ant.types.EnvironmentVariable; import org.apache.tools.ant.types.Path; -import org.apache.tools.ant.types.SysProperties; import org.apache.tools.ant.types.PathUtil; -import org.apache.tools.ant.types.Commandline; -import org.apache.aut.nativelib.ExecManager; +import org.apache.tools.ant.types.SysProperties; /** * Ant task to run JUnit tests.

@@ -671,7 +670,8 @@ public class JUnitTask extends Task } finally { - if( !propsFile.delete() ) { + if( !propsFile.delete() ) + { throw new TaskException( "Could not delete temporary properties file." ); } } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java index 814ea63b9..5c5baeabe 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java @@ -15,7 +15,6 @@ import java.text.NumberFormat; import java.util.Hashtable; import junit.framework.AssertionFailedError; import junit.framework.Test; - import org.apache.avalon.excalibur.util.StringUtil; import org.apache.myrmidon.api.TaskException; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java index c2c8d2591..84e69b750 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java @@ -18,7 +18,6 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import junit.framework.AssertionFailedError; import junit.framework.Test; - import org.apache.myrmidon.api.TaskException; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java index 65a2d7dc6..cbc2ac24f 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java @@ -19,8 +19,8 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import org.apache.avalon.framework.ExceptionUtil; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.Task; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.ScannerUtil; import org.w3c.dom.Document; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java index a32d8c500..a8d062828 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java @@ -15,17 +15,17 @@ import java.util.ArrayList; import java.util.Hashtable; import java.util.Iterator; import java.util.Random; +import org.apache.aut.nativelib.ExecManager; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.taskdefs.exec.Execute2; import org.apache.tools.ant.types.Argument; +import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.CommandlineJava; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.ScannerUtil; -import org.apache.tools.ant.types.Commandline; -import org.apache.aut.nativelib.ExecManager; /** * Somewhat abstract framework to be used for other metama 2.0 tasks. This diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java index aea779aa1..337fd59bd 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java @@ -13,15 +13,15 @@ import java.io.IOException; import java.io.PrintWriter; import java.util.ArrayList; import java.util.Random; +import org.apache.aut.nativelib.ExecManager; +import org.apache.avalon.excalibur.io.IOUtil; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.Task; import org.apache.tools.ant.taskdefs.exec.Execute2; import org.apache.tools.ant.types.Argument; +import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.CommandlineJava; import org.apache.tools.ant.types.Path; -import org.apache.tools.ant.types.Commandline; -import org.apache.avalon.excalibur.io.IOUtil; -import org.apache.aut.nativelib.ExecManager; /** * Simple Metamata MParse task based on the original written by 0 ) { + if( file != null && filesets.size() > 0 ) + { throw new TaskException( "You cannot supply the 'file' attribute and filesets at the same time." ); } int options = 0; - if( flags.indexOf( 'g' ) != -1 ) { + if( flags.indexOf( 'g' ) != -1 ) + { options |= Regexp.REPLACE_ALL; } - if( flags.indexOf( 'i' ) != -1 ) { + if( flags.indexOf( 'i' ) != -1 ) + { options |= Regexp.MATCH_CASE_INSENSITIVE; } - if( flags.indexOf( 'm' ) != -1 ) { + if( flags.indexOf( 'm' ) != -1 ) + { options |= Regexp.MATCH_MULTILINE; } - if( flags.indexOf( 's' ) != -1 ) { + if( flags.indexOf( 's' ) != -1 ) + { options |= Regexp.MATCH_SINGLELINE; } @@ -305,7 +317,8 @@ public class ReplaceRegExp extends Task while( ( line = lnr.readLine() ) != null ) { String res = doReplace( regex, subs, line, options ); - if( !res.equals( line ) ) { + if( !res.equals( line ) ) + { changes = true; } @@ -328,7 +341,8 @@ public class ReplaceRegExp extends Task String buf = new String( tmpBuf ); String res = doReplace( regex, subs, buf, options ); - if( !res.equals( buf ) ) { + if( !res.equals( buf ) ) + { changes = true; } @@ -355,7 +369,8 @@ public class ReplaceRegExp extends Task { try { - if( r != null ) { + if( r != null ) + { r.close(); } } @@ -366,7 +381,8 @@ public class ReplaceRegExp extends Task try { - if( w != null ) { + if( w != null ) + { r.close(); } } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/unix/Chmod.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/unix/Chmod.java index f5a89a4b3..5e00fa3a7 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/unix/Chmod.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/unix/Chmod.java @@ -11,7 +11,6 @@ import java.io.File; import java.io.IOException; import org.apache.aut.nativelib.Os; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.framework.Pattern; import org.apache.myrmidon.framework.PatternSet; import org.apache.tools.ant.taskdefs.exec.Execute; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/unix/Rpm.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/unix/Rpm.java index 782f06bd7..76fa4b979 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/unix/Rpm.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/unix/Rpm.java @@ -9,12 +9,11 @@ package org.apache.tools.ant.taskdefs.unix; import java.io.File; import java.io.IOException; +import org.apache.aut.nativelib.ExecManager; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.taskdefs.exec.Execute2; import org.apache.tools.ant.types.Commandline; -import org.apache.aut.nativelib.ExecManager; - /** * @author lucas@collab.net @@ -95,8 +94,9 @@ public class Rpm final Execute2 exe = new Execute2( execManager ); setupLogger( exe ); - if( m_topDir == null ) { - m_topDir = getBaseDirectory(); + if( m_topDir == null ) + { + m_topDir = getBaseDirectory(); } exe.setWorkingDirectory( m_topDir ); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/Commandline.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/types/Commandline.java index 4a03f16ee..a7c90b2b8 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/Commandline.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/types/Commandline.java @@ -62,7 +62,8 @@ public class Commandline */ public void setExecutable( final String executable ) { - if( executable == null || executable.length() == 0 ) { + if( executable == null || executable.length() == 0 ) + { return; } m_executable = executable.replace( '/', File.separatorChar ) diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/DirectoryScanner.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/types/DirectoryScanner.java index ac6496e5d..d426431f3 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/DirectoryScanner.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/types/DirectoryScanner.java @@ -9,7 +9,6 @@ package org.apache.tools.ant.types; import java.io.File; import java.util.ArrayList; -import java.util.StringTokenizer; import org.apache.myrmidon.api.TaskException; /** diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/FileSet.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/types/FileSet.java index 0087d200d..21f9aee9c 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/FileSet.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/types/FileSet.java @@ -7,11 +7,6 @@ */ package org.apache.tools.ant.types; -import java.io.File; -import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.framework.Pattern; -import org.apache.myrmidon.framework.PatternSet; - /** * Moved out of MatchingTask to make it a standalone object that could be * referenced (by scripts for example). diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/Path.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/types/Path.java index 96bc86992..52c5ebd86 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/Path.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/types/Path.java @@ -8,10 +8,7 @@ package org.apache.tools.ant.types; import java.io.File; - - import java.util.ArrayList; - import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.DataType; import org.apache.tools.ant.util.FileUtils; @@ -241,7 +238,8 @@ public class Path final String[] list = list(); // empty path return empty string - if( list.length == 0 ) { + if( list.length == 0 ) + { return ""; } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/PathElement.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/types/PathElement.java index 28a6e8acb..dd6317e65 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/PathElement.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/types/PathElement.java @@ -8,9 +8,8 @@ package org.apache.tools.ant.types; import java.io.File; -import org.apache.tools.ant.util.FileUtils; - import org.apache.myrmidon.api.TaskException; +import org.apache.tools.ant.util.FileUtils; /** * Helper class, holds <> values. @@ -31,11 +30,11 @@ class PathElement } protected String[] getParts( final File baseDirectory ) - throws TaskException + throws TaskException { - if ( m_location != null ) + if( m_location != null ) { - return new String[] { m_location }; + return new String[]{m_location}; } return FileUtils.translatePath( baseDirectory, m_path ); } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/PathUtil.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/types/PathUtil.java index b9419d3d7..98cdfc135 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/PathUtil.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/types/PathUtil.java @@ -7,9 +7,9 @@ */ package org.apache.tools.ant.types; -import java.net.URL; import java.io.File; import java.io.IOException; +import java.net.URL; import java.util.Locale; import org.apache.myrmidon.api.TaskException; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/ScannerUtil.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/types/ScannerUtil.java index 59b284892..23abd7680 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/ScannerUtil.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/types/ScannerUtil.java @@ -13,7 +13,6 @@ import java.util.StringTokenizer; import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.PatternUtil; -import org.apache.myrmidon.framework.PatternSet; import org.apache.tools.ant.taskdefs.archive.TarFileSet; import org.apache.tools.ant.taskdefs.archive.ZipFileSet; import org.apache.tools.ant.taskdefs.archive.ZipScanner; @@ -600,7 +599,7 @@ public class ScannerUtil { final ZipScanner scanner = new ZipScanner(); scanner.setSrc( src ); - set.setDir( null ); + set.setDir( null ); setupDirectoryScanner( set, scanner, null ); scanner.init(); return scanner; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/SysProperties.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/types/SysProperties.java index 31165062c..b3712a118 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/SysProperties.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/types/SysProperties.java @@ -10,8 +10,8 @@ package org.apache.tools.ant.types; import java.util.ArrayList; import java.util.Iterator; import java.util.Properties; -import org.apache.myrmidon.api.TaskException; import org.apache.aut.nativelib.ExecException; +import org.apache.myrmidon.api.TaskException; /** * Specialized EnvironmentData class for System properties @@ -55,7 +55,8 @@ public class SysProperties throw new TaskException( ee.getMessage(), ee ); } - if( props == null ) { + if( props == null ) + { return null; } @@ -83,7 +84,8 @@ public class SysProperties public void restoreSystem() throws TaskException { - if( m_system == null ) { + if( m_system == null ) + { throw new TaskException( "Unbalanced nesting of SysProperties" ); } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/FileUtils.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/util/FileUtils.java index 576f7a05e..d7cd24663 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/FileUtils.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/util/FileUtils.java @@ -385,7 +385,8 @@ public class FileUtils */ public static String translateFile( final String source ) { - if( source == null ) { + if( source == null ) + { return ""; } @@ -423,7 +424,8 @@ public class FileUtils throws TaskException { final ArrayList result = new ArrayList(); - if( source == null ) { + if( source == null ) + { return new String[ 0 ]; } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/depend/Dependencies.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/util/depend/Dependencies.java index ace1fc7c6..2e8aae531 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/depend/Dependencies.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/util/depend/Dependencies.java @@ -14,13 +14,10 @@ import java.util.Iterator; import java.util.Set; import java.util.StringTokenizer; import java.util.TreeSet; - -import org.apache.bcel.classfile.Visitor; -import org.apache.bcel.classfile.ConstantPool; -import org.apache.bcel.classfile.JavaClass; import org.apache.bcel.classfile.ClassParser; import org.apache.bcel.classfile.Code; import org.apache.bcel.classfile.CodeException; +import org.apache.bcel.classfile.Constant; import org.apache.bcel.classfile.ConstantClass; import org.apache.bcel.classfile.ConstantDouble; import org.apache.bcel.classfile.ConstantFieldref; @@ -30,7 +27,7 @@ import org.apache.bcel.classfile.ConstantInterfaceMethodref; import org.apache.bcel.classfile.ConstantLong; import org.apache.bcel.classfile.ConstantMethodref; import org.apache.bcel.classfile.ConstantNameAndType; -import org.apache.bcel.classfile.Constant; +import org.apache.bcel.classfile.ConstantPool; import org.apache.bcel.classfile.ConstantString; import org.apache.bcel.classfile.ConstantUtf8; import org.apache.bcel.classfile.ConstantValue; @@ -39,16 +36,18 @@ import org.apache.bcel.classfile.ExceptionTable; import org.apache.bcel.classfile.Field; import org.apache.bcel.classfile.InnerClass; import org.apache.bcel.classfile.InnerClasses; -import org.apache.bcel.classfile.Method; +import org.apache.bcel.classfile.JavaClass; import org.apache.bcel.classfile.LineNumber; import org.apache.bcel.classfile.LineNumberTable; import org.apache.bcel.classfile.LocalVariable; import org.apache.bcel.classfile.LocalVariableTable; +import org.apache.bcel.classfile.Method; import org.apache.bcel.classfile.SourceFile; import org.apache.bcel.classfile.StackMap; import org.apache.bcel.classfile.StackMapEntry; import org.apache.bcel.classfile.Synthetic; import org.apache.bcel.classfile.Unknown; +import org.apache.bcel.classfile.Visitor; public class Dependencies implements Visitor { @@ -96,7 +95,8 @@ public class Dependencies implements Visitor for( int i = o; i < args.length; i++ ) { String fileName = args[ i ].substring( 0, args[ i ].length() - ".class".length() ); - if( base != null && fileName.startsWith( base ) ) { + if( base != null && fileName.startsWith( base ) ) + { fileName = fileName.substring( base.length() ); } newSet.add( fileName ); @@ -128,7 +128,8 @@ public class Dependencies implements Visitor public boolean accept( Object object ) { String fileName = object + ".class"; - if( base != null ) { + if( base != null ) + { fileName = base + fileName; } return new File( fileName ).exists(); @@ -213,7 +214,8 @@ public class Dependencies implements Visitor public void visitConstantPool( ConstantPool obj ) { - if( verbose ) { + if( verbose ) + { System.out.println( "visit ConstantPool" ); } this.constantPool = obj; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/regexp/JakartaRegexpMatcher.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/util/regexp/JakartaRegexpMatcher.java index 8c3f7f666..14b2bc26c 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/regexp/JakartaRegexpMatcher.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/util/regexp/JakartaRegexpMatcher.java @@ -124,13 +124,16 @@ public class JakartaRegexpMatcher implements RegexpMatcher { int cOptions = RE.MATCH_NORMAL; - if( RegexpUtil.hasFlag( options, MATCH_CASE_INSENSITIVE ) ) { + if( RegexpUtil.hasFlag( options, MATCH_CASE_INSENSITIVE ) ) + { cOptions |= RE.MATCH_CASEINDEPENDENT; } - if( RegexpUtil.hasFlag( options, MATCH_MULTILINE ) ) { + if( RegexpUtil.hasFlag( options, MATCH_MULTILINE ) ) + { cOptions |= RE.MATCH_MULTILINE; } - if( RegexpUtil.hasFlag( options, MATCH_SINGLELINE ) ) { + if( RegexpUtil.hasFlag( options, MATCH_SINGLELINE ) ) + { cOptions |= RE.MATCH_SINGLELINE; } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/regexp/JakartaRegexpRegexp.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/util/regexp/JakartaRegexpRegexp.java index 343fa5483..a5f3d6c31 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/regexp/JakartaRegexpRegexp.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/util/regexp/JakartaRegexpRegexp.java @@ -71,7 +71,8 @@ public class JakartaRegexpRegexp extends JakartaRegexpMatcher implements Regexp protected int getSubsOptions( int options ) { int subsOptions = RE.REPLACE_FIRSTONLY; - if( RegexpUtil.hasFlag( options, REPLACE_ALL ) ) { + if( RegexpUtil.hasFlag( options, REPLACE_ALL ) ) + { subsOptions = RE.REPLACE_ALL; } return subsOptions; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/regexp/Jdk14RegexpMatcher.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/util/regexp/Jdk14RegexpMatcher.java index dbefcecf9..f9c085fe7 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/regexp/Jdk14RegexpMatcher.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/util/regexp/Jdk14RegexpMatcher.java @@ -148,13 +148,16 @@ public class Jdk14RegexpMatcher implements RegexpMatcher { int cOptions = 0; - if( RegexpUtil.hasFlag( options, MATCH_CASE_INSENSITIVE ) ) { + if( RegexpUtil.hasFlag( options, MATCH_CASE_INSENSITIVE ) ) + { cOptions |= Pattern.CASE_INSENSITIVE; } - if( RegexpUtil.hasFlag( options, MATCH_MULTILINE ) ) { + if( RegexpUtil.hasFlag( options, MATCH_MULTILINE ) ) + { cOptions |= Pattern.MULTILINE; } - if( RegexpUtil.hasFlag( options, MATCH_SINGLELINE ) ) { + if( RegexpUtil.hasFlag( options, MATCH_SINGLELINE ) ) + { cOptions |= Pattern.DOTALL; } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/regexp/Jdk14RegexpRegexp.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/util/regexp/Jdk14RegexpRegexp.java index f41e6f620..d73cbe3bd 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/regexp/Jdk14RegexpRegexp.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/util/regexp/Jdk14RegexpRegexp.java @@ -91,7 +91,8 @@ public class Jdk14RegexpRegexp extends Jdk14RegexpMatcher implements Regexp protected int getSubsOptions( int options ) { int subsOptions = REPLACE_FIRST; - if( RegexpUtil.hasFlag( options, REPLACE_ALL ) ) { + if( RegexpUtil.hasFlag( options, REPLACE_ALL ) ) + { subsOptions = REPLACE_ALL; } return subsOptions; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/mail/MailMessage.java b/proposal/myrmidon/src/todo/org/apache/tools/mail/MailMessage.java index 95cca6652..228811992 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/mail/MailMessage.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/mail/MailMessage.java @@ -373,13 +373,16 @@ public class MailMessage void disconnect() throws IOException { - if( out != null ) { + if( out != null ) + { out.close(); } - if( in != null ) { + if( in != null ) + { in.close(); } - if( socket != null ) { + if( socket != null ) + { socket.close(); } }