You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm-commits@maven.apache.org by ca...@apache.org on 2006/04/26 04:34:08 UTC
svn commit: r397062 - in /maven/scm/trunk/maven-scm-api/src:
main/java/org/apache/maven/scm/ScmFileSet.java
test/java/org/apache/maven/scm/ScmFileSetTest.java
Author: carlos
Date: Tue Apr 25 19:34:04 2006
New Revision: 397062
URL: http://svn.apache.org/viewcvs?rev=397062&view=rev
Log:
Use List for files instead of Array
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFileSet.java
maven/scm/trunk/maven-scm-api/src/test/java/org/apache/maven/scm/ScmFileSetTest.java
Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFileSet.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFileSet.java?rev=397062&r1=397061&r2=397062&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFileSet.java (original)
+++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFileSet.java Tue Apr 25 19:34:04 2006
@@ -16,11 +16,13 @@
* limitations under the License.
*/
-import org.codehaus.plexus.util.FileUtils;
-
import java.io.File;
import java.io.IOException;
import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.codehaus.plexus.util.FileUtils;
/**
* Set of files used for SCM operations.
@@ -36,9 +38,9 @@
private File basedir;
/**
- * List of files, all relative to the basedir.
+ * List of File objects, all relative to the basedir.
*/
- private File[] files;
+ private List files = Collections.EMPTY_LIST;
private static final File[] EMPTY_FILE_ARRAY = new File[0];
@@ -87,8 +89,21 @@
excludes = DEFAULT_EXCLUDES;
}
- // TODO: just use a list instead?
- files = (File[]) FileUtils.getFiles( basedir, includes, excludes, false ).toArray( EMPTY_FILE_ARRAY );
+ this.files = FileUtils.getFiles( basedir, includes, excludes, false );
+ }
+
+ /**
+ * Create a file set with files from basefile, using includes provided and default excludes.
+ *
+ * @param basedir directory files are relative to
+ * @param includes Ant pattern for files to include
+ * @throws IOException
+ * @since 1.0
+ */
+ public ScmFileSet( File basedir, String includes )
+ throws IOException
+ {
+ this( basedir, includes, null );
}
/**
@@ -101,6 +116,17 @@
*/
public ScmFileSet( File basedir, File[] files )
{
+ this( basedir, Arrays.asList( files ) );
+ }
+
+ /**
+ * Create a file set with the files provided, relative to basedir.
+ *
+ * @param basedir directory files are relative to
+ * @param files list of File objects, files that the set will contain, have to be relative to basedir
+ */
+ public ScmFileSet( File basedir, List files )
+ {
if ( basedir == null )
{
throw new NullPointerException( "basedir must not be null" );
@@ -133,11 +159,20 @@
*/
public File[] getFiles()
{
+ return (File[]) this.files.toArray( new File[0] );
+ }
+
+ /**
+ * Get the list of files in the set, relative to basedir
+ * @return List of File objects
+ */
+ public List getFileList()
+ {
return this.files;
}
public String toString()
{
- return "basedir = " + basedir + "; files = " + Arrays.asList( files );
+ return "basedir = " + basedir + "; files = " + files;
}
}
Modified: maven/scm/trunk/maven-scm-api/src/test/java/org/apache/maven/scm/ScmFileSetTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-api/src/test/java/org/apache/maven/scm/ScmFileSetTest.java?rev=397062&r1=397061&r2=397062&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-api/src/test/java/org/apache/maven/scm/ScmFileSetTest.java (original)
+++ maven/scm/trunk/maven-scm-api/src/test/java/org/apache/maven/scm/ScmFileSetTest.java Tue Apr 25 19:34:04 2006
@@ -20,6 +20,8 @@
import java.io.File;
import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
/**
* @author dtran
@@ -49,11 +51,7 @@
public void testExcludes()
throws IOException
{
- String basedir = getBasedir();
-
- System.out.println( "basedir = " + basedir );
-
- ScmFileSet fileSet = new ScmFileSet( new File( basedir ), "**/**", "**/target/**" );
+ ScmFileSet fileSet = new ScmFileSet( new File( getBasedir() ), "**/**", "**/target/**" );
File[] files = fileSet.getFiles();
@@ -64,6 +62,56 @@
fail( "Found excludes in file set: " + files[i] );
}
}
+ }
+
+ public void testFilesListExcludes()
+ throws IOException
+ {
+ ScmFileSet fileSet = new ScmFileSet( new File( getBasedir() ), "**/**", "**/target/**" );
+
+ List files = fileSet.getFileList();
+
+ Iterator it = files.iterator();
+ while ( it.hasNext() )
+ {
+ File file = (File) it.next();
+ if ( file.getAbsolutePath().indexOf( "target" ) != -1 )
+ {
+ fail( "Found excludes in file set: " + file );
+ }
+ }
+ }
+
+ public void testExcludes2()
+ throws IOException
+ {
+ ScmFileSet fileSet = new ScmFileSet( new File( getBasedir() ), "**/scmfileset/**", "**/target/**" );
+ assertEquals( 2, fileSet.getFiles().length );
}
+
+ public void testFilesListExcludes2()
+ throws IOException
+ {
+ ScmFileSet fileSet = new ScmFileSet( new File( getBasedir() ), "**/scmfileset/**", "**/target/**" );
+
+ assertEquals( 2, fileSet.getFileList().size() );
+ }
+
+ public void testNoExcludes()
+ throws IOException
+ {
+ ScmFileSet fileSet = new ScmFileSet( new File( getBasedir() ), "src/**/scmfileset/**" );
+
+ assertEquals( 2, fileSet.getFiles().length );
+ }
+
+ public void testFilesListNoExcludes()
+ throws IOException
+ {
+ ScmFileSet fileSet = new ScmFileSet( new File( getBasedir() ), "src/**/scmfileset/**" );
+
+ assertEquals( 2, fileSet.getFileList().size() );
+ }
+
}