[jboss-cvs] JBossAS SVN: r76563 - in projects/jboss-cl/trunk/classloading-vfs/src/main/org/jboss/classloading: spi/vfs/dependency and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2008-08-01 05:59:52 -0400 (Fri, 01 Aug 2008)
New Revision: 76563

Modified:
   projects/jboss-cl/trunk/classloading-vfs/src/main/org/jboss/classloading/plugins/vfs/VFSResourceVisitor.java
   projects/jboss-cl/trunk/classloading-vfs/src/main/org/jboss/classloading/spi/vfs/dependency/VFSClassLoaderPolicyModule.java
Log:
Leave arrays.

Modified: projects/jboss-cl/trunk/classloading-vfs/src/main/org/jboss/classloading/plugins/vfs/VFSResourceVisitor.java
===================================================================
--- projects/jboss-cl/trunk/classloading-vfs/src/main/org/jboss/classloading/plugins/vfs/VFSResourceVisitor.java	2008-08-01 09:51:27 UTC (rev 76562)
+++ projects/jboss-cl/trunk/classloading-vfs/src/main/org/jboss/classloading/plugins/vfs/VFSResourceVisitor.java	2008-08-01 09:59:52 UTC (rev 76563)
@@ -21,8 +21,6 @@
  */
 package org.jboss.classloading.plugins.vfs;
 
-import java.util.List;
-
 import org.jboss.classloader.spi.filter.ClassFilter;
 import org.jboss.classloading.spi.visitor.ResourceContext;
 import org.jboss.classloading.spi.visitor.ResourceFilter;
@@ -43,10 +41,10 @@
 public class VFSResourceVisitor extends AbstractVirtualFileFilterWithAttributes implements VirtualFileVisitor
 {
    /** The roots */
-   private List<VirtualFile> roots;
+   private VirtualFile[] roots;
    
    /** The excluded roots */
-   private List<VirtualFile> excludedRoots;
+   private VirtualFile[] excludedRoots;
    
    /** The current root */
    private VirtualFile root;
@@ -87,7 +85,7 @@
     * @param filter the filter
     * @param recurseFilter the recurse filter
     */
-   public static void visit(List<VirtualFile> roots, List<VirtualFile> excludedRoots, ClassFilter included, ClassFilter excluded, ClassLoader classLoader, ResourceVisitor visitor, ResourceFilter filter, ResourceFilter recurseFilter)
+   public static void visit(VirtualFile[] roots, VirtualFile[] excludedRoots, ClassFilter included, ClassFilter excluded, ClassLoader classLoader, ResourceVisitor visitor, ResourceFilter filter, ResourceFilter recurseFilter)
    {
       VFSResourceVisitor vfsVisitor = new VFSResourceVisitor(roots, excludedRoots, included, excluded, classLoader, visitor, filter, recurseFilter);
       for (VirtualFile root : roots)
@@ -116,7 +114,7 @@
     * @param filter the filter
     * @param recurseFilter the recurse filter
     */
-   VFSResourceVisitor(List<VirtualFile> roots, List<VirtualFile> excludedRoots, ClassFilter included, ClassFilter excluded, ClassLoader classLoader, ResourceVisitor visitor, ResourceFilter filter, ResourceFilter recurseFilter)
+   VFSResourceVisitor(VirtualFile[] roots, VirtualFile[] excludedRoots, ClassFilter included, ClassFilter excluded, ClassLoader classLoader, ResourceVisitor visitor, ResourceFilter filter, ResourceFilter recurseFilter)
    {
       if (roots == null)
          throw new IllegalArgumentException("Null roots");

Modified: projects/jboss-cl/trunk/classloading-vfs/src/main/org/jboss/classloading/spi/vfs/dependency/VFSClassLoaderPolicyModule.java
===================================================================
--- projects/jboss-cl/trunk/classloading-vfs/src/main/org/jboss/classloading/spi/vfs/dependency/VFSClassLoaderPolicyModule.java	2008-08-01 09:51:27 UTC (rev 76562)
+++ projects/jboss-cl/trunk/classloading-vfs/src/main/org/jboss/classloading/spi/vfs/dependency/VFSClassLoaderPolicyModule.java	2008-08-01 09:59:52 UTC (rev 76563)
@@ -24,7 +24,6 @@
 import java.net.URI;
 import java.net.URL;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -226,15 +225,14 @@
       VirtualFile[] roots = determineVFSRoots();
       if (roots != null && roots.length > 0)
       {
-         List<VirtualFile> rootsList = Arrays.asList(roots);
          if (urls != null && urls.length > 0)
-            rootsList = matchUrlsWithRoots(urls, rootsList);
+            roots = matchUrlsWithRoots(urls, roots);
 
-         if (rootsList.isEmpty() == false)
+         if (roots != null && roots.length > 0)
          {
             ClassFilter included = getIncluded();
             ClassFilter excluded = getExcluded();
-            VFSResourceVisitor.visit(rootsList, null, included, excluded, classLoader, visitor, filter, recurseFilter);
+            VFSResourceVisitor.visit(roots, null, included, excluded, classLoader, visitor, filter, recurseFilter);
          }
       }
    }
@@ -246,7 +244,7 @@
     * @param roots the old roots
     * @return new roots
     */
-   protected static List<VirtualFile> matchUrlsWithRoots(URL[] urls, List<VirtualFile> roots)
+   protected static VirtualFile[] matchUrlsWithRoots(URL[] urls, VirtualFile[] roots)
    {
       try
       {
@@ -255,10 +253,10 @@
          for (URL url : urls)
          {
             String urlString = stripProtocol(url);
-            for(int i=0; i < roots.size(); i++)
+            for(int i=0; i < roots.length; i++)
             {
                if (rootURLStrings[i] == null)
-                  rootURLStrings[i] = stripProtocol(roots.get(i).toURL());
+                  rootURLStrings[i] = stripProtocol(roots[i].toURL());
 
                if (urlString.startsWith(rootURLStrings[i]))
                {
@@ -268,7 +266,7 @@
                }
             }
          }
-         return newRoots;
+         return newRoots.toArray(new VirtualFile[newRoots.size()]);
       }
       catch (Exception e)
       {