Author: sebb
Date: Sun Nov 7 18:32:56 2010
New Revision: 1032340
URL: http://svn.apache.org/viewvc?rev=1032340&view=rev
Log:
Add generics to Collections of Capability - continued
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/AbstractFileSystem.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/bzip2/Bzip2FileSystem.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/compressed/CompressedFileFileSystem.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/ftp/FtpFileSystem.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/gzip/GzipFileSystem.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/http/HttpFileSystem.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/jar/JarFileSystem.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/local/LocalFileSystem.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/ram/RamFileSystem.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/sftp/SftpFileSystem.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/tar/TarFileSystem.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/url/UrlFileSystem.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/webdav/WebdavFileSystem.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/zip/ZipFileSystem.java
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/AbstractFileSystem.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/AbstractFileSystem.java?rev=1032340&r1=1032339&r2=1032340&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/AbstractFileSystem.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/AbstractFileSystem.java
Sun Nov 7 18:32:56 2010
@@ -73,7 +73,7 @@ public abstract class AbstractFileSystem
private FileObject parentLayer;
// private FileObject root;
- private final Collection caps = new HashSet();
+ private final Collection<Capability> caps = new HashSet<Capability>();
/**
* Map from FileName to FileObject.
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/bzip2/Bzip2FileSystem.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/bzip2/Bzip2FileSystem.java?rev=1032340&r1=1032339&r2=1032340&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/bzip2/Bzip2FileSystem.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/bzip2/Bzip2FileSystem.java
Sun Nov 7 18:32:56 2010
@@ -16,6 +16,7 @@
*/
package org.apache.commons.vfs.provider.bzip2;
+import org.apache.commons.vfs.Capability;
import org.apache.commons.vfs.FileName;
import org.apache.commons.vfs.FileObject;
import org.apache.commons.vfs.FileSystemException;
@@ -45,7 +46,7 @@ public class Bzip2FileSystem extends Com
}
@Override
- protected void addCapabilities(final Collection caps)
+ protected void addCapabilities(final Collection<Capability> caps)
{
caps.addAll(Bzip2FileProvider.capabilities);
}
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/compressed/CompressedFileFileSystem.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/compressed/CompressedFileFileSystem.java?rev=1032340&r1=1032339&r2=1032340&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/compressed/CompressedFileFileSystem.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/compressed/CompressedFileFileSystem.java
Sun Nov 7 18:32:56 2010
@@ -16,6 +16,7 @@
*/
package org.apache.commons.vfs.provider.compressed;
+import org.apache.commons.vfs.Capability;
import org.apache.commons.vfs.FileName;
import org.apache.commons.vfs.FileObject;
import org.apache.commons.vfs.FileSystem;
@@ -54,7 +55,7 @@ public abstract class CompressedFileFile
* Returns the capabilities of this file system.
*/
@Override
- protected abstract void addCapabilities(final Collection caps);
+ protected abstract void addCapabilities(final Collection<Capability> caps);
/**
* Creates a file object.
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/ftp/FtpFileSystem.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/ftp/FtpFileSystem.java?rev=1032340&r1=1032339&r2=1032340&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/ftp/FtpFileSystem.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/ftp/FtpFileSystem.java
Sun Nov 7 18:32:56 2010
@@ -18,6 +18,7 @@ package org.apache.commons.vfs.provider.
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.commons.vfs.Capability;
import org.apache.commons.vfs.FileName;
import org.apache.commons.vfs.FileObject;
import org.apache.commons.vfs.FileSystemException;
@@ -71,7 +72,7 @@ public class FtpFileSystem extends Abstr
* Adds the capabilities of this file system.
*/
@Override
- protected void addCapabilities(final Collection caps)
+ protected void addCapabilities(final Collection<Capability> caps)
{
caps.addAll(FtpFileProvider.capabilities);
}
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/gzip/GzipFileSystem.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/gzip/GzipFileSystem.java?rev=1032340&r1=1032339&r2=1032340&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/gzip/GzipFileSystem.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/gzip/GzipFileSystem.java
Sun Nov 7 18:32:56 2010
@@ -16,6 +16,7 @@
*/
package org.apache.commons.vfs.provider.gzip;
+import org.apache.commons.vfs.Capability;
import org.apache.commons.vfs.FileName;
import org.apache.commons.vfs.FileObject;
import org.apache.commons.vfs.FileSystemException;
@@ -45,7 +46,7 @@ public class GzipFileSystem extends Comp
}
@Override
- protected void addCapabilities(final Collection caps)
+ protected void addCapabilities(final Collection<Capability> caps)
{
caps.addAll(GzipFileProvider.capabilities);
}
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/http/HttpFileSystem.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/http/HttpFileSystem.java?rev=1032340&r1=1032339&r2=1032340&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/http/HttpFileSystem.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/http/HttpFileSystem.java
Sun Nov 7 18:32:56 2010
@@ -19,6 +19,7 @@ package org.apache.commons.vfs.provider.
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpConnectionManager;
import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
+import org.apache.commons.vfs.Capability;
import org.apache.commons.vfs.FileName;
import org.apache.commons.vfs.FileObject;
import org.apache.commons.vfs.FileSystem;
@@ -51,7 +52,7 @@ public class HttpFileSystem
* Adds the capabilities of this file system.
*/
@Override
- protected void addCapabilities(final Collection caps)
+ protected void addCapabilities(final Collection<Capability> caps)
{
caps.addAll(HttpFileProvider.capabilities);
}
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/jar/JarFileSystem.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/jar/JarFileSystem.java?rev=1032340&r1=1032339&r2=1032340&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/jar/JarFileSystem.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/jar/JarFileSystem.java
Sun Nov 7 18:32:56 2010
@@ -16,6 +16,7 @@
*/
package org.apache.commons.vfs.provider.jar;
+import org.apache.commons.vfs.Capability;
import org.apache.commons.vfs.FileName;
import org.apache.commons.vfs.FileObject;
import org.apache.commons.vfs.FileSystemException;
@@ -75,7 +76,7 @@ public class JarFileSystem
* Returns the capabilities of this file system.
*/
@Override
- protected void addCapabilities(final Collection caps)
+ protected void addCapabilities(final Collection<Capability> caps)
{
// super.addCapabilities(caps);
caps.addAll(JarFileProvider.capabilities);
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/local/LocalFileSystem.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/local/LocalFileSystem.java?rev=1032340&r1=1032339&r2=1032340&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/local/LocalFileSystem.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/local/LocalFileSystem.java
Sun Nov 7 18:32:56 2010
@@ -16,6 +16,7 @@
*/
package org.apache.commons.vfs.provider.local;
+import org.apache.commons.vfs.Capability;
import org.apache.commons.vfs.FileName;
import org.apache.commons.vfs.FileObject;
import org.apache.commons.vfs.FileSelector;
@@ -62,7 +63,7 @@ public class LocalFileSystem
* Returns the capabilities of this file system.
*/
@Override
- protected void addCapabilities(final Collection caps)
+ protected void addCapabilities(final Collection<Capability> caps)
{
caps.addAll(DefaultLocalFileProvider.capabilities);
}
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/ram/RamFileSystem.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/ram/RamFileSystem.java?rev=1032340&r1=1032339&r2=1032340&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/ram/RamFileSystem.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/ram/RamFileSystem.java
Sun Nov 7 18:32:56 2010
@@ -28,6 +28,7 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
+import org.apache.commons.vfs.Capability;
import org.apache.commons.vfs.FileName;
import org.apache.commons.vfs.FileObject;
import org.apache.commons.vfs.FileSystemException;
@@ -80,7 +81,7 @@ public class RamFileSystem extends Abstr
* @see
org.apache.commons.vfs.provider.AbstractFileSystem#addCapabilities(java.util.Collection)
*/
@Override
- protected void addCapabilities(Collection caps)
+ protected void addCapabilities(Collection<Capability> caps)
{
caps.addAll(RamFileProvider.capabilities);
}
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/sftp/SftpFileSystem.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/sftp/SftpFileSystem.java?rev=1032340&r1=1032339&r2=1032340&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/sftp/SftpFileSystem.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/sftp/SftpFileSystem.java
Sun Nov 7 18:32:56 2010
@@ -20,6 +20,8 @@ import com.jcraft.jsch.ChannelSftp;
import com.jcraft.jsch.JSchException;
import com.jcraft.jsch.Session;
import com.jcraft.jsch.SftpException;
+
+import org.apache.commons.vfs.Capability;
import org.apache.commons.vfs.FileName;
import org.apache.commons.vfs.FileObject;
import org.apache.commons.vfs.FileSystem;
@@ -178,7 +180,7 @@ public class SftpFileSystem
* Adds the capabilities of this file system.
*/
@Override
- protected void addCapabilities(final Collection caps)
+ protected void addCapabilities(final Collection<Capability> caps)
{
caps.addAll(SftpFileProvider.capabilities);
}
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/tar/TarFileSystem.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/tar/TarFileSystem.java?rev=1032340&r1=1032339&r2=1032340&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/tar/TarFileSystem.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/tar/TarFileSystem.java
Sun Nov 7 18:32:56 2010
@@ -21,6 +21,7 @@ package org.apache.commons.vfs.provider.
//import org.apache.commons.compress.tar.TarInputStream;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.commons.vfs.Capability;
import org.apache.commons.vfs.FileName;
import org.apache.commons.vfs.FileObject;
import org.apache.commons.vfs.FileSystem;
@@ -242,7 +243,7 @@ public class TarFileSystem
* Returns the capabilities of this file system.
*/
@Override
- protected void addCapabilities(final Collection caps)
+ protected void addCapabilities(final Collection<Capability> caps)
{
caps.addAll(TarFileProvider.capabilities);
}
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/url/UrlFileSystem.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/url/UrlFileSystem.java?rev=1032340&r1=1032339&r2=1032340&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/url/UrlFileSystem.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/url/UrlFileSystem.java
Sun Nov 7 18:32:56 2010
@@ -16,6 +16,7 @@
*/
package org.apache.commons.vfs.provider.url;
+import org.apache.commons.vfs.Capability;
import org.apache.commons.vfs.FileName;
import org.apache.commons.vfs.FileObject;
import org.apache.commons.vfs.FileSystem;
@@ -52,7 +53,7 @@ public class UrlFileSystem
* Returns the capabilities of this file system.
*/
@Override
- protected void addCapabilities(final Collection caps)
+ protected void addCapabilities(final Collection<Capability> caps)
{
caps.addAll(UrlFileProvider.capabilities);
}
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/webdav/WebdavFileSystem.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/webdav/WebdavFileSystem.java?rev=1032340&r1=1032339&r2=1032340&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/webdav/WebdavFileSystem.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/webdav/WebdavFileSystem.java
Sun Nov 7 18:32:56 2010
@@ -20,6 +20,7 @@ import java.net.URLStreamHandler;
import java.util.Collection;
import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.vfs.Capability;
import org.apache.commons.vfs.FileName;
import org.apache.commons.vfs.FileObject;
import org.apache.commons.vfs.FileSystem;
@@ -53,7 +54,7 @@ public class WebdavFileSystem extends Ht
* @caps The Capabilities to add.
*/
@Override
- protected void addCapabilities(final Collection caps)
+ protected void addCapabilities(final Collection<Capability> caps)
{
caps.addAll(WebdavFileProvider.capabilities);
}
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/zip/ZipFileSystem.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/zip/ZipFileSystem.java?rev=1032340&r1=1032339&r2=1032340&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/zip/ZipFileSystem.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/zip/ZipFileSystem.java
Sun Nov 7 18:32:56 2010
@@ -18,6 +18,7 @@ package org.apache.commons.vfs.provider.
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.commons.vfs.Capability;
import org.apache.commons.vfs.FileName;
import org.apache.commons.vfs.FileObject;
import org.apache.commons.vfs.FileSystem;
@@ -183,7 +184,7 @@ public class ZipFileSystem
* Returns the capabilities of this file system.
*/
@Override
- protected void addCapabilities(final Collection caps)
+ protected void addCapabilities(final Collection<Capability> caps)
{
caps.addAll(ZipFileProvider.capabilities);
}
