Author: sebb
Date: Sun Nov 7 18:36:09 2010
New Revision: 1032341
URL: http://svn.apache.org/viewvc?rev=1032341&view=rev
Log:
Add generics to Collections of Capability - continued
Modified:
commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs/provider/mime/MimeFileProvider.java
commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs/provider/smb/SmbFileProvider.java
commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs/provider/smb/SmbFileSystem.java
Modified:
commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs/provider/mime/MimeFileProvider.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs/provider/mime/MimeFileProvider.java?rev=1032341&r1=1032340&r2=1032341&view=diff
==============================================================================
---
commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs/provider/mime/MimeFileProvider.java
(original)
+++
commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs/provider/mime/MimeFileProvider.java
Sun Nov 7 18:36:09 2010
@@ -41,7 +41,7 @@ public class MimeFileProvider
extends AbstractLayeredFileProvider
implements FileProvider
{
- protected final static Collection capabilities =
Collections.unmodifiableCollection(Arrays.asList(new Capability[]
+ protected final static Collection<Capability> capabilities =
Collections.unmodifiableCollection(Arrays.asList(new Capability[]
{
Capability.GET_TYPE,
Capability.GET_LAST_MODIFIED,
@@ -68,7 +68,7 @@ public class MimeFileProvider
return new MimeFileSystem(name, file, fileSystemOptions);
}
- public Collection getCapabilities()
+ public Collection<Capability> getCapabilities()
{
return capabilities;
}
Modified:
commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs/provider/smb/SmbFileProvider.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs/provider/smb/SmbFileProvider.java?rev=1032341&r1=1032340&r2=1032341&view=diff
==============================================================================
---
commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs/provider/smb/SmbFileProvider.java
(original)
+++
commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs/provider/smb/SmbFileProvider.java
Sun Nov 7 18:36:09 2010
@@ -39,7 +39,7 @@ public class SmbFileProvider
extends AbstractOriginatingFileProvider
implements FileProvider
{
- protected final static Collection capabilities =
Collections.unmodifiableCollection(Arrays.asList(new Capability[]
+ protected final static Collection<Capability> capabilities =
Collections.unmodifiableCollection(Arrays.asList(new Capability[]
{
Capability.CREATE,
Capability.DELETE,
@@ -76,7 +76,7 @@ public class SmbFileProvider
return new SmbFileSystem(name, fileSystemOptions);
}
- public Collection getCapabilities()
+ public Collection<Capability> getCapabilities()
{
return capabilities;
}
Modified:
commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs/provider/smb/SmbFileSystem.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs/provider/smb/SmbFileSystem.java?rev=1032341&r1=1032340&r2=1032341&view=diff
==============================================================================
---
commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs/provider/smb/SmbFileSystem.java
(original)
+++
commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs/provider/smb/SmbFileSystem.java
Sun Nov 7 18:36:09 2010
@@ -16,6 +16,7 @@
*/
package org.apache.commons.vfs.provider.smb;
+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 SmbFileSystem
* Returns the capabilities of this file system.
*/
@Override
- protected void addCapabilities(final Collection caps)
+ protected void addCapabilities(final Collection<Capability> caps)
{
caps.addAll(SmbFileProvider.capabilities);
}