From af6ab678b65d87557454d8f78dfdeef581b93af6 Mon Sep 17 00:00:00 2001
From: Peter Reilly <peterreilly@apache.org>
Date: Sat, 18 Nov 2006 18:01:49 +0000
Subject: [PATCH] checkstyle

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@476573 13f79535-47bb-0310-9956-ffa450edef68
---
 .../taskdefs/optional/ssh/SSHUserInfo.java    |  2 +-
 .../tools/ant/taskdefs/optional/ssh/Scp.java  | 20 +++++++++----------
 .../optional/ssh/ScpToMessageBySftp.java      |  3 +++
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHUserInfo.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHUserInfo.java
index 39fcd8e8b..f07ecfc39 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHUserInfo.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHUserInfo.java
@@ -195,7 +195,7 @@ public class SSHUserInfo implements UserInfo, UIKeyboardInteractive {
                                               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];
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java
index 69e493ef7..33107c96a 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java
@@ -41,11 +41,11 @@ import org.apache.tools.ant.types.FileSet;
  */
 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 @@ public class Scp extends SSHBase {
         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 @@ public class Scp extends SSHBase {
             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 @@ public class Scp extends SSHBase {
         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),
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessageBySftp.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessageBySftp.java
index db20b0169..addce57cf 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessageBySftp.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessageBySftp.java
@@ -34,6 +34,9 @@ import java.io.OutputStream;
 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;