From 2e186a30002a427c2968e2554100c8ce7ad17de8 Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Sun, 6 Jan 2002 02:00:39 +0000 Subject: [PATCH] Remove access to project as not needed git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270564 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/tools/ant/taskdefs/Tar.java | 13 +++++----- .../org/apache/tools/ant/taskdefs/Tstamp.java | 25 +++++++++---------- .../org/apache/tools/ant/taskdefs/Tar.java | 13 +++++----- .../org/apache/tools/ant/taskdefs/Tstamp.java | 25 +++++++++---------- 4 files changed, 36 insertions(+), 40 deletions(-) diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tar.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tar.java index 969f0e93c..e9122d176 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tar.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tar.java @@ -15,7 +15,6 @@ import java.util.ArrayList; import java.util.Iterator; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.DirectoryScanner; -import org.apache.tools.ant.Project; import org.apache.tools.ant.types.EnumeratedAttribute; import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.util.MergingMapper; @@ -145,7 +144,7 @@ public class Tar for( Iterator e = filesets.iterator(); e.hasNext(); ) { TarFileSet fs = (TarFileSet)e.next(); - String[] files = fs.getFiles( getProject() ); + String[] files = fs.getFiles(); if( !archiveIsUpToDate( files ) ) { @@ -193,7 +192,7 @@ public class Tar for( Iterator e = filesets.iterator(); e.hasNext(); ) { TarFileSet fs = (TarFileSet)e.next(); - String[] files = fs.getFiles( getProject() ); + String[] files = fs.getFiles(); for( int i = 0; i < files.length; i++ ) { File f = new File( fs.getDir(), files[ i ] ); @@ -344,14 +343,14 @@ public class Tar * @return a list of file and directory names, relative to the baseDir * for the project. */ - public String[] getFiles( Project p ) + public String[] getFiles() throws TaskException { if( files == null ) { - DirectoryScanner ds = getDirectoryScanner(); - String[] directories = ds.getIncludedDirectories(); - String[] filesPerSe = ds.getIncludedFiles(); + final DirectoryScanner scanner = getDirectoryScanner(); + final String[] directories = scanner.getIncludedDirectories(); + final String[] filesPerSe = scanner.getIncludedFiles(); files = new String[ directories.length + filesPerSe.length ]; System.arraycopy( directories, 0, files, 0, directories.length ); System.arraycopy( filesPerSe, 0, files, directories.length, 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 53c405f91..72373ad30 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.tools.ant.Project; import org.apache.tools.ant.Task; import org.apache.tools.ant.types.EnumeratedAttribute; @@ -31,24 +30,24 @@ import org.apache.tools.ant.types.EnumeratedAttribute; * @author conor@cognet.com.au * @author Magesh Umasankar */ -public class Tstamp extends Task +public class Tstamp + extends Task { - private ArrayList customFormats = new ArrayList(); - private String prefix = ""; + private String m_prefix = ""; public void setPrefix( String prefix ) { - this.prefix = prefix; - if( !this.prefix.endsWith( "." ) ) + this.m_prefix = prefix; + if( !this.m_prefix.endsWith( "." ) ) { - this.prefix += "."; + this.m_prefix += "."; } } public CustomFormat createFormat() { - CustomFormat cts = new CustomFormat( prefix ); + CustomFormat cts = new CustomFormat( m_prefix ); customFormats.add( cts ); return cts; } @@ -61,19 +60,19 @@ public class Tstamp extends Task Date d = new Date(); SimpleDateFormat dstamp = new SimpleDateFormat( "yyyyMMdd" ); - setProperty( prefix + "DSTAMP", dstamp.format( d ) ); + setProperty( m_prefix + "DSTAMP", dstamp.format( d ) ); SimpleDateFormat tstamp = new SimpleDateFormat( "HHmm" ); - setProperty( prefix + "TSTAMP", tstamp.format( d ) ); + setProperty( m_prefix + "TSTAMP", tstamp.format( d ) ); SimpleDateFormat today = new SimpleDateFormat( "MMMM d yyyy", Locale.US ); - setProperty( prefix + "TODAY", today.format( d ) ); + setProperty( m_prefix + "TODAY", today.format( d ) ); Iterator i = customFormats.iterator(); while( i.hasNext() ) { CustomFormat cts = (CustomFormat)i.next(); - cts.execute( getProject(), d ); + cts.execute( d ); } } @@ -206,7 +205,7 @@ public class Tstamp extends Task field = unit.getCalendarField(); } - public void execute( Project project, Date date ) + public void execute( Date date ) throws TaskException { if( propertyName == null ) diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Tar.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Tar.java index 969f0e93c..e9122d176 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Tar.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Tar.java @@ -15,7 +15,6 @@ import java.util.ArrayList; import java.util.Iterator; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.DirectoryScanner; -import org.apache.tools.ant.Project; import org.apache.tools.ant.types.EnumeratedAttribute; import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.util.MergingMapper; @@ -145,7 +144,7 @@ public class Tar for( Iterator e = filesets.iterator(); e.hasNext(); ) { TarFileSet fs = (TarFileSet)e.next(); - String[] files = fs.getFiles( getProject() ); + String[] files = fs.getFiles(); if( !archiveIsUpToDate( files ) ) { @@ -193,7 +192,7 @@ public class Tar for( Iterator e = filesets.iterator(); e.hasNext(); ) { TarFileSet fs = (TarFileSet)e.next(); - String[] files = fs.getFiles( getProject() ); + String[] files = fs.getFiles(); for( int i = 0; i < files.length; i++ ) { File f = new File( fs.getDir(), files[ i ] ); @@ -344,14 +343,14 @@ public class Tar * @return a list of file and directory names, relative to the baseDir * for the project. */ - public String[] getFiles( Project p ) + public String[] getFiles() throws TaskException { if( files == null ) { - DirectoryScanner ds = getDirectoryScanner(); - String[] directories = ds.getIncludedDirectories(); - String[] filesPerSe = ds.getIncludedFiles(); + final DirectoryScanner scanner = getDirectoryScanner(); + final String[] directories = scanner.getIncludedDirectories(); + final String[] filesPerSe = scanner.getIncludedFiles(); files = new String[ directories.length + filesPerSe.length ]; System.arraycopy( directories, 0, files, 0, directories.length ); System.arraycopy( filesPerSe, 0, files, directories.length, 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 53c405f91..72373ad30 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.tools.ant.Project; import org.apache.tools.ant.Task; import org.apache.tools.ant.types.EnumeratedAttribute; @@ -31,24 +30,24 @@ import org.apache.tools.ant.types.EnumeratedAttribute; * @author conor@cognet.com.au * @author Magesh Umasankar */ -public class Tstamp extends Task +public class Tstamp + extends Task { - private ArrayList customFormats = new ArrayList(); - private String prefix = ""; + private String m_prefix = ""; public void setPrefix( String prefix ) { - this.prefix = prefix; - if( !this.prefix.endsWith( "." ) ) + this.m_prefix = prefix; + if( !this.m_prefix.endsWith( "." ) ) { - this.prefix += "."; + this.m_prefix += "."; } } public CustomFormat createFormat() { - CustomFormat cts = new CustomFormat( prefix ); + CustomFormat cts = new CustomFormat( m_prefix ); customFormats.add( cts ); return cts; } @@ -61,19 +60,19 @@ public class Tstamp extends Task Date d = new Date(); SimpleDateFormat dstamp = new SimpleDateFormat( "yyyyMMdd" ); - setProperty( prefix + "DSTAMP", dstamp.format( d ) ); + setProperty( m_prefix + "DSTAMP", dstamp.format( d ) ); SimpleDateFormat tstamp = new SimpleDateFormat( "HHmm" ); - setProperty( prefix + "TSTAMP", tstamp.format( d ) ); + setProperty( m_prefix + "TSTAMP", tstamp.format( d ) ); SimpleDateFormat today = new SimpleDateFormat( "MMMM d yyyy", Locale.US ); - setProperty( prefix + "TODAY", today.format( d ) ); + setProperty( m_prefix + "TODAY", today.format( d ) ); Iterator i = customFormats.iterator(); while( i.hasNext() ) { CustomFormat cts = (CustomFormat)i.next(); - cts.execute( getProject(), d ); + cts.execute( d ); } } @@ -206,7 +205,7 @@ public class Tstamp extends Task field = unit.getCalendarField(); } - public void execute( Project project, Date date ) + public void execute( Date date ) throws TaskException { if( propertyName == null )