donaldp 01/12/21 05:29:10
Modified: proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs
FixCRLF.java Rmic.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file
Copy.java Move.java
proposal/myrmidon/src/main/org/apache/tools/ant/util
FileUtils.java
Log:
Make FileUtils static access.
Revision Changes Path
1.7 +2 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java
Index: FixCRLF.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FixCRLF.java 2001/12/17 10:47:18 1.6
+++ FixCRLF.java 2001/12/21 13:29:09 1.7
@@ -66,7 +66,7 @@
*
* @author Sam Ruby <a href="mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED]</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Peter B. West</a>
- * @version $Revision: 1.6 $ $Name: $
+ * @version $Revision: 1.7 $ $Name: $
*/
public class FixCRLF extends MatchingTask
@@ -759,7 +759,7 @@
{
// Compare the destination with the temp file
log( "destFile exists", Project.MSG_DEBUG );
- if( !FileUtils.newFileUtils().contentEquals( destFile,
tmpFile ) )
+ if( !FileUtils.contentEquals( destFile, tmpFile ) )
{
log( destFile + " is being written", Project.MSG_DEBUG );
if( !destFile.delete() )
1.11 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Rmic.java
Index: Rmic.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Rmic.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Rmic.java 2001/12/17 10:47:18 1.10
+++ Rmic.java 2001/12/21 13:29:09 1.11
@@ -685,7 +685,7 @@
if( filtering )
{
final FilterSetCollection filters = new
FilterSetCollection( project.getGlobalFilterSet() );
- FileUtils.newFileUtils().copyFile( oldFile, newFile,
filters );
+ FileUtils.copyFile( oldFile, newFile, filters );
}
else
{
1.3 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Copy.java
Index: Copy.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Copy.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Copy.java 2001/12/19 10:40:29 1.2
+++ Copy.java 2001/12/21 13:29:10 1.3
@@ -368,7 +368,7 @@
FileUtil.forceDelete( dest );
}
- FileUtils.newFileUtils().copyFile( src, dest,
executionFilters );
+ FileUtils.copyFile( src, dest, executionFilters );
if( m_preserveLastModified )
{
1.3 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Move.java
Index: Move.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Move.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Move.java 2001/12/19 10:40:29 1.2
+++ Move.java 2001/12/21 13:29:10 1.3
@@ -162,7 +162,7 @@
{
FileUtil.forceDelete( d );
}
- FileUtils.newFileUtils().copyFile( f, d,
executionFilters );
+ FileUtils.copyFile( f, d, executionFilters );
f = new File( fromFile );
if( !f.delete() )
1.7 +6 -16
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/util/FileUtils.java
Index: FileUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/util/FileUtils.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FileUtils.java 2001/12/17 10:47:20 1.6
+++ FileUtils.java 2001/12/21 13:29:10 1.7
@@ -30,22 +30,12 @@
* @author [EMAIL PROTECTED]
* @author <a href="mailto:[EMAIL PROTECTED]">Conor MacNeill</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Stefan Bodewig</a>
- * @version $Revision: 1.6 $
+ * @version $Revision: 1.7 $
*/
public class FileUtils
{
/**
- * Factory method.
- *
- * @return Description of the Returned Value
- */
- public static FileUtils newFileUtils()
- {
- return new FileUtils();
- }
-
- /**
* Compares the contents of two files.
*
* @param f1 Description of Parameter
@@ -54,7 +44,7 @@
* @exception IOException Description of Exception
* @since 1.9
*/
- public boolean contentEquals( File f1, File f2 )
+ public static boolean contentEquals( File f1, File f2 )
throws IOException
{
if( f1.exists() != f2.exists() )
@@ -135,9 +125,9 @@
* @param preserveLastModified Description of Parameter
* @throws IOException
*/
- public void copyFile( File sourceFile,
- File destFile,
- FilterSetCollection filters )
+ public static void copyFile( File sourceFile,
+ File destFile,
+ FilterSetCollection filters )
throws IOException, TaskException
{
if( !destFile.exists() ||
@@ -218,7 +208,7 @@
* @return Description of the Returned Value
* @throws java.lang.NullPointerException if the file path is equal to
null.
*/
- public File normalize( String path )
+ public static File normalize( String path )
throws TaskException
{
String orig = path;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
