svn commit: r1397908 - in /maven/shared/trunk/maven-shared-utils/src: main/java/org/apache/maven/shared/utils/ main/java/org/apache/maven/shared/utils/io/ test/java/org/apache/maven/shared/utils/

[krosenvold]

Author: krosenvold
Date: Sat Oct 13 17:29:28 2012
New Revision: 1397908

URL: http://svn.apache.org/viewvc?rev=1397908&view=rev
Log:
o Removed CollectionUtils because plexus collectionnutils is unused in maven

Removed:
    
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/CollectionUtils.java
    
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/CollectionUtilsTest.java
Modified:
    
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java

Modified: 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java?rev=1397908&r1=1397907&r2=1397908&view=diff
==============================================================================
--- 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java
 (original)
+++ 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java
 Sat Oct 13 17:29:28 2012
@@ -22,10 +22,11 @@ package org.apache.maven.shared.utils.io
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import org.apache.maven.shared.utils.ArrayUtils;
-import org.apache.maven.shared.utils.CollectionUtils;
 
 import javax.annotation.Nonnull;
 
@@ -455,8 +456,8 @@ public class DirectoryScanner
 
     public static DirectoryScanResult diffFiles( String[] oldFiles, String[] 
newFiles )
     {
-        Set<String> oldFileSet = CollectionUtils.arrayAsHashSet( oldFiles );
-        Set<String> newFileSet = CollectionUtils.arrayAsHashSet( newFiles );
+        Set<String> oldFileSet = arrayAsHashSet( oldFiles );
+        Set<String> newFileSet = arrayAsHashSet( newFiles );
 
         List<String> added = new ArrayList<String>();
         List<String> removed = new ArrayList<String>();
@@ -483,6 +484,27 @@ public class DirectoryScanner
         return new DirectoryScanResult( filesAdded, filesRemoved );
     }
 
+
+    /**
+     * Take an array of type T and convert it into a HashSet of type T.
+     * If <code>null</code> or an empty array gets passed, an empty Set will 
be returned.
+     *
+     * @param array  The array
+     * @return the filled HashSet of type T
+     */
+    private static <T> Set<T> arrayAsHashSet( T[] array )
+    {
+        if ( array == null || array.length == 0 )
+        {
+            return Collections.emptySet();
+        }
+
+        Set<T> set = new HashSet<T>( array.length );
+        Collections.addAll(set, array);
+
+        return set;
+    }
+
     /**
      * Top level invocation for a slow scan. A slow scan builds up a full list 
of excluded/included files/directories,
      * whereas a fast scan will only have full results for included files, as 
it ignores directories which can't