commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1033582 - in /commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs: operations/ util/
Date Wed, 10 Nov 2010 16:44:28 GMT
Author: sebb
Date: Wed Nov 10 16:44:28 2010
New Revision: 1033582

URL: http://svn.apache.org/viewvc?rev=1033582&view=rev
Log:
Remaining generics fixes

Modified:
    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/operations/FileOperationProvider.java
    commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/operations/FileOperations.java
    commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/util/DelegatingFileSystemOptionsBuilder.java

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=1033582&r1=1033581&r2=1033582&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
Wed Nov 10 16:44:28 2010
@@ -55,7 +55,7 @@ public abstract class AbstractFileOperat
      * @throws org.apache.commons.vfs.FileSystemException
      *             if list of operations cannto be retrieved.
      */
-    public final void collectOperations(final Collection operationsList,
+    public final void collectOperations(final Collection<?> operationsList,
             final FileObject file) throws FileSystemException
     {
 
@@ -67,7 +67,7 @@ public abstract class AbstractFileOperat
      * @throws FileSystemException
      */
     protected abstract void doCollectOperations(
-            final Collection availableOperations, final Collection resultList,
+            final Collection<?> availableOperations, final Collection<?> resultList,
             final FileObject file) throws FileSystemException;
 
     /**
@@ -79,7 +79,7 @@ public abstract class AbstractFileOperat
      * @throws org.apache.commons.vfs.FileSystemException
      *             if operation cannot be retrieved.
      */
-    public final FileOperation getOperation(FileObject file, Class operationClass)
+    public final FileOperation getOperation(FileObject file, Class<?> operationClass)
             throws FileSystemException
     {
         Class<?> implementation = lookupOperation(operationClass);
@@ -96,14 +96,14 @@ public abstract class AbstractFileOperat
      * @throws FileSystemException
      */
     protected abstract FileOperation instantiateOperation(final FileObject file,
-            final Class operationClass) throws FileSystemException;
+            final Class<?> operationClass) throws FileSystemException;
 
     /**
      *
      * @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
@@ -138,7 +138,7 @@ public abstract class AbstractFileOperat
      * @param operationClass
      * @throws FileSystemException
      */
-    protected final void addOperation(final Class operationClass)
+    protected final void addOperation(final Class<?> operationClass)
             throws FileSystemException
     {
         // check validity of passed class

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=1033582&r1=1033581&r2=1033582&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
Wed Nov 10 16:44:28 2010
@@ -56,7 +56,7 @@ public class DefaultFileOperations imple
      * @throws FileSystemException If an error occurs.
      *
      */
-    public Class[] getOperations() throws FileSystemException
+    public Class<?>[] getOperations() throws FileSystemException
     {
 
         final String scheme = fileObject.getURL().getProtocol();
@@ -86,7 +86,7 @@ public class DefaultFileOperations imple
      * @throws FileSystemException if an error occurs.
      *
      */
-    public FileOperation getOperation(Class operationClass)
+    public FileOperation getOperation(Class<?> operationClass)
             throws FileSystemException
     {
 
@@ -131,9 +131,9 @@ public class DefaultFileOperations imple
      * @throws FileSystemException if an error occurs.
      *
      */
-    public boolean hasOperation(Class operationClass) throws FileSystemException
+    public boolean hasOperation(Class<?> operationClass) throws FileSystemException
     {
-        Class[] operations = getOperations();
+        Class<?>[] operations = getOperations();
         if (operations == null)
         {
             return false;
@@ -141,7 +141,7 @@ public class DefaultFileOperations imple
 
         for (int i = 0; i < operations.length; i++)
         {
-            Class operation = operations[i];
+            Class<?> operation = operations[i];
             if (operationClass.isAssignableFrom(operation))
             {
                 return true;

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/operations/FileOperationProvider.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/operations/FileOperationProvider.java?rev=1033582&r1=1033581&r2=1033582&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/operations/FileOperationProvider.java
(original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/operations/FileOperationProvider.java
Wed Nov 10 16:44:28 2010
@@ -45,7 +45,7 @@ public interface FileOperationProvider
      * @throws FileSystemException
      *             if list of operations cannto be retrieved.
      */
-    void collectOperations(final Collection operationsList, final FileObject file)
+    void collectOperations(final Collection<?> operationsList, final FileObject file)
             throws FileSystemException;
 
     /**
@@ -58,6 +58,6 @@ public interface FileOperationProvider
      * @throws FileSystemException
      *             if operation cannot be retrieved.
      */
-    FileOperation getOperation(final FileObject file, final Class operationClass)
+    FileOperation getOperation(final FileObject file, final Class<?> operationClass)
             throws FileSystemException;
 }

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/operations/FileOperations.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/operations/FileOperations.java?rev=1033582&r1=1033581&r2=1033582&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/operations/FileOperations.java
(original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/operations/FileOperations.java
Wed Nov 10 16:44:28 2010
@@ -32,19 +32,19 @@ public interface FileOperations
      * @return all operations associated with the fileObject
      * @throws FileSystemException if an error occurs.
      */
-    Class[] getOperations() throws FileSystemException;
+    Class<?>[] getOperations() throws FileSystemException;
 
     /**
      * @param operationClass the operation Class.
      * @return a operation implementing the given <code>operationClass</code>
      * @throws FileSystemException if an error occus.
      */
-    FileOperation getOperation(Class operationClass) throws FileSystemException;
+    FileOperation getOperation(Class<?> operationClass) throws FileSystemException;
 
     /**
      * @param operationClass the operation Class.
      * @return if a operation <code>operationClass</code> is available
      * @throws FileSystemException if an error ocurs.
      */
-    boolean hasOperation(Class operationClass) throws FileSystemException;
+    boolean hasOperation(Class<?> operationClass) throws FileSystemException;
 }

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=1033582&r1=1033581&r2=1033582&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
Wed Nov 10 16:44:28 2010
@@ -158,7 +158,7 @@ public class DelegatingFileSystemOptions
      * @throws InstantiationException if a class cannot be instantiated.
      */
     public void setConfigClass(final FileSystemOptions fso, final String scheme, final String
name,
-                               final Class className)
+                               final Class<?> className)
             throws FileSystemException, IllegalAccessException, InstantiationException
     {
         setConfigClasses(fso, scheme, name, new Class[]{className});
@@ -177,7 +177,7 @@ public class DelegatingFileSystemOptions
      * @throws InstantiationException if a class cannot be instantiated.
      */
     public void setConfigClasses(final FileSystemOptions fso, final String scheme, final
String name,
-                                 final Class[] classNames)
+                                 final Class<?>[] classNames)
             throws FileSystemException, IllegalAccessException, InstantiationException
     {
         Object[] values = new Object[classNames.length];



Mime
View raw message