You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by pe...@apache.org on 2006/11/18 19:01:49 UTC
svn commit: r476573 - in
/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ssh:
SSHUserInfo.java Scp.java ScpToMessageBySftp.java
Author: peterreilly
Date: Sat Nov 18 10:01:49 2006
New Revision: 476573
URL: http://svn.apache.org/viewvc?view=rev&rev=476573
Log:
checkstyle
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHUserInfo.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessageBySftp.java
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHUserInfo.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHUserInfo.java?view=diff&rev=476573&r1=476572&r2=476573
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHUserInfo.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHUserInfo.java Sat Nov 18 10:01:49 2006
@@ -195,7 +195,7 @@
String instruction,
String[] prompt,
boolean[] echo) {
- if (prompt.length != 1 || echo[0] != false || this.password == null) {
+ if (prompt.length != 1 || echo[0] || this.password == null) {
return null;
}
String[] response = new String[1];
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java?view=diff&rev=476573&r1=476572&r2=476573
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java Sat Nov 18 10:01:49 2006
@@ -41,11 +41,11 @@
*/
public class Scp extends SSHBase {
- private static final String[] FROM_ATTRS =
- { "file", "localfile", "remotefile" };
+ private static final String[] FROM_ATTRS = {
+ "file", "localfile", "remotefile" };
- private static final String[] TO_ATTRS =
- { "todir", "localtodir", "remotetodir", "localtofile", "remotetofile" };
+ private static final String[] TO_ATTRS = {
+ "todir", "localtodir", "remotetodir", "localtofile", "remotetofile" };
private String fromUri;
private String toUri;
@@ -227,12 +227,12 @@
try {
session = openSession();
ScpFromMessage message = null;
- if (!isSftp){
+ if (!isSftp) {
message =
new ScpFromMessage(getVerbose(), session, file,
getProject().resolveFile(toPath),
fromSshUri.endsWith("*"));
- } else{
+ } else {
message =
new ScpFromMessageBySftp(getVerbose(), session, file,
getProject().resolveFile(toPath),
@@ -265,10 +265,10 @@
if (!list.isEmpty()) {
session = openSession();
ScpToMessage message = null;
- if (!isSftp){
+ if (!isSftp) {
message = new ScpToMessage(getVerbose(), session,
list, file);
- } else{
+ } else {
message = new ScpToMessageBySftp(getVerbose(), session,
list, file);
}
@@ -290,11 +290,11 @@
try {
session = openSession();
ScpToMessage message = null;
- if (!isSftp){
+ if (!isSftp) {
message =
new ScpToMessage(getVerbose(), session,
getProject().resolveFile(fromPath), file);
- } else{
+ } else {
message =
new ScpToMessageBySftp(getVerbose(), session,
getProject().resolveFile(fromPath),
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessageBySftp.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessageBySftp.java?view=diff&rev=476573&r1=476572&r2=476573
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessageBySftp.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessageBySftp.java Sat Nov 18 10:01:49 2006
@@ -34,6 +34,9 @@
import java.util.List;
import java.util.Iterator;
+/**
+ * Utility class to carry out an upload by sftp.
+ */
public class ScpToMessageBySftp extends ScpToMessage/*AbstractSshMessage*/ {
private File localFile;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org