dion 2003/07/16 18:09:13
Modified: src/java/org/apache/maven/util Expand.java
Log:
Stop passing instance variables around already
Revision Changes Path
1.10 +23 -18 maven/src/java/org/apache/maven/util/Expand.java
Index: Expand.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/util/Expand.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Expand.java 12 Apr 2003 00:02:06 -0000 1.9
+++ Expand.java 17 Jul 2003 01:09:13 -0000 1.10
@@ -92,6 +92,9 @@
/** Logger. */
private static final Log log = LogFactory.getLog(Expand.class);
+ /** file utility class */
+ private FileUtils fileUtils;
+
/**
* Do the work.
*
@@ -100,28 +103,25 @@
public void execute()
throws IOException
{
- FileUtils fileUtils = FileUtils.newFileUtils();
- expandFile( fileUtils, source, dest );
+ expandFile();
}
- /** Expand a file.
- *
- * @param fileUtils File util helper.
- * @param srcF The source file.
- * @param dir The directory
+ /**
+ * Expand a file.
*/
- protected void expandFile( FileUtils fileUtils, File srcF, File dir ) throws
IOException
+ protected void expandFile() throws IOException
{
ZipInputStream zis = null;
try
{
// code from WarExpand
- zis = new ZipInputStream( new FileInputStream( srcF ) );
+ zis = new ZipInputStream( new FileInputStream( source ) );
ZipEntry ze = null;
+ setFileUtils(FileUtils.newFileUtils());
while ( ( ze = zis.getNextEntry() ) != null )
{
- extractFile( fileUtils, srcF, dir, zis,
+ extractFile( zis,
ze.getName(), new Date( ze.getTime() ),
ze.isDirectory() );
}
@@ -146,9 +146,6 @@
/** Extract a file.
*
- * @param fileUtils File util helper.
- * @param srcF The source file to extract.
- * @param dir The directory.
* @param compressedInputStream The input stream.
* @param entryName The entry name.
* @param entryDate The entry date.
@@ -157,13 +154,12 @@
* @throws IOException If an error occurs while attempting to
* extract the file.
*/
- protected void extractFile( FileUtils fileUtils, File srcF, File dir,
- InputStream compressedInputStream,
+ protected void extractFile( InputStream compressedInputStream,
String entryName,
Date entryDate, boolean isDirectory )
throws IOException
{
- File f = fileUtils.resolveFile( dir, entryName );
+ File f = fileUtils.resolveFile( dest, entryName );
if ( !overwrite && f.exists()
&& f.lastModified() >= entryDate.getTime() )
@@ -227,7 +223,7 @@
*/
public void setDest( File d )
{
- this.dest = d;
+ dest = d;
}
/**
@@ -237,7 +233,7 @@
*/
public void setSrc( File s )
{
- this.source = s;
+ source = s;
}
/**
@@ -251,4 +247,13 @@
{
overwrite = shouldOverwrite;
}
+
+ /**
+ * @param utils
+ */
+ public void setFileUtils(FileUtils utils)
+ {
+ fileUtils = utils;
+ }
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
