donaldp 02/02/06 05:33:08
Modified: proposal/myrmidon/src/java/org/apache/antlib/build
Patch.java
proposal/myrmidon/src/java/org/apache/antlib/cvslib Cvs.java
proposal/myrmidon/src/java/org/apache/antlib/nativelib
Exec.java
proposal/myrmidon/src/java/org/apache/antlib/security
GenerateKey.java SignJar.java
proposal/myrmidon/src/java/org/apache/antlib/xml
TraXLiaison.java XMLValidateTask.java
XSLTParam.java XSLTProcess.java
Log:
Style touchups
Revision Changes Path
1.2 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/build/Patch.java
Index: Patch.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/build/Patch.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Patch.java 6 Feb 2002 12:44:36 -0000 1.1
+++ Patch.java 6 Feb 2002 13:33:07 -0000 1.2
@@ -9,11 +9,11 @@
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.
1.21 +5 -4
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/cvslib/Cvs.java
Index: Cvs.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/cvslib/Cvs.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Cvs.java 3 Feb 2002 10:28:46 -0000 1.20
+++ Cvs.java 6 Feb 2002 13:33:07 -0000 1.21
@@ -10,12 +10,12 @@
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.
@@ -24,7 +24,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED]</a>
* @author <a href="mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED]</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Wolfgang Werner</a>
- * @version $Revision: 1.20 $ $Date: 2002/02/03 10:28:46 $
+ * @version $Revision: 1.21 $ $Date: 2002/02/06 13:33:07 $
* @ant:task name="cvs"
*/
public class Cvs
@@ -151,8 +151,9 @@
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 );
1.8 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/nativelib/Exec.java
Index: Exec.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/nativelib/Exec.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Exec.java 3 Feb 2002 10:28:46 -0000 1.7
+++ Exec.java 6 Feb 2002 13:33:07 -0000 1.8
@@ -10,8 +10,8 @@
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;
1.5 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/security/GenerateKey.java
Index: GenerateKey.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/security/GenerateKey.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- GenerateKey.java 3 Feb 2002 10:28:46 -0000 1.4
+++ GenerateKey.java 6 Feb 2002 13:33:07 -0000 1.5
@@ -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.
1.7 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/security/SignJar.java
Index: SignJar.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/security/SignJar.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SignJar.java 3 Feb 2002 10:28:46 -0000 1.6
+++ SignJar.java 6 Feb 2002 13:33:07 -0000 1.7
@@ -13,6 +13,7 @@
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.DirectoryScanner;
import org.apache.tools.ant.types.FileSet;
import org.apache.tools.ant.types.ScannerUtil;
-import org.apache.aut.nativelib.ExecManager;
/**
* Sign a archive.
1.6 +2 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/xml/TraXLiaison.java
Index: TraXLiaison.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/xml/TraXLiaison.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TraXLiaison.java 20 Jan 2002 17:32:59 -0000 1.5
+++ TraXLiaison.java 6 Feb 2002 13:33:07 -0000 1.6
@@ -182,7 +182,8 @@
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 );
1.17 +1 -7
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/xml/XMLValidateTask.java
Index: XMLValidateTask.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/xml/XMLValidateTask.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- XMLValidateTask.java 26 Jan 2002 12:08:55 -0000 1.16
+++ XMLValidateTask.java 6 Feb 2002 13:33:07 -0000 1.17
@@ -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;
1.4 +0 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/xml/XSLTParam.java
Index: XSLTParam.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/xml/XSLTParam.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XSLTParam.java 20 Jan 2002 17:32:59 -0000 1.3
+++ XSLTParam.java 6 Feb 2002 13:33:07 -0000 1.4
@@ -7,8 +7,6 @@
*/
package org.apache.antlib.xml;
-
-
public final class XSLTParam
{
private String m_name;
1.16 +5 -3
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/xml/XSLTProcess.java
Index: XSLTProcess.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/xml/XSLTProcess.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- XSLTProcess.java 28 Jan 2002 09:28:33 -0000 1.15
+++ XSLTProcess.java 6 Feb 2002 13:33:07 -0000 1.16
@@ -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 @@
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 @@
catch( Exception ex )
{
getLogger().info( "Failed to process " + inFile );
- if( outFile != null ) {
+ if( outFile != null )
+ {
outFile.delete();
}
throw new TaskException( "Error", ex );
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
