Browse Source

magic number

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@579266 13f79535-47bb-0310-9956-ffa450edef68
master
Peter Reilly 18 years ago
parent
commit
162782c491
4 changed files with 10 additions and 4 deletions
  1. +2
    -1
      src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessage.java
  2. +3
    -1
      src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessageBySftp.java
  3. +2
    -1
      src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java
  4. +3
    -1
      src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessageBySftp.java

+ 2
- 1
src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessage.java View File

@@ -34,6 +34,7 @@ import com.jcraft.jsch.Channel;
*/ */
public class ScpFromMessage extends AbstractSshMessage { public class ScpFromMessage extends AbstractSshMessage {


private static final int HUNDRED_KILOBYTES = 102400;
private static final byte LINE_FEED = 0x0a; private static final byte LINE_FEED = 0x0a;
private static final int BUFFER_SIZE = 1024; private static final int BUFFER_SIZE = 1024;


@@ -207,7 +208,7 @@ public class ScpFromMessage extends AbstractSshMessage {
long startTime = System.currentTimeMillis(); long startTime = System.currentTimeMillis();


// only track progress for files larger than 100kb in verbose mode // only track progress for files larger than 100kb in verbose mode
boolean trackProgress = getVerbose() && filesize > 102400;
boolean trackProgress = getVerbose() && filesize > HUNDRED_KILOBYTES;
// since filesize keeps on decreasing we have to store the // since filesize keeps on decreasing we have to store the
// initial filesize // initial filesize
long initFilesize = filesize; long initFilesize = filesize;


+ 3
- 1
src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessageBySftp.java View File

@@ -33,6 +33,8 @@ import com.jcraft.jsch.SftpProgressMonitor;
*/ */
public class ScpFromMessageBySftp extends ScpFromMessage { public class ScpFromMessageBySftp extends ScpFromMessage {


private static final int HUNDRED_KILOBYTES = 102400;

private String remoteFile; private String remoteFile;
private File localFile; private File localFile;
private boolean isRecursive = false; private boolean isRecursive = false;
@@ -154,7 +156,7 @@ public class ScpFromMessageBySftp extends ScpFromMessage {
long totalLength = le.getAttrs().getSize(); long totalLength = le.getAttrs().getSize();


SftpProgressMonitor monitor = null; SftpProgressMonitor monitor = null;
boolean trackProgress = getVerbose() && totalLength > 102400;
boolean trackProgress = getVerbose() && totalLength > HUNDRED_KILOBYTES;
if (trackProgress) { if (trackProgress) {
monitor = getProgressMonitor(); monitor = getProgressMonitor();
} }


+ 2
- 1
src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java View File

@@ -34,6 +34,7 @@ import java.util.Iterator;
*/ */
public class ScpToMessage extends AbstractSshMessage { public class ScpToMessage extends AbstractSshMessage {


private static final int HUNDRED_KILOBYTES = 102400;
private static final int BUFFER_SIZE = 1024; private static final int BUFFER_SIZE = 1024;


private File localFile; private File localFile;
@@ -234,7 +235,7 @@ public class ScpToMessage extends AbstractSshMessage {
long totalLength = 0; long totalLength = 0;


// only track progress for files larger than 100kb in verbose mode // only track progress for files larger than 100kb in verbose mode
boolean trackProgress = getVerbose() && filesize > 102400;
boolean trackProgress = getVerbose() && filesize > HUNDRED_KILOBYTES;
// since filesize keeps on decreasing we have to store the // since filesize keeps on decreasing we have to store the
// initial filesize // initial filesize
long initFilesize = filesize; long initFilesize = filesize;


+ 3
- 1
src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessageBySftp.java View File

@@ -34,6 +34,8 @@ import java.util.Iterator;
*/ */
public class ScpToMessageBySftp extends ScpToMessage/*AbstractSshMessage*/ { public class ScpToMessageBySftp extends ScpToMessage/*AbstractSshMessage*/ {


private static final int HUNDRED_KILOBYTES = 102400;

private File localFile; private File localFile;
private String remotePath; private String remotePath;
private List directoryList; private List directoryList;
@@ -205,7 +207,7 @@ public class ScpToMessageBySftp extends ScpToMessage/*AbstractSshMessage*/ {
long totalLength = filesize; long totalLength = filesize;


// only track progress for files larger than 100kb in verbose mode // only track progress for files larger than 100kb in verbose mode
boolean trackProgress = getVerbose() && filesize > 102400;
boolean trackProgress = getVerbose() && filesize > HUNDRED_KILOBYTES;


SftpProgressMonitor monitor = null; SftpProgressMonitor monitor = null;
if (trackProgress) { if (trackProgress) {


Loading…
Cancel
Save