You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2012/05/06 21:45:43 UTC
svn commit: r1334746 -
/maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/SftpWagon.java
Author: hboutemy
Date: Sun May 6 19:45:42 2012
New Revision: 1334746
URL: http://svn.apache.org/viewvc?rev=1334746&view=rev
Log:
use Java 5 constructs
Modified:
maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/SftpWagon.java
Modified: maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/SftpWagon.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/SftpWagon.java?rev=1334746&r1=1334745&r2=1334746&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/SftpWagon.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/SftpWagon.java Sun May 6 19:45:42 2012
@@ -23,9 +23,7 @@ import java.io.File;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
-import java.util.Vector;
import org.apache.maven.wagon.InputData;
import org.apache.maven.wagon.OutputData;
@@ -179,11 +177,11 @@ public class SftpWagon
throws SftpException, TransferFailedException
{
String[] dirs = PathUtils.dirnames( resourceName );
- for ( int i = 0; i < dirs.length; i++ )
+ for ( String dir : dirs )
{
- mkdir( dirs[i], mode );
+ mkdir( dir, mode );
- channel.cd( dirs[i] );
+ channel.cd( dir );
}
}
@@ -195,7 +193,7 @@ public class SftpWagon
SftpATTRS attrs = channel.stat( dir );
if ( ( attrs.getPermissions() & S_IFDIR ) == 0 )
{
- throw new TransferFailedException( "Remote path is not a directory:" + dir );
+ throw new TransferFailedException( "Remote path is not a directory: " + dir );
}
}
catch ( SftpException e )
@@ -305,18 +303,18 @@ public class SftpWagon
if ( files != null && files.length > 0 )
{
// Directories first, then files. Let's go deep early.
- for ( int i = 0; i < files.length; i++ )
+ for ( File file : files )
{
- if ( files[i].isDirectory() )
+ if ( file.isDirectory() )
{
- ftpRecursivePut( files[i], prefix, files[i].getName(), directoryMode );
+ ftpRecursivePut( file, prefix, file.getName(), directoryMode );
}
}
- for ( int i = 0; i < files.length; i++ )
+ for ( File file : files )
{
- if ( !files[i].isDirectory() )
+ if ( !file.isDirectory() )
{
- ftpRecursivePut( files[i], prefix, files[i].getName(), directoryMode );
+ ftpRecursivePut( file, prefix, file.getName(), directoryMode );
}
}
}
@@ -346,7 +344,7 @@ public class SftpWagon
return prefix;
}
- public List getFileList( String destinationDirectory )
+ public List<String> getFileList( String destinationDirectory )
throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException
{
if ( destinationDirectory.length() == 0 )
@@ -372,12 +370,11 @@ public class SftpWagon
throw new TransferFailedException( "Remote path is not a directory:" + dir );
}
- Vector fileList = channel.ls( filename );
- List files = new ArrayList( fileList.size() );
- for ( Iterator i = fileList.iterator(); i.hasNext(); )
+ @SuppressWarnings( "unchecked" )
+ List<ChannelSftp.LsEntry> fileList = channel.ls( filename );
+ List<String> files = new ArrayList<String>( fileList.size() );
+ for ( ChannelSftp.LsEntry entry : fileList )
{
- ChannelSftp.LsEntry entry = (ChannelSftp.LsEntry) i.next();
-
String name = entry.getFilename();
if ( entry.getAttrs().isDir() )
{