[jboss-cvs] JBossAS SVN: r74304 - in projects/vfs/trunk/src: main/java/org/jboss/virtual/plugins/vfs and 1 other directories.

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

Author: alesj
Date: 2008-06-09 04:57:27 -0400 (Mon, 09 Jun 2008)
New Revision: 74304

Modified:
   projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/VfsArchiveBrowserFactory.java
   projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/vfs/VirtualFileURLConnection.java
   projects/vfs/trunk/src/test/java/org/jboss/test/virtual/support/ClassPathIterator.java
Log:
Use covariant type return on VFS url connection.

Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/VfsArchiveBrowserFactory.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/VfsArchiveBrowserFactory.java	2008-06-09 08:48:10 UTC (rev 74303)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/VfsArchiveBrowserFactory.java	2008-06-09 08:57:27 UTC (rev 74304)
@@ -27,7 +27,6 @@
 
 import org.jboss.util.file.ArchiveBrowser;
 import org.jboss.util.file.ArchiveBrowserFactory;
-import org.jboss.virtual.VirtualFile;
 import org.jboss.virtual.plugins.vfs.VirtualFileURLConnection;
 
 /**
@@ -40,13 +39,13 @@
  */
 public class VfsArchiveBrowserFactory implements ArchiveBrowserFactory
 {
+   @SuppressWarnings("deprecation")
    public Iterator create(URL url, ArchiveBrowser.Filter filter)
    {
       try
       {
          VirtualFileURLConnection conn = (VirtualFileURLConnection)url.openConnection();
-         VirtualFile vf = conn.getVirtualFile();
-         return new VfsArchiveBrowser(filter, vf);
+         return new VfsArchiveBrowser(filter, conn.getContent());
       }
       catch (IOException e)
       {               

Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/vfs/VirtualFileURLConnection.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/vfs/VirtualFileURLConnection.java	2008-06-09 08:48:10 UTC (rev 74303)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/vfs/VirtualFileURLConnection.java	2008-06-09 08:57:27 UTC (rev 74304)
@@ -65,7 +65,7 @@
    {
    }
 
-   public Object getContent() throws IOException
+   public VirtualFile getContent() throws IOException
    {
       return getVirtualFile();
    }
@@ -100,6 +100,12 @@
       return vfs.findChild(relativePath);
    }
 
+   /**
+    * Get the virtual file.
+    *
+    * @return the underlying virtual file
+    * @throws IOException for any error
+    */
    protected synchronized VirtualFile getVirtualFile() throws IOException
    {
       if (file == null)

Modified: projects/vfs/trunk/src/test/java/org/jboss/test/virtual/support/ClassPathIterator.java
===================================================================
--- projects/vfs/trunk/src/test/java/org/jboss/test/virtual/support/ClassPathIterator.java	2008-06-09 08:48:10 UTC (rev 74303)
+++ projects/vfs/trunk/src/test/java/org/jboss/test/virtual/support/ClassPathIterator.java	2008-06-09 08:57:27 UTC (rev 74304)
@@ -33,7 +33,6 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
-import org.jboss.virtual.VFS;
 import org.jboss.virtual.VirtualFile;
 import org.jboss.virtual.VirtualFileFilter;
 import org.jboss.virtual.plugins.vfs.VirtualFileURLConnection;
@@ -77,7 +76,7 @@
       else if( protocol.startsWith("vfs") )
       {
          VirtualFileURLConnection conn = (VirtualFileURLConnection)url.openConnection();
-         vf = conn.getVirtualFile();
+         vf = conn.getContent();
          rootLength = vf.getPathName().length() + 1;
          vfIter = new VirtualFileIterator(vf);
       }