Author: sebb
Date: Sun Nov 7 23:13:31 2010
New Revision: 1032417
URL: http://svn.apache.org/viewvc?rev=1032417&view=rev
Log:
Fix up generics
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/impl/DefaultFileMonitor.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/impl/FileTypeMap.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/impl/PrivilegedFileReplicator.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/impl/ProviderConfiguration.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/impl/VFSClassLoader.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/impl/VirtualFileSystem.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/operations/AbstractFileOperationProvider.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/operations/DefaultFileOperations.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/ftp/FtpFileObject.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/jar/JarFileObject.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/ram/RamFileData.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/SftpFileObject.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/tar/TarFileObject.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/webdav/ExceptionConverter.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/webdav/WebdavFileObject.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/tasks/AbstractSyncTask.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/util/CombinedResources.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/util/DelegatingFileSystemOptionsBuilder.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/util/Messages.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/util/Os.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/util/WeakRefFileListener.java
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/impl/DefaultFileMonitor.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/impl/DefaultFileMonitor.java?rev=1032417&r1=1032416&r2=1032417&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/impl/DefaultFileMonitor.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/impl/DefaultFileMonitor.java
Sun Nov 7 23:13:31 2010
@@ -91,7 +91,7 @@ public class DefaultFileMonitor implemen
/**
* Map from FileName to FileObject being monitored.
*/
- private final Map monitorMap = new HashMap();
+ private final Map<FileName, FileMonitorAgent> monitorMap = new
HashMap<FileName, FileMonitorAgent>();
/**
* The low priority thread used for checking the files being monitored.
@@ -101,12 +101,12 @@ public class DefaultFileMonitor implemen
/**
* File objects to be removed from the monitor map.
*/
- private final Stack deleteStack = new Stack();
+ private final Stack<FileObject> deleteStack = new Stack<FileObject>();
/**
* File objects to be added to the monitor map.
*/
- private final Stack addStack = new Stack();
+ private final Stack<FileObject> addStack = new Stack<FileObject>();
/**
* A flag used to determine if the monitor thread should be running.
@@ -258,7 +258,7 @@ public class DefaultFileMonitor implemen
if (parent != null)
{ // Not the root
FileMonitorAgent parentAgent =
- (FileMonitorAgent)
this.monitorMap.get(parent.getName());
+ this.monitorMap.get(parent.getName());
if (parentAgent != null)
{
parentAgent.resetChildrenList();
@@ -363,7 +363,7 @@ public class DefaultFileMonitor implemen
{
while (!this.deleteStack.empty())
{
- this.removeFile((FileObject) this.deleteStack.pop());
+ this.removeFile(this.deleteStack.pop());
}
// For each entry in the map
@@ -379,7 +379,7 @@ public class DefaultFileMonitor implemen
FileMonitorAgent agent;
synchronized (this.monitorMap)
{
- agent = (FileMonitorAgent) this.monitorMap.get(fileName);
+ agent = this.monitorMap.get(fileName);
}
if (agent != null)
{
@@ -409,7 +409,7 @@ public class DefaultFileMonitor implemen
while (!this.addStack.empty())
{
- this.addFile((FileObject) this.addStack.pop());
+ this.addFile(this.addStack.pop());
}
try
@@ -435,7 +435,7 @@ public class DefaultFileMonitor implemen
private boolean exists;
private long timestamp;
- private Map children;
+ private Map<FileName, Object> children;
private FileMonitorAgent(DefaultFileMonitor fm, FileObject file)
{
@@ -474,7 +474,7 @@ public class DefaultFileMonitor implemen
{
if (this.file.getType().hasChildren())
{
- this.children = new HashMap();
+ this.children = new HashMap<FileName, Object>();
FileObject[] childrenList = this.file.getChildren();
for (int i = 0; i < childrenList.length; i++)
{
@@ -567,8 +567,8 @@ public class DefaultFileMonitor implemen
if (this.children != null)
{
// See which new children are not listed in the
current children map.
- Map newChildrenMap = new HashMap();
- Stack missingChildren = new Stack();
+ Map<FileName, Object> newChildrenMap = new
HashMap<FileName, Object>();
+ Stack<FileObject> missingChildren = new
Stack<FileObject>();
for (int i = 0; i < newChildren.length; i++)
{
@@ -590,8 +590,7 @@ public class DefaultFileMonitor implemen
while (!missingChildren.empty())
{
- FileObject child = (FileObject)
- missingChildren.pop();
+ FileObject child = missingChildren.pop();
this.fireAllCreate(child);
}
}
@@ -602,7 +601,7 @@ public class DefaultFileMonitor implemen
// First set of children - Break out the cigars
if (newChildren.length > 0)
{
- this.children = new HashMap();
+ this.children = new HashMap<FileName, Object>();
}
for (int i = 0; i < newChildren.length; i++)
{
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/impl/FileTypeMap.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/impl/FileTypeMap.java?rev=1032417&r1=1032416&r2=1032417&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/impl/FileTypeMap.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/impl/FileTypeMap.java
Sun Nov 7 23:13:31 2010
@@ -31,8 +31,8 @@ import java.util.Map;
*/
class FileTypeMap
{
- private final Map mimeTypeMap = new HashMap();
- private final Map extensionMap = new HashMap();
+ private final Map<String, String> mimeTypeMap = new HashMap<String,
String>();
+ private final Map<String, String> extensionMap = new HashMap<String,
String>();
/**
* Adds a MIME type mapping.
@@ -61,11 +61,11 @@ class FileTypeMap
final String mimeType = content.getContentInfo().getContentType();
if (mimeType != null)
{
- return (String) mimeTypeMap.get(mimeType);
+ return mimeTypeMap.get(mimeType);
}
// Check the file's extension for a match
final String extension = file.getName().getExtension();
- return (String) extensionMap.get(extension);
+ return extensionMap.get(extension);
}
}
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/impl/PrivilegedFileReplicator.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/impl/PrivilegedFileReplicator.java?rev=1032417&r1=1032416&r2=1032417&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/impl/PrivilegedFileReplicator.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/impl/PrivilegedFileReplicator.java
Sun Nov 7 23:13:31 2010
@@ -123,7 +123,7 @@ public class PrivilegedFileReplicator
try
{
final ReplicateAction action = new ReplicateAction(srcFile,
selector);
- return (File) AccessController.doPrivileged(action);
+ return AccessController.doPrivileged(action);
}
catch (final PrivilegedActionException e)
{
@@ -134,7 +134,7 @@ public class PrivilegedFileReplicator
/**
* An action that initialises the wrapped replicator.
*/
- private class InitAction implements PrivilegedExceptionAction
+ private class InitAction implements PrivilegedExceptionAction<Object>
{
/**
* Performs the action.
@@ -149,7 +149,7 @@ public class PrivilegedFileReplicator
/**
* An action that replicates a file using the wrapped replicator.
*/
- private class ReplicateAction implements PrivilegedExceptionAction
+ private class ReplicateAction implements PrivilegedExceptionAction<File>
{
private final FileObject srcFile;
private final FileSelector selector;
@@ -165,7 +165,7 @@ public class PrivilegedFileReplicator
* Performs the action.
* @throws Exception if an error occurs.
*/
- public Object run() throws Exception
+ public File run() throws Exception
{
// TODO - Do not pass the selector through. It is untrusted
// TODO - Need to determine which files can be read
@@ -176,7 +176,7 @@ public class PrivilegedFileReplicator
/**
* An action that closes the wrapped replicator.
*/
- private class CloseAction implements PrivilegedAction
+ private class CloseAction implements PrivilegedAction<Object>
{
/**
* Performs the action.
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/impl/ProviderConfiguration.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/impl/ProviderConfiguration.java?rev=1032417&r1=1032416&r2=1032417&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/impl/ProviderConfiguration.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/impl/ProviderConfiguration.java
Sun Nov 7 23:13:31 2010
@@ -29,8 +29,8 @@ import java.util.List;
public class ProviderConfiguration
{
private String className;
- private final List schemes = new ArrayList(10);
- private final List dependenies = new ArrayList(10);
+ private final List<String> schemes = new ArrayList<String>(10);
+ private final List<String> dependenies = new ArrayList<String>(10);
public ProviderConfiguration()
{
@@ -51,7 +51,7 @@ public class ProviderConfiguration
schemes.add(scheme);
}
- public List getSchemes()
+ public List<String> getSchemes()
{
return schemes;
}
@@ -61,7 +61,7 @@ public class ProviderConfiguration
dependenies.add(dependency);
}
- public List getDependencies()
+ public List<String> getDependencies()
{
return dependenies;
}
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/impl/VFSClassLoader.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/impl/VFSClassLoader.java?rev=1032417&r1=1032416&r2=1032417&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/impl/VFSClassLoader.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/impl/VFSClassLoader.java
Sun Nov 7 23:13:31 2010
@@ -49,7 +49,7 @@ import java.util.jar.Attributes.Name;
*/
public class VFSClassLoader extends SecureClassLoader
{
- private final ArrayList resources = new ArrayList();
+ private final ArrayList<FileObject> resources = new
ArrayList<FileObject>();
/**
* Constructors a new VFSClassLoader for the given file.
@@ -123,7 +123,7 @@ public class VFSClassLoader extends Secu
*/
public FileObject[] getFileObjects()
{
- return (FileObject[]) resources.toArray(new
FileObject[resources.size()]);
+ return resources.toArray(new FileObject[resources.size()]);
}
/**
@@ -317,9 +317,9 @@ public class VFSClassLoader extends Secu
protected void copyPermissions(final PermissionCollection src,
final PermissionCollection dest)
{
- for (Enumeration elem = src.elements(); elem.hasMoreElements();)
+ for (Enumeration<Permission> elem = src.elements();
elem.hasMoreElements();)
{
- final Permission permission = (Permission) elem.nextElement();
+ final Permission permission = elem.nextElement();
dest.add(permission);
}
}
@@ -330,10 +330,10 @@ public class VFSClassLoader extends Secu
*/
private FileObject lookupFileObject(final String name)
{
- final Iterator it = resources.iterator();
+ final Iterator<FileObject> it = resources.iterator();
while (it.hasNext())
{
- final FileObject object = (FileObject) it.next();
+ final FileObject object = it.next();
if (name.equals(object.getName().getURI()))
{
return object;
@@ -401,10 +401,10 @@ public class VFSClassLoader extends Secu
*/
private Resource loadResource(final String name) throws FileSystemException
{
- final Iterator it = resources.iterator();
+ final Iterator<FileObject> it = resources.iterator();
while (it.hasNext())
{
- final FileObject baseFile = (FileObject) it.next();
+ final FileObject baseFile = it.next();
final FileObject file =
baseFile.resolveFile(name, NameScope.DESCENDENT_OR_SELF);
if (file.exists())
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/impl/VirtualFileSystem.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/impl/VirtualFileSystem.java?rev=1032417&r1=1032416&r2=1032417&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/impl/VirtualFileSystem.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/impl/VirtualFileSystem.java
Sun Nov 7 23:13:31 2010
@@ -42,7 +42,7 @@ import java.util.Map;
public class VirtualFileSystem
extends AbstractFileSystem
{
- private final Map junctions = new HashMap();
+ private final Map<FileName, FileObject> junctions = new HashMap<FileName,
FileObject>();
public VirtualFileSystem(final FileName rootName, final FileSystemOptions
fileSystemOptions)
{
@@ -85,7 +85,7 @@ public class VirtualFileSystem
if (junctionPoint != null)
{
// Resolve the real file
- final FileObject junctionFile = (FileObject)
junctions.get(junctionPoint);
+ final FileObject junctionFile = junctions.get(junctionPoint);
final String relName = junctionPoint.getRelativeName(name);
file = junctionFile.resolveFile(relName,
NameScope.DESCENDENT_OR_SELF);
}
@@ -189,9 +189,9 @@ public class VirtualFileSystem
}
// Find matching junction
- for (Iterator iterator = junctions.keySet().iterator();
iterator.hasNext();)
+ for (Iterator<FileName> iterator = junctions.keySet().iterator();
iterator.hasNext();)
{
- final FileName junctionPoint = (FileName) iterator.next();
+ final FileName junctionPoint = iterator.next();
if (junctionPoint.isDescendent(name))
{
return junctionPoint;
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/operations/AbstractFileOperationProvider.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/operations/AbstractFileOperationProvider.java?rev=1032417&r1=1032416&r2=1032417&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/operations/AbstractFileOperationProvider.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/operations/AbstractFileOperationProvider.java
Sun Nov 7 23:13:31 2010
@@ -39,7 +39,7 @@ public abstract class AbstractFileOperat
* "svn", "svnssh", but not for "file", etc. The Map has scheme as a key
and
* Colleaction of operations that are available for that scheme.
*/
- private final Collection operations = new ArrayList();
+ private final Collection<Class<?>> operations = new ArrayList<Class<?>>();
/**
* Gather available operations for the specified FileObject and put them
into
@@ -82,7 +82,7 @@ public abstract class AbstractFileOperat
public final FileOperation getOperation(FileObject file, Class
operationClass)
throws FileSystemException
{
- Class implementation = lookupOperation(operationClass);
+ Class<?> implementation = lookupOperation(operationClass);
FileOperation operationInstance = instantiateOperation(file,
implementation);
@@ -103,7 +103,7 @@ public abstract class AbstractFileOperat
* @param operationClass
* @return never returns null
*/
- protected final Class lookupOperation(final Class operationClass)
+ protected final Class lookupOperation(final Class<?> operationClass)
throws FileSystemException
{
// check validity of passed class
@@ -113,11 +113,11 @@ public abstract class AbstractFileOperat
}
// find appropriate class
- Class foundClass = null;
- Iterator iterator = operations.iterator();
+ Class<?> foundClass = null;
+ Iterator<Class<?>> iterator = operations.iterator();
while (iterator.hasNext())
{
- Class operation = (Class) iterator.next();
+ Class<?> operation = iterator.next();
if (operationClass.isAssignableFrom(operation))
{
foundClass = operation;
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/operations/DefaultFileOperations.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/operations/DefaultFileOperations.java?rev=1032417&r1=1032416&r2=1032417&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/operations/DefaultFileOperations.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/operations/DefaultFileOperations.java
Sun Nov 7 23:13:31 2010
@@ -68,7 +68,7 @@ public class DefaultFileOperations imple
return null;
}
- final List operations = new ArrayList();
+ final List<Class<?>> operations = new ArrayList<Class<?>>();
for (int i = 0; i < providers.length; i++)
{
@@ -77,7 +77,7 @@ public class DefaultFileOperations imple
provider.collectOperations(operations, fileObject);
}
- return (Class[]) operations.toArray(new Class[] {});
+ return operations.toArray(new Class[] {});
}
/**
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/ftp/FtpFileObject.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/ftp/FtpFileObject.java?rev=1032417&r1=1032416&r2=1032417&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/ftp/FtpFileObject.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/ftp/FtpFileObject.java
Sun Nov 7 23:13:31 2010
@@ -52,7 +52,7 @@ import org.apache.commons.vfs.util.Rando
public class FtpFileObject
extends AbstractFileObject
{
- private static final Map EMPTY_FTP_FILE_MAP =
Collections.unmodifiableMap(new TreeMap());
+ private static final Map<String, FTPFile> EMPTY_FTP_FILE_MAP =
Collections.unmodifiableMap(new TreeMap<String, FTPFile>());
private static final FTPFile UNKNOWN = new FTPFile();
private final Log log = LogFactory.getLog(FtpFileObject.class);
@@ -61,7 +61,7 @@ public class FtpFileObject
// Cached info
private FTPFile fileInfo;
- private Map children;
+ private Map<String, FTPFile> children;
private FileObject linkDestination;
private boolean inRefresh;
@@ -116,7 +116,7 @@ public class FtpFileObject
}
// Look for the requested child
- FTPFile ftpFile = (FTPFile) children.get(name);
+ FTPFile ftpFile = children.get(name);
return ftpFile;
}
@@ -144,7 +144,7 @@ public class FtpFileObject
}
else
{
- children = new TreeMap();
+ children = new TreeMap<String, FTPFile>();
// Remove '.' and '..' elements
for (int i = 0; i < tmpChildren.length; i++)
@@ -444,11 +444,11 @@ public class FtpFileObject
// TODO - get rid of this children stuff
final String[] childNames = new String[children.size()];
int childNum = -1;
- Iterator iterChildren = children.values().iterator();
+ Iterator<FTPFile> iterChildren = children.values().iterator();
while (iterChildren.hasNext())
{
childNum++;
- final FTPFile child = (FTPFile) iterChildren.next();
+ final FTPFile child = iterChildren.next();
childNames[childNum] = child.getName();
}
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/jar/JarFileObject.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/jar/JarFileObject.java?rev=1032417&r1=1032416&r2=1032417&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/jar/JarFileObject.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/jar/JarFileObject.java
Sun Nov 7 23:13:31 2010
@@ -25,6 +25,7 @@ import java.security.cert.Certificate;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.jar.Attributes;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
@@ -102,10 +103,10 @@ public class JarFileObject extends ZipFi
* Returns the value of an attribute.
*/
@Override
- protected Map doGetAttributes()
+ protected Map<String, Object> doGetAttributes()
throws Exception
{
- final Map attrs = new HashMap();
+ final Map<String, Object> attrs = new HashMap<String, Object>();
// Add the file system's attributes first
final JarFileSystem fs = (JarFileSystem) getFileSystem();
@@ -120,11 +121,11 @@ public class JarFileObject extends ZipFi
/**
* Adds the source attributes to the destination map.
*/
- private void addAll(final Attributes src, final Map dest)
+ private void addAll(final Attributes src, final Map<String, Object> dest)
{
- for (Iterator iterator = src.entrySet().iterator();
iterator.hasNext();)
+ for (Iterator<Entry<Object, Object>> iterator =
src.entrySet().iterator(); iterator.hasNext();)
{
- final Map.Entry entry = (Map.Entry) iterator.next();
+ final Map.Entry<Object, Object> entry = iterator.next();
// final String name = entry.getKey().toString().toLowerCase();
final String name = entry.getKey().toString();
dest.put(name, entry.getValue());
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/ram/RamFileData.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/ram/RamFileData.java?rev=1032417&r1=1032416&r2=1032417&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/ram/RamFileData.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/ram/RamFileData.java
Sun Nov 7 23:13:31 2010
@@ -54,7 +54,7 @@ class RamFileData implements Serializabl
/**
* Children
*/
- private final Collection children;
+ private final Collection<RamFileData> children;
/**
* Constructor.
@@ -63,7 +63,7 @@ class RamFileData implements Serializabl
public RamFileData(FileName name)
{
super();
- this.children = Collections.synchronizedCollection(new ArrayList());
+ this.children = Collections.synchronizedCollection(new
ArrayList<RamFileData>());
this.clear();
if (name == null)
{
@@ -211,7 +211,7 @@ class RamFileData implements Serializabl
/**
* @return Returns the children.
*/
- Collection getChildren()
+ Collection<RamFileData> getChildren()
{
if (name == null)
{
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=1032417&r1=1032416&r2=1032417&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 23:13:31 2010
@@ -45,7 +45,7 @@ public class RamFileSystem extends Abstr
/**
* Cache of RAM File Data
*/
- private final Map cache;
+ private final Map<FileName, RamFileData> cache;
/**
* @param rootName The root file name.
@@ -55,7 +55,7 @@ public class RamFileSystem extends Abstr
FileSystemOptions fileSystemOptions)
{
super(rootName, null, fileSystemOptions);
- this.cache = Collections.synchronizedMap(new HashMap());
+ this.cache = Collections.synchronizedMap(new HashMap<FileName,
RamFileData>());
// create root
RamFileData rootData = new RamFileData(rootName);
rootData.setType(FileType.FOLDER);
@@ -92,22 +92,22 @@ public class RamFileSystem extends Abstr
*/
String[] listChildren(FileName name)
{
- RamFileData data = (RamFileData) this.cache.get(name);
+ RamFileData data = this.cache.get(name);
if (data == null || !data.getType().hasChildren())
{
return null;
}
- Collection children = data.getChildren();
+ Collection<RamFileData> children = data.getChildren();
String[] names;
synchronized(children) {
names = new String[children.size()];
int pos = 0;
- Iterator iter = children.iterator();
+ Iterator<RamFileData> iter = children.iterator();
while (iter.hasNext())
{
- RamFileData childData = (RamFileData) iter.next();
+ RamFileData childData = iter.next();
names[pos] = childData.getName().getBaseName();
pos++;
}
@@ -161,8 +161,7 @@ public class RamFileSystem extends Abstr
// Add to the parent
if (file.getName().getDepth() > 0)
{
- RamFileData parentData = (RamFileData) this.cache.get(file
- .getParent().getName());
+ RamFileData parentData =
this.cache.get(file.getParent().getName());
// Only if not already added
if (!parentData.hasChildren(file.getData()))
{
@@ -206,7 +205,7 @@ public class RamFileSystem extends Abstr
{
throw new IllegalArgumentException("Null argument");
}
- RamFileData data = (RamFileData) this.cache.get(fo.getName());
+ RamFileData data = this.cache.get(fo.getName());
if (data == null)
{
data = new RamFileData(fo.getName());
@@ -300,10 +299,10 @@ public class RamFileSystem extends Abstr
{
int size = 0;
synchronized(cache) {
- Iterator iter = cache.values().iterator();
+ Iterator<RamFileData> iter = cache.values().iterator();
while (iter.hasNext())
{
- RamFileData data = (RamFileData) iter.next();
+ RamFileData data = iter.next();
size += data.size();
}
}
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/sftp/SftpFileObject.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/sftp/SftpFileObject.java?rev=1032417&r1=1032416&r2=1032417&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/sftp/SftpFileObject.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/sftp/SftpFileObject.java
Sun Nov 7 23:13:31 2010
@@ -298,7 +298,7 @@ public class SftpFileObject extends Abst
protected FileObject[] doListChildrenResolved() throws Exception
{
// List the contents of the folder
- Vector vector = null;
+ Vector<LsEntry> vector = null;
final ChannelSftp channel = fileSystem.getChannel();
try
@@ -363,10 +363,10 @@ public class SftpFileObject extends Abst
}
// Extract the child names
- final ArrayList children = new ArrayList();
- for (Iterator iterator = vector.iterator(); iterator.hasNext();)
+ final ArrayList<FileObject> children = new ArrayList<FileObject>();
+ for (Iterator<LsEntry> iterator = vector.iterator();
iterator.hasNext();)
{
- final LsEntry stat = (LsEntry) iterator.next();
+ final LsEntry stat = iterator.next();
String name = stat.getFilename();
if (VFS.isUriStyle())
@@ -396,8 +396,7 @@ public class SftpFileObject extends Abst
children.add(fo);
}
- return (FileObject[]) children.toArray(new FileObject[children
- .size()]);
+ return children.toArray(new FileObject[children.size()]);
}
/**
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/tar/TarFileObject.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/tar/TarFileObject.java?rev=1032417&r1=1032416&r2=1032417&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/tar/TarFileObject.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/tar/TarFileObject.java
Sun Nov 7 23:13:31 2010
@@ -37,7 +37,7 @@ public class TarFileObject
{
/** The TarEntry */
protected TarEntry entry;
- private final HashSet children = new HashSet();
+ private final HashSet<String> children = new HashSet<String>();
private final TarFileSystem fs;
private FileType type;
@@ -125,7 +125,7 @@ public class TarFileObject
throw new RuntimeException(e);
}
- return (String[]) children.toArray(new String[children.size()]);
+ return children.toArray(new String[children.size()]);
}
/**
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=1032417&r1=1032416&r2=1032417&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 23:13:31 2010
@@ -86,7 +86,7 @@ public class TarFileSystem
// Build the index
try
{
- List strongRef = new ArrayList(100);
+ List<TarFileObject> strongRef = new ArrayList<TarFileObject>(100);
TarEntry entry;
while ((entry = getTarFile().getNextEntry()) != null)
{
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/webdav/ExceptionConverter.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/webdav/ExceptionConverter.java?rev=1032417&r1=1032416&r2=1032417&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/webdav/ExceptionConverter.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/webdav/ExceptionConverter.java
Sun Nov 7 23:13:31 2010
@@ -61,8 +61,8 @@ public final class ExceptionConverter
}
if (DomUtil.hasChildElement(exc, "class", null))
{
- Class cl = Class.forName(DomUtil.getChildText(exc,
"class", null));
- Constructor excConstr = cl.getConstructor(new
Class[]{String.class});
+ Class<?> cl =
Class.forName(DomUtil.getChildText(exc, "class", null));
+ Constructor<?> excConstr = cl.getConstructor(new
Class[]{String.class});
if (excConstr != null)
{
Object o = excConstr.newInstance(new
String[]{msg});
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/webdav/WebdavFileObject.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/webdav/WebdavFileObject.java?rev=1032417&r1=1032416&r2=1032417&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/webdav/WebdavFileObject.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/webdav/WebdavFileObject.java
Sun Nov 7 23:13:31 2010
@@ -153,7 +153,7 @@ public class WebdavFileObject extends Ht
DavConstants.DEPTH_1);
execute(method);
- List vfs = new ArrayList();
+ List<WebdavFileObject> vfs = new ArrayList<WebdavFileObject>();
if (method.succeeded())
{
MultiStatusResponse[] responses =
@@ -178,7 +178,7 @@ public class WebdavFileObject extends Ht
}
}
}
- return (WebdavFileObject[]) vfs.toArray(new
WebdavFileObject[vfs.size()]);
+ return vfs.toArray(new WebdavFileObject[vfs.size()]);
}
throw new FileNotFolderException(getName());
}
@@ -283,25 +283,25 @@ public class WebdavFileObject extends Ht
* Returns the properties of the Webdav resource.
*/
@Override
- protected Map doGetAttributes() throws Exception
+ protected Map<String, Object> doGetAttributes() throws Exception
{
- final Map attributes = new HashMap();
+ final Map<String, Object> attributes = new HashMap<String, Object>();
try
{
URLFileName fileName = (URLFileName) getName();
DavPropertySet properties = getProperties(fileName,
PropFindMethod.PROPFIND_ALL_PROP,
new DavPropertyNameSet(), false);
- Iterator iter = properties.iterator();
+ Iterator<DavProperty> iter = properties.iterator();
while (iter.hasNext())
{
- DavProperty property = (DavProperty) iter.next();
+ DavProperty property = iter.next();
attributes.put(property.getName().toString(),
property.getValue());
}
properties = getPropertyNames(fileName);
iter = properties.iterator();
while (iter.hasNext())
{
- DavProperty property = (DavProperty) iter.next();
+ DavProperty property = iter.next();
if (!attributes.containsKey(property.getName()))
{
property = getProperty(fileName, property.getName());
@@ -749,7 +749,7 @@ public class WebdavFileObject extends Ht
private void setUserName(URLFileName fileName, String urlStr)
throws IOException
{
- List list = new ArrayList();
+ List<DefaultDavProperty> list = new
ArrayList<DefaultDavProperty>();
String name =
builder.getCreatorName(getFileSystem().getFileSystemOptions());
String userName = fileName.getUserName();
if (name == null)
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/tasks/AbstractSyncTask.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/tasks/AbstractSyncTask.java?rev=1032417&r1=1032416&r2=1032417&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/tasks/AbstractSyncTask.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/tasks/AbstractSyncTask.java
Sun Nov 7 23:13:31 2010
@@ -54,7 +54,7 @@ import java.util.StringTokenizer;
public abstract class AbstractSyncTask
extends VfsTask
{
- private final ArrayList srcFiles = new ArrayList();
+ private final ArrayList<SourceInfo> srcFiles = new ArrayList<SourceInfo>();
private String destFileUrl;
private String destDirUrl;
private String srcDirUrl;
@@ -254,11 +254,11 @@ public abstract class AbstractSyncTask
{
srcDirName = resolveFile(srcDirUrl).getName();
}
- final ArrayList srcs = new ArrayList();
+ final ArrayList<FileObject> srcs = new ArrayList<FileObject>();
for (int i = 0; i < srcFiles.size(); i++)
{
// Locate the source file, and make sure it exists
- final SourceInfo src = (SourceInfo) srcFiles.get(i);
+ final SourceInfo src = srcFiles.get(i);
final FileObject srcFile = resolveFile(src.file);
if (!srcFile.exists())
{
@@ -274,10 +274,10 @@ public abstract class AbstractSyncTask
}
// Scan the source files
- final Set destFiles = new HashSet();
+ final Set<FileObject> destFiles = new HashSet<FileObject>();
for (int i = 0; i < srcs.size(); i++)
{
- final FileObject rootFile = (FileObject) srcs.get(i);
+ final FileObject rootFile = srcs.get(i);
final FileName rootName = rootFile.getName();
if (rootFile.getType() == FileType.FILE)
@@ -347,7 +347,7 @@ public abstract class AbstractSyncTask
* Handles a single file, checking for collisions where more than one
* source file maps to the same destination file.
*/
- private void handleFile(final Set destFiles,
+ private void handleFile(final Set<FileObject> destFiles,
final FileObject srcFile,
final FileObject destFile) throws Exception
@@ -381,7 +381,7 @@ public abstract class AbstractSyncTask
logOrDie(message, Project.MSG_WARN);
return;
}
- final SourceInfo src = (SourceInfo) srcFiles.get(0);
+ final SourceInfo src = srcFiles.get(0);
final FileObject srcFile = resolveFile(src.file);
if (srcFile.getType() != FileType.FILE)
{
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/util/CombinedResources.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/util/CombinedResources.java?rev=1032417&r1=1032416&r2=1032417&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/util/CombinedResources.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/util/CombinedResources.java
Sun Nov 7 23:13:31 2010
@@ -88,10 +88,10 @@ public class CombinedResources extends R
resourceName = resourceName.replace('.', '/') + ".properties";
try
{
- Enumeration resources = loader.getResources(resourceName);
+ Enumeration<URL> resources = loader.getResources(resourceName);
while (resources.hasMoreElements())
{
- URL resource = (URL) resources.nextElement();
+ URL resource = resources.nextElement();
try
{
properties.load(resource.openConnection().getInputStream());
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/util/DelegatingFileSystemOptionsBuilder.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/util/DelegatingFileSystemOptionsBuilder.java?rev=1032417&r1=1032416&r2=1032417&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/util/DelegatingFileSystemOptionsBuilder.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/util/DelegatingFileSystemOptionsBuilder.java
Sun Nov 7 23:13:31 2010
@@ -53,13 +53,13 @@ public class DelegatingFileSystemOptions
{
private static final Class[] STRING_PARAM = new Class[]{String.class};
- private static final Map PRIMATIVE_TO_OBJECT = new TreeMap();
+ private static final Map<String, Class<?>> PRIMATIVE_TO_OBJECT = new
TreeMap<String, Class<?>>();
private final Log log =
LogFactory.getLog(DelegatingFileSystemOptionsBuilder.class);
private final FileSystemManager manager;
- private final Map beanMethods = new TreeMap();
+ private final Map<String, Map<String, List<Method>>> beanMethods = new
TreeMap<String, Map<String, List<Method>>>();
static
{
@@ -84,7 +84,7 @@ public class DelegatingFileSystemOptions
private final String name;
private final Object[] values;
- private List configSetters;
+ private List<Method> configSetters;
private FileSystemConfigBuilder fileSystemConfigBuilder;
private Context(final FileSystemOptions fso, final String scheme,
final String name, final Object[] values)
@@ -209,10 +209,10 @@ public class DelegatingFileSystemOptions
ctx.fileSystemConfigBuilder =
getManager().getFileSystemConfigBuilder(ctx.scheme);
// try to find a setter which could accept the value
- Iterator iterConfigSetters = ctx.configSetters.iterator();
+ Iterator<Method> iterConfigSetters = ctx.configSetters.iterator();
while (iterConfigSetters.hasNext())
{
- Method configSetter = (Method) iterConfigSetters.next();
+ Method configSetter = iterConfigSetters.next();
if (convertValuesAndInvoke(configSetter, ctx))
{
return;
@@ -260,7 +260,7 @@ public class DelegatingFileSystemOptions
if (type.isPrimitive())
{
- Class objectType = (Class) PRIMATIVE_TO_OBJECT.get(type.getName());
+ Class objectType = PRIMATIVE_TO_OBJECT.get(type.getName());
if (objectType == null)
{
log.warn(Messages.getString("vfs.provider/config-unexpected-primitive.error",
type.getName()));
@@ -289,7 +289,7 @@ public class DelegatingFileSystemOptions
Object convertedValues = java.lang.reflect.Array.newInstance(type,
ctx.values.length);
- Constructor valueConstructor;
+ Constructor<?> valueConstructor;
try
{
valueConstructor = type.getConstructor(STRING_PARAM);
@@ -410,8 +410,8 @@ public class DelegatingFileSystemOptions
private boolean fillConfigSetters(final Context ctx)
throws FileSystemException
{
- Map schemeMethods = getSchemeMethods(ctx.scheme);
- List configSetters = (List) schemeMethods.get(ctx.name.toLowerCase());
+ Map<String, List<Method>> schemeMethods = getSchemeMethods(ctx.scheme);
+ List<Method> configSetters = schemeMethods.get(ctx.name.toLowerCase());
if (configSetters == null)
{
return false;
@@ -424,9 +424,9 @@ public class DelegatingFileSystemOptions
/**
* get (cached) list of set*() methods for the given scheme
*/
- private Map getSchemeMethods(final String scheme) throws
FileSystemException
+ private Map<String, List<Method>> getSchemeMethods(final String scheme)
throws FileSystemException
{
- Map schemeMethods = (Map) beanMethods.get(scheme);
+ Map<String, List<Method>> schemeMethods = beanMethods.get(scheme);
if (schemeMethods == null)
{
schemeMethods = createSchemeMethods(scheme);
@@ -439,7 +439,7 @@ public class DelegatingFileSystemOptions
/**
* create the list of all set*() methods for the given scheme
*/
- private Map createSchemeMethods(String scheme) throws FileSystemException
+ private Map<String, List<Method>> createSchemeMethods(String scheme)
throws FileSystemException
{
final FileSystemConfigBuilder fscb =
getManager().getFileSystemConfigBuilder(scheme);
if (fscb == null)
@@ -447,7 +447,7 @@ public class DelegatingFileSystemOptions
throw new
FileSystemException("vfs.provider/no-config-builder.error", scheme);
}
- Map schemeMethods = new TreeMap();
+ Map<String, List<Method>> schemeMethods = new TreeMap<String,
List<Method>>();
Method[] methods = fscb.getClass().getMethods();
for (int iterMethods = 0; iterMethods < methods.length; iterMethods++)
@@ -467,10 +467,10 @@ public class DelegatingFileSystemOptions
String key = methodName.substring(3).toLowerCase();
- List configSetter = (List) schemeMethods.get(key);
+ List<Method> configSetter = schemeMethods.get(key);
if (configSetter == null)
{
- configSetter = new ArrayList(2);
+ configSetter = new ArrayList<Method>(2);
schemeMethods.put(key, configSetter);
}
configSetter.add(method);
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/util/Messages.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/util/Messages.java?rev=1032417&r1=1032416&r2=1032417&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/util/Messages.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/util/Messages.java
Sun Nov 7 23:13:31 2010
@@ -33,7 +33,7 @@ public final class Messages
/**
* Map from message code to MessageFormat object for the message.
*/
- private static Map messages = new HashMap();
+ private static Map<String, MessageFormat> messages = new HashMap<String,
MessageFormat>();
private static ResourceBundle resources;
private Messages()
@@ -95,7 +95,7 @@ public final class Messages
throws MissingResourceException
{
// Check if the message is cached
- MessageFormat msg = (MessageFormat) messages.get(code);
+ MessageFormat msg = messages.get(code);
if (msg != null)
{
return msg;
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/util/Os.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/util/Os.java?rev=1032417&r1=1032416&r2=1032417&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/util/Os.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/util/Os.java
Sun Nov 7 23:13:31 2010
@@ -292,14 +292,14 @@ public final class Os
private static OsFamily[] determineAllFamilies()
{
// Determine all families the current OS belongs to
- Set allFamilies = new HashSet();
+ Set<OsFamily> allFamilies = new HashSet<OsFamily>();
if (OS_FAMILY != null)
{
- List queue = new ArrayList();
+ List<OsFamily> queue = new ArrayList<OsFamily>();
queue.add(OS_FAMILY);
while (queue.size() > 0)
{
- final OsFamily family = (OsFamily) queue.remove(0);
+ final OsFamily family = queue.remove(0);
allFamilies.add(family);
final OsFamily[] families = family.getFamilies();
for (int i = 0; i < families.length; i++)
@@ -309,7 +309,7 @@ public final class Os
}
}
}
- return (OsFamily[]) allFamilies.toArray(new
OsFamily[allFamilies.size()]);
+ return allFamilies.toArray(new OsFamily[allFamilies.size()]);
}
private static OsFamily determineOsFamily()
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/util/WeakRefFileListener.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/util/WeakRefFileListener.java?rev=1032417&r1=1032416&r2=1032417&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/util/WeakRefFileListener.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/util/WeakRefFileListener.java
Sun Nov 7 23:13:31 2010
@@ -34,13 +34,13 @@ public class WeakRefFileListener impleme
{
private final FileSystem fs;
private final FileName name;
- private final WeakReference listener;
+ private final WeakReference<FileListener> listener;
protected WeakRefFileListener(final FileObject file, final FileListener
listener)
{
this.fs = file.getFileSystem();
this.name = file.getName();
- this.listener = new WeakReference(listener);
+ this.listener = new WeakReference<FileListener>(listener);
}
/**
@@ -63,7 +63,7 @@ public class WeakRefFileListener impleme
*/
protected FileListener getListener() throws Exception
{
- FileListener listener = (FileListener) this.listener.get();
+ FileListener listener = this.listener.get();
if (listener == null)
{
FileObject file = fs.resolveFile(name);
