[jboss-cvs] JBossAS SVN: r57720 - projects/microcontainer/trunk/container/src/main/org/jboss/virtual/plugins/vfs/helpers

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

Author: scott.stark at jboss.org
Date: 2006-10-18 23:41:03 -0400 (Wed, 18 Oct 2006)
New Revision: 57720

Modified:
   projects/microcontainer/trunk/container/src/main/org/jboss/virtual/plugins/vfs/helpers/SuffixMatchFilter.java
   projects/microcontainer/trunk/container/src/main/org/jboss/virtual/plugins/vfs/helpers/SuffixesExcludeFilter.java
Log:
Generalize the List to a Collection to allow more types to be input

Modified: projects/microcontainer/trunk/container/src/main/org/jboss/virtual/plugins/vfs/helpers/SuffixMatchFilter.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/virtual/plugins/vfs/helpers/SuffixMatchFilter.java	2006-10-19 02:52:24 UTC (rev 57719)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/virtual/plugins/vfs/helpers/SuffixMatchFilter.java	2006-10-19 03:41:03 UTC (rev 57720)
@@ -22,6 +22,7 @@
 package org.jboss.virtual.plugins.vfs.helpers;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
@@ -40,7 +41,7 @@
 {
    private static Logger log = Logger.getLogger(SuffixMatchFilter.class);
    /** The suffixes */
-   private List<String> suffixes;
+   private Collection<String> suffixes;
    private boolean trace;
 
    /**
@@ -73,7 +74,7 @@
     * @param suffixes - the list of file suffixes to accept.
     * @throws IllegalArgumentException for a null suffixes
     */
-   public SuffixMatchFilter(List<String> suffixes)
+   public SuffixMatchFilter(Collection<String> suffixes)
    {
       this(suffixes, null);
    }
@@ -83,7 +84,7 @@
     * @param attributes the attributes, pass null to use {@link VisitorAttributes#RECURSE_LEAVES_ONLY}
     * @throws IllegalArgumentException for a null suffixes
     */
-   public SuffixMatchFilter(List<String> suffixes, VisitorAttributes attributes)
+   public SuffixMatchFilter(Collection<String> suffixes, VisitorAttributes attributes)
    {
       super(attributes == null ? VisitorAttributes.RECURSE_LEAVES_ONLY : attributes);
       if (suffixes == null)
@@ -101,9 +102,9 @@
    {
       String name = file.getName();
       boolean accepts = false;
-      for (int i = 0; i < suffixes.size(); ++i)
+      for(String suffix : suffixes)
       {
-         if (name.endsWith(suffixes.get(0)))
+         if (name.endsWith(suffix))
          {
             accepts = true;
             break;

Modified: projects/microcontainer/trunk/container/src/main/org/jboss/virtual/plugins/vfs/helpers/SuffixesExcludeFilter.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/virtual/plugins/vfs/helpers/SuffixesExcludeFilter.java	2006-10-19 02:52:24 UTC (rev 57719)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/virtual/plugins/vfs/helpers/SuffixesExcludeFilter.java	2006-10-19 03:41:03 UTC (rev 57720)
@@ -21,6 +21,7 @@
   */
 package org.jboss.virtual.plugins.vfs.helpers;
 
+import java.util.Collection;
 import java.util.List;
 
 import org.jboss.virtual.VirtualFile;
@@ -35,7 +36,7 @@
 public class SuffixesExcludeFilter implements VirtualFileFilter
 {
    /** The suffixes */
-   private List<String> suffixes;
+   private Collection<String> suffixes;
    
    /**
     * Create a new SuffixMatchFilter,
@@ -43,7 +44,7 @@
     * @param suffixes the suffixes
     * @throws IllegalArgumentException for null suffixes
     */
-   public SuffixesExcludeFilter(List<String> suffixes)
+   public SuffixesExcludeFilter(Collection<String> suffixes)
    {
       if (suffixes == null)
          throw new IllegalArgumentException("Null suffixes");
@@ -58,9 +59,9 @@
    public boolean accepts(VirtualFile file)
    {
       String name = file.getName();
-      for (int i = 0; i < suffixes.size(); ++i)
+      for(String suffix : suffixes)
       {
-         if (name.endsWith(suffixes.get(0)))
+         if (name.endsWith(suffix))
             return false;
       }
       return true;