[jboss-cvs] JBossAS SVN: r93982 - in projects/vfs/branches/Branch_2_1/src/main/java/org/jboss/virtual: spi and 1 other directory.

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

Author: alesj
Date: 2009-09-24 07:53:41 -0400 (Thu, 24 Sep 2009)
New Revision: 93982

Modified:
   projects/vfs/branches/Branch_2_1/src/main/java/org/jboss/virtual/plugins/context/file/FileSystemContext.java
   projects/vfs/branches/Branch_2_1/src/main/java/org/jboss/virtual/spi/FileHandlerPluginRegistry.java
Log:
Simplify FHP usage.

Modified: projects/vfs/branches/Branch_2_1/src/main/java/org/jboss/virtual/plugins/context/file/FileSystemContext.java
===================================================================
--- projects/vfs/branches/Branch_2_1/src/main/java/org/jboss/virtual/plugins/context/file/FileSystemContext.java	2009-09-24 10:25:24 UTC (rev 93981)
+++ projects/vfs/branches/Branch_2_1/src/main/java/org/jboss/virtual/plugins/context/file/FileSystemContext.java	2009-09-24 11:53:41 UTC (rev 93982)
@@ -41,12 +41,11 @@
 import org.jboss.virtual.plugins.context.jar.JarHandler;
 import org.jboss.virtual.plugins.context.jar.JarUtils;
 import org.jboss.virtual.plugins.context.zip.ZipEntryContext;
+import org.jboss.virtual.spi.FileHandlerPlugin;
+import org.jboss.virtual.spi.FileHandlerPluginRegistry;
 import org.jboss.virtual.spi.LinkInfo;
 import org.jboss.virtual.spi.VFSContextConstraints;
 import org.jboss.virtual.spi.VirtualFileHandler;
-import org.jboss.virtual.spi.FileHandlerPlugin;
-import org.jboss.virtual.spi.FileHandlerPluginRegistry;
-import org.jboss.virtual.spi.VFSContext;
 
 /**
  * FileSystemContext.
@@ -68,7 +67,7 @@
  * @author <a href="strukelj at parsek.net">Marko Strukelj</a>
  * @version $Revision: 1.1 $
  */
-public class FileSystemContext extends AbstractVFSContext implements FileHandlerPlugin
+public class FileSystemContext extends AbstractVFSContext
 {
    protected static final Logger staticLog = Logger.getLogger(FileSystemContext.class);
 
@@ -228,16 +227,6 @@
       return root;
    }
 
-   public int getRelativeOrder()
-   {
-      return Integer.MAX_VALUE;
-   }
-
-   public VirtualFileHandler createHandler(VFSContext context, VirtualFileHandler parent, File file) throws IOException
-   {
-      return FileSystemContext.class.cast(context).createVirtualFileHandler(parent, file, file.toURI());
-   }
-
    /**
     * Create a new virtual file handler
     *
@@ -253,15 +242,13 @@
          throw new IllegalArgumentException("Null file");
 
       Set<FileHandlerPlugin> plugins = FileHandlerPluginRegistry.getInstance().getFileHandlerPlugins();
-      plugins.add(this); // add this to potential external plugins
-
       for(FileHandlerPlugin plugin : plugins)
       {
          VirtualFileHandler handler = plugin.createHandler(this, parent, file);
          if (handler != null)
             return handler;
       }
-      return null;
+      return createVirtualFileHandler(parent, file, file.toURI());
    }
 
    /**

Modified: projects/vfs/branches/Branch_2_1/src/main/java/org/jboss/virtual/spi/FileHandlerPluginRegistry.java
===================================================================
--- projects/vfs/branches/Branch_2_1/src/main/java/org/jboss/virtual/spi/FileHandlerPluginRegistry.java	2009-09-24 10:25:24 UTC (rev 93981)
+++ projects/vfs/branches/Branch_2_1/src/main/java/org/jboss/virtual/spi/FileHandlerPluginRegistry.java	2009-09-24 11:53:41 UTC (rev 93982)
@@ -21,11 +21,11 @@
  */
 package org.jboss.virtual.spi;
 
+import java.util.Collections;
 import java.util.Set;
 import java.util.TreeSet;
+import java.util.concurrent.CopyOnWriteArraySet;
 
-import org.jboss.util.collection.ConcurrentSet;
-
 /**
  * Singleton file handler plugin registry
  *
@@ -37,7 +37,7 @@
    private static FileHandlerPluginRegistry instance = new FileHandlerPluginRegistry();
 
    /** The file handler plugins */
-   private Set<FileHandlerPlugin> plugins = new ConcurrentSet<FileHandlerPlugin>();
+   private Set<FileHandlerPlugin> plugins = new CopyOnWriteArraySet<FileHandlerPlugin>(new TreeSet<FileHandlerPlugin>(FileHandlerPlugin.COMPARATOR));
 
    private FileHandlerPluginRegistry()
    {
@@ -76,14 +76,12 @@
    }
 
    /**
-    * Return a copy of plugins.
+    * Return unmodifiable plugins.
     *
     * @return the plugins copy
     */
    public Set<FileHandlerPlugin> getFileHandlerPlugins()
    {
-      Set<FileHandlerPlugin> copy = new TreeSet<FileHandlerPlugin>(FileHandlerPlugin.COMPARATOR);
-      copy.addAll(plugins);
-      return copy;
+      return Collections.unmodifiableSet(plugins);
    }
 }
\ No newline at end of file