You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by dl...@apache.org on 2009/03/09 21:51:46 UTC
svn commit: r751827 - in /mina/ftpserver/trunk:
core/src/main/java/org/apache/ftpserver/command/impl/listing/
core/src/main/java/org/apache/ftpserver/usermanager/impl/
core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/
ftplet-api/src/mai...
Author: dlat
Date: Mon Mar 9 20:51:45 2009
New Revision: 751827
URL: http://svn.apache.org/viewvc?rev=751827&view=rev
Log:
FTPSERVER-274 Use wildcard-generics in API where possible
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/DirectoryLister.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/BaseUser.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/FtpFileTestTemplate.java
mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpFile.java
mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/User.java
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/DirectoryLister.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/DirectoryLister.java?rev=751827&r1=751826&r2=751827&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/DirectoryLister.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/DirectoryLister.java Mon Mar 9 20:51:45 2009
@@ -37,7 +37,7 @@
*/
public class DirectoryLister {
- private String traverseFiles(final List<FtpFile> files,
+ private String traverseFiles(final List<? extends FtpFile> files,
final FileFilter filter, final FileFormater formater) {
StringBuffer sb = new StringBuffer();
@@ -47,7 +47,7 @@
return sb.toString();
}
- private String traverseFiles(final List<FtpFile> files,
+ private String traverseFiles(final List<? extends FtpFile> files,
final FileFilter filter, final FileFormater formater,
boolean matchDirs) {
StringBuffer sb = new StringBuffer();
@@ -73,7 +73,7 @@
StringBuffer sb = new StringBuffer();
// get all the file objects
- List<FtpFile> files = listFiles(fileSystemView, argument.getFile());
+ List<? extends FtpFile> files = listFiles(fileSystemView, argument.getFile());
if (files != null) {
FileFilter filter = null;
if ((argument.hasOption('a'))) {
@@ -92,13 +92,14 @@
/**
* Get the file list. Files will be listed in alphabetlical order.
*/
- private List<FtpFile> listFiles(FileSystemView fileSystemView, String file) {
- List<FtpFile> files = null;
+ private List<? extends FtpFile> listFiles(FileSystemView fileSystemView, String file) {
+ List <? extends FtpFile> files = null;
try {
FtpFile virtualFile = fileSystemView.getFile(file);
if (virtualFile.isFile()) {
- files = new ArrayList<FtpFile>();
- files.add(virtualFile);
+ List<FtpFile> auxFiles = new ArrayList<FtpFile>();
+ auxFiles.add(virtualFile);
+ files = auxFiles;
} else {
files = virtualFile.listFiles();
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/BaseUser.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/BaseUser.java?rev=751827&r1=751826&r2=751827&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/BaseUser.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/BaseUser.java Mon Mar 9 20:51:45 2009
@@ -58,7 +58,7 @@
private boolean isEnabled = true;
- private List<Authority> authorities = new ArrayList<Authority>();
+ private List<? extends Authority> authorities = new ArrayList<Authority>();
/**
* Default constructor.
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/FtpFileTestTemplate.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/FtpFileTestTemplate.java?rev=751827&r1=751826&r2=751827&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/FtpFileTestTemplate.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/FtpFileTestTemplate.java Mon Mar 9 20:51:45 2009
@@ -117,7 +117,7 @@
public void testListFilesInOrder() {
FtpFile root = createFileObject("/", USER);
- List<FtpFile> files = root.listFiles();
+ List<? extends FtpFile> files = root.listFiles();
assertEquals(3, files.size());
assertEquals("dir1", files.get(0).getName());
assertEquals("file1", files.get(1).getName());
Modified: mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpFile.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpFile.java?rev=751827&r1=751826&r2=751827&view=diff
==============================================================================
--- mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpFile.java (original)
+++ mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpFile.java Mon Mar 9 20:51:45 2009
@@ -149,7 +149,7 @@
* List must be immutable.
* @return The {@link List} of {@link FtpFile}s
*/
- List<FtpFile> listFiles();
+ List<? extends FtpFile> listFiles();
/**
* Create output stream for writing.
Modified: mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/User.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/User.java?rev=751827&r1=751826&r2=751827&view=diff
==============================================================================
--- mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/User.java (original)
+++ mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/User.java Mon Mar 9 20:51:45 2009
@@ -46,14 +46,14 @@
*
* @return All authorities
*/
- List<Authority> getAuthorities();
+ List<? extends Authority> getAuthorities();
/**
* Get authorities of the specified type granted to this user
* @param clazz The type of {@link Authority}
* @return Authorities of the specified class
*/
- List<Authority> getAuthorities(Class<? extends Authority> clazz);
+ List<? extends Authority> getAuthorities(Class<? extends Authority> clazz);
/**
* Authorize a {@link AuthorizationRequest} for this user