donaldp 02/02/06 05:37:29
Modified: proposal/myrmidon/src/main/org/apache/tools/ant/types
Commandline.java DirectoryScanner.java FileSet.java
Path.java PathElement.java PathUtil.java
ScannerUtil.java SysProperties.java
Log:
Style touchups
Revision Changes Path
1.14 +2 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/types/Commandline.java
Index: Commandline.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/types/Commandline.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Commandline.java 27 Jan 2002 02:31:49 -0000 1.13
+++ Commandline.java 6 Feb 2002 13:37:28 -0000 1.14
@@ -62,7 +62,8 @@
*/
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 )
1.3 +0 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/types/DirectoryScanner.java
Index: DirectoryScanner.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/types/DirectoryScanner.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DirectoryScanner.java 24 Jan 2002 11:38:06 -0000 1.2
+++ DirectoryScanner.java 6 Feb 2002 13:37:28 -0000 1.3
@@ -9,7 +9,6 @@
import java.io.File;
import java.util.ArrayList;
-import java.util.StringTokenizer;
import org.apache.myrmidon.api.TaskException;
/**
1.20 +0 -5
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/types/FileSet.java
Index: FileSet.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/types/FileSet.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- FileSet.java 27 Jan 2002 09:37:35 -0000 1.19
+++ FileSet.java 6 Feb 2002 13:37:28 -0000 1.20
@@ -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).
1.22 +2 -4
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/types/Path.java
Index: Path.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/types/Path.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Path.java 26 Jan 2002 02:07:36 -0000 1.21
+++ Path.java 6 Feb 2002 13:37:28 -0000 1.22
@@ -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 @@
final String[] list = list();
// empty path return empty string
- if( list.length == 0 ) {
+ if( list.length == 0 )
+ {
return "";
}
1.4 +4 -5
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/types/PathElement.java
Index: PathElement.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/types/PathElement.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PathElement.java 20 Jan 2002 17:35:00 -0000 1.3
+++ PathElement.java 6 Feb 2002 13:37:28 -0000 1.4
@@ -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 <code><></code> values.
@@ -31,11 +30,11 @@
}
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 );
}
1.2 +2 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/types/PathUtil.java
Index: PathUtil.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/types/PathUtil.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PathUtil.java 20 Jan 2002 09:55:47 -0000 1.1
+++ PathUtil.java 6 Feb 2002 13:37:28 -0000 1.2
@@ -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;
@@ -17,7 +17,7 @@
* Utilities for operating on Path objects.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.1 $ $Date: 2002/01/20 09:55:47 $
+ * @version $Revision: 1.2 $ $Date: 2002/02/06 13:37:28 $
*/
public class PathUtil
{
1.7 +2 -3
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/types/ScannerUtil.java
Index: ScannerUtil.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/types/ScannerUtil.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ScannerUtil.java 27 Jan 2002 10:07:15 -0000 1.6
+++ ScannerUtil.java 6 Feb 2002 13:37:28 -0000 1.7
@@ -13,7 +13,6 @@
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;
@@ -24,7 +23,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
* @author Arnout J. Kuiper <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Magesh Umasankar</a>
- * @version $Revision: 1.6 $ $Date: 2002/01/27 10:07:15 $
+ * @version $Revision: 1.7 $ $Date: 2002/02/06 13:37:28 $
*/
public class ScannerUtil
{
@@ -600,7 +599,7 @@
{
final ZipScanner scanner = new ZipScanner();
scanner.setSrc( src );
- set.setDir( null );
+ set.setDir( null );
setupDirectoryScanner( set, scanner, null );
scanner.init();
return scanner;
1.4 +5 -3
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/types/SysProperties.java
Index: SysProperties.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/types/SysProperties.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SysProperties.java 20 Jan 2002 17:35:00 -0000 1.3
+++ SysProperties.java 6 Feb 2002 13:37:28 -0000 1.4
@@ -10,8 +10,8 @@
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 @@
throw new TaskException( ee.getMessage(), ee );
}
- if( props == null ) {
+ if( props == null )
+ {
return null;
}
@@ -83,7 +84,8 @@
public void restoreSystem()
throws TaskException
{
- if( m_system == null ) {
+ if( m_system == null )
+ {
throw new TaskException( "Unbalanced nesting of SysProperties" );
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
