Author: olamy
Date: Wed Sep 14 07:56:38 2011
New Revision: 1170464
URL: http://svn.apache.org/viewvc?rev=1170464&view=rev
Log:
more generics
Modified:
maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java
maven/wagon/trunk/wagon-providers/wagon-file/src/main/java/org/apache/maven/wagon/providers/file/FileWagon.java
maven/wagon/trunk/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java
maven/wagon/trunk/wagon-providers/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java
maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/LSParser.java
maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/ScpHelper.java
maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java
maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/AbstractJschWagon.java
maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/test/java/org/apache/maven/wagon/providers/webdav/WebDavWagonTest.java
Modified:
maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java
URL:
http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java?rev=1170464&r1=1170463&r2=1170464&view=diff
==============================================================================
---
maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java
(original)
+++
maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java
Wed Sep 14 07:56:38 2011
@@ -747,7 +747,7 @@ public abstract class WagonTestCase
wagon.connect( testRepository, getAuthInfo() );
- List list = wagon.getFileList( dirName );
+ List<String> list = wagon.getFileList( dirName );
assertNotNull( "file list should not be null.", list );
assertTrue( "file list should contain more items (actually contains '"
+ list + "').",
list.size() >= filenames.length );
Modified:
maven/wagon/trunk/wagon-providers/wagon-file/src/main/java/org/apache/maven/wagon/providers/file/FileWagon.java
URL:
http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-file/src/main/java/org/apache/maven/wagon/providers/file/FileWagon.java?rev=1170464&r1=1170463&r2=1170464&view=diff
==============================================================================
---
maven/wagon/trunk/wagon-providers/wagon-file/src/main/java/org/apache/maven/wagon/providers/file/FileWagon.java
(original)
+++
maven/wagon/trunk/wagon-providers/wagon-file/src/main/java/org/apache/maven/wagon/providers/file/FileWagon.java
Wed Sep 14 07:56:38 2011
@@ -220,7 +220,7 @@ public class FileWagon
return path;
}
- public List getFileList( String destinationDirectory )
+ public List<String> getFileList( String destinationDirectory )
throws TransferFailedException, ResourceDoesNotExistException,
AuthorizationException
{
if ( getRepository().getBasedir() == null )
@@ -242,7 +242,7 @@ public class FileWagon
File[] files = path.listFiles();
- List list = new ArrayList( files.length );
+ List<String> list = new ArrayList<String>( files.length );
for ( int i = 0; i < files.length; i++ )
{
String name = files[i].getName();
Modified:
maven/wagon/trunk/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java
URL:
http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java?rev=1170464&r1=1170463&r2=1170464&view=diff
==============================================================================
---
maven/wagon/trunk/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java
(original)
+++
maven/wagon/trunk/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java
Wed Sep 14 07:56:38 2011
@@ -423,7 +423,7 @@ public class FtpWagon
super.fireSessionDebug( msg );
}
- public List getFileList( String destinationDirectory )
+ public List<String> getFileList( String destinationDirectory )
throws TransferFailedException, ResourceDoesNotExistException,
AuthorizationException
{
Resource resource = new Resource( destinationDirectory );
@@ -440,7 +440,7 @@ public class FtpWagon
throw new ResourceDoesNotExistException( "Could not find file:
'" + resource + "'" );
}
- List ret = new ArrayList();
+ List<String> ret = new ArrayList<String>();
for( int i=0; i < ftpFiles.length; i++ )
{
String name = ftpFiles[i].getName();
Modified:
maven/wagon/trunk/wagon-providers/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java
URL:
http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java?rev=1170464&r1=1170463&r2=1170464&view=diff
==============================================================================
---
maven/wagon/trunk/wagon-providers/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java
(original)
+++
maven/wagon/trunk/wagon-providers/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java
Wed Sep 14 07:56:38 2011
@@ -624,7 +624,7 @@ public class ScmWagon
* @return a List<String> with filenames/directories at the
resourcepath.
* @see org.apache.maven.wagon.AbstractWagon#getFileList(java.lang.String)
*/
- public List getFileList( String resourcePath )
+ public List<String> getFileList( String resourcePath )
throws TransferFailedException, ResourceDoesNotExistException,
AuthorizationException
{
try
@@ -642,12 +642,11 @@ public class ScmWagon
throw new ResourceDoesNotExistException(
result.getProviderMessage() );
}
- // List<String>
- List files = new ArrayList();
+ List<String> files = new ArrayList<String>();
- for ( Iterator it = result.getFiles().iterator(); it.hasNext(); )
+ for ( Iterator<ScmFile> it = result.getFiles().iterator();
it.hasNext(); )
{
- ScmFile f = (ScmFile) it.next();
+ ScmFile f = it.next();
files.add( f.getPath() );
}
Modified:
maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/LSParser.java
URL:
http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/LSParser.java?rev=1170464&r1=1170463&r2=1170464&view=diff
==============================================================================
---
maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/LSParser.java
(original)
+++
maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/LSParser.java
Wed Sep 14 07:56:38 2011
@@ -49,10 +49,10 @@ public class LSParser
* @return the list of files found.
* @throws TransferFailedException
*/
- public List parseFiles( String rawLS )
+ public List<String> parseFiles( String rawLS )
throws TransferFailedException
{
- List ret = new ArrayList();
+ List<String> ret = new ArrayList<String>();
try
{
BufferedReader br = new BufferedReader( new StringReader( rawLS )
);
Modified:
maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/ScpHelper.java
URL:
http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/ScpHelper.java?rev=1170464&r1=1170463&r2=1170464&view=diff
==============================================================================
---
maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/ScpHelper.java
(original)
+++
maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/ScpHelper.java
Wed Sep 14 07:56:38 2011
@@ -273,7 +273,7 @@ public class ScpHelper
}
}
- public List getFileList( String destinationDirectory, Repository
repository )
+ public List<String> getFileList( String destinationDirectory, Repository
repository )
throws TransferFailedException, ResourceDoesNotExistException,
AuthorizationException
{
try
Modified:
maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java
URL:
http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java?rev=1170464&r1=1170463&r2=1170464&view=diff
==============================================================================
---
maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java
(original)
+++
maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java
Wed Sep 14 07:56:38 2011
@@ -457,7 +457,7 @@ public class ScpExternalWagon
// method on a Wagon.
//
- public List getFileList( String destinationDirectory )
+ public List<String> getFileList( String destinationDirectory )
throws TransferFailedException, ResourceDoesNotExistException,
AuthorizationException
{
return sshTool.getFileList( destinationDirectory, repository );
Modified:
maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/AbstractJschWagon.java
URL:
http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/AbstractJschWagon.java?rev=1170464&r1=1170463&r2=1170464&view=diff
==============================================================================
---
maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/AbstractJschWagon.java
(original)
+++
maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/AbstractJschWagon.java
Wed Sep 14 07:56:38 2011
@@ -348,7 +348,7 @@ public abstract class AbstractJschWagon
throw new TransferFailedException( msg, e );
}
- public List getFileList( String destinationDirectory )
+ public List<String> getFileList( String destinationDirectory )
throws TransferFailedException, ResourceDoesNotExistException,
AuthorizationException
{
return sshTool.getFileList( destinationDirectory, repository );
Modified:
maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/test/java/org/apache/maven/wagon/providers/webdav/WebDavWagonTest.java
URL:
http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/test/java/org/apache/maven/wagon/providers/webdav/WebDavWagonTest.java?rev=1170464&r1=1170463&r2=1170464&view=diff
==============================================================================
---
maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/test/java/org/apache/maven/wagon/providers/webdav/WebDavWagonTest.java
(original)
+++
maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/test/java/org/apache/maven/wagon/providers/webdav/WebDavWagonTest.java
Wed Sep 14 07:56:38 2011
@@ -260,7 +260,7 @@ public class WebDavWagonTest
wagon.connect( testRepository, getAuthInfo() );
- List list = wagon.getFileList( dirName );
+ List<String> list = wagon.getFileList( dirName );
assertNotNull( "file list should not be null.", list );
assertEquals( "file list should contain 6 items", 6, list.size() );
