Author: olamy
Date: Wed Sep 14 07:55:47 2011
New Revision: 1170463
URL: http://svn.apache.org/viewvc?rev=1170463&view=rev
Log:
more generics
Modified:
maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/Wagon.java
maven/wagon/trunk/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java
maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http/HtmlFileListParser.java
maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/test/java/org/apache/maven/wagon/shared/http/HtmlFileListParserTest.java
maven/wagon/trunk/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpWagon.java
Modified:
maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/Wagon.java
URL:
http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/Wagon.java?rev=1170463&r1=1170462&r2=1170463&view=diff
==============================================================================
---
maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/Wagon.java
(original)
+++
maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/Wagon.java
Wed Sep 14 07:55:47 2011
@@ -128,7 +128,7 @@ public interface Wagon
* @throws ResourceDoesNotExistException if destinationDirectory does not
exist or is not a directory
* @throws AuthorizationException if not authorized to list the
contents of the directory
*/
- List getFileList( String destinationDirectory )
+ List<String> getFileList( String destinationDirectory )
throws TransferFailedException, ResourceDoesNotExistException,
AuthorizationException;
/**
Modified:
maven/wagon/trunk/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java
URL:
http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java?rev=1170463&r1=1170462&r2=1170463&view=diff
==============================================================================
---
maven/wagon/trunk/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java
(original)
+++
maven/wagon/trunk/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java
Wed Sep 14 07:55:47 2011
@@ -349,7 +349,7 @@ public class LightweightHttpWagon
authenticator.resetWagon();
}
- public List getFileList( String destinationDirectory )
+ public List<String> getFileList( String destinationDirectory )
throws TransferFailedException, ResourceDoesNotExistException,
AuthorizationException
{
InputData inputData = new InputData();
Modified:
maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http/HtmlFileListParser.java
URL:
http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http/HtmlFileListParser.java?rev=1170463&r1=1170462&r2=1170463&view=diff
==============================================================================
---
maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http/HtmlFileListParser.java
(original)
+++
maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http/HtmlFileListParser.java
Wed Sep 14 07:55:47 2011
@@ -66,7 +66,7 @@ public class HtmlFileListParser
* @return the file list.
* @throws TransferFailedException if there was a problem fetching the raw
html.
*/
- public static List/* <String> */parseFileList( String baseurl, InputStream
stream )
+ public static List<String> parseFileList( String baseurl, InputStream
stream )
throws TransferFailedException
{
try
@@ -77,7 +77,7 @@ public class HtmlFileListParser
String content = IOUtils.toString( stream, "utf-8" );
Document doc = Jsoup.parse( content, baseurl );
Elements links = doc.getElementsByTag( "a" );
- Set results = new HashSet();
+ Set<String> results = new HashSet<String>();
for ( int lx = 0; lx < links.size(); lx++ )
{
Element link = links.get( lx );
@@ -96,9 +96,7 @@ public class HtmlFileListParser
}
- ArrayList resultsAsList = new ArrayList();
- resultsAsList.addAll( results );
- return resultsAsList;
+ return new ArrayList<String>(results);
}
catch ( URISyntaxException e )
{
Modified:
maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/test/java/org/apache/maven/wagon/shared/http/HtmlFileListParserTest.java
URL:
http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/test/java/org/apache/maven/wagon/shared/http/HtmlFileListParserTest.java?rev=1170463&r1=1170462&r2=1170463&view=diff
==============================================================================
---
maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/test/java/org/apache/maven/wagon/shared/http/HtmlFileListParserTest.java
(original)
+++
maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/test/java/org/apache/maven/wagon/shared/http/HtmlFileListParserTest.java
Wed Sep 14 07:55:47 2011
@@ -67,7 +67,7 @@ public class HtmlFileListParserTest
throws TransferFailedException
{
InputStream is = this.getClass().getResourceAsStream( "/filelistings/"
+ filename );
- List files = HtmlFileListParser.parseFileList( url, is );
+ List<String> files = HtmlFileListParser.parseFileList( url, is );
assertNotNull( "file list should not be null.", files );
assertFalse( "file list should not be empty.", files.isEmpty() );
Modified:
maven/wagon/trunk/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpWagon.java
URL:
http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpWagon.java?rev=1170463&r1=1170462&r2=1170463&view=diff
==============================================================================
---
maven/wagon/trunk/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpWagon.java
(original)
+++
maven/wagon/trunk/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpWagon.java
Wed Sep 14 07:55:47 2011
@@ -40,7 +40,7 @@ import org.apache.maven.wagon.shared.htt
public class HttpWagon
extends AbstractHttpClientWagon
{
- public List getFileList( String destinationDirectory )
+ public List<String> getFileList( String destinationDirectory )
throws TransferFailedException, ResourceDoesNotExistException,
AuthorizationException
{
if ( destinationDirectory.length() > 0 &&
!destinationDirectory.endsWith( "/" ) )
