Author: sebb
Date: Mon Nov 8 00:53:58 2010
New Revision: 1032432
URL: http://svn.apache.org/viewvc?rev=1032432&view=rev
Log:
Revert to raw class type until it is clear what class is really intended here
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/FileSystemOptions.java
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/FileSystemOptions.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/FileSystemOptions.java?rev=1032432&r1=1032431&r2=1032432&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/FileSystemOptions.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/FileSystemOptions.java
Mon Nov 8 00:53:58 2010
@@ -43,12 +43,14 @@ public final class FileSystemOptions imp
private static final int HASH = 29;
/** The FileSystem class */
- private final Class<FileSystem> fileSystemClass;
+ private final Class fileSystemClass;
/** The option name */
private final String name;
- private FileSystemOptionKey(Class<FileSystem> fileSystemClass, String
name)
+ // TODO the parameter name suggests that the class should only be a
+ // a FileSystem, however some of the tests pass in
DefaultFileSystemConfigBuilder
+ private FileSystemOptionKey(Class fileSystemClass, String name)
{
this.fileSystemClass = fileSystemClass;
this.name = name;
@@ -104,18 +106,18 @@ public final class FileSystemOptions imp
{
}
- void setOption(Class<FileSystem> fileSystemClass, String name, Object
value)
+ void setOption(Class<?> fileSystemClass, String name, Object value)
{
options.put(new FileSystemOptionKey(fileSystemClass, name), value);
}
- Object getOption(Class<FileSystem> fileSystemClass, String name)
+ Object getOption(Class<?> fileSystemClass, String name)
{
FileSystemOptionKey key = new FileSystemOptionKey(fileSystemClass,
name);
return options.get(key);
}
- boolean hasOption(Class<FileSystem> fileSystemClass, String name)
+ boolean hasOption(Class<?> fileSystemClass, String name)
{
FileSystemOptionKey key = new FileSystemOptionKey(fileSystemClass,
name);
return options.containsKey(key);