From c5e898eba1186671ae711c74497362310391b6b5 Mon Sep 17 00:00:00 2001 From: Jacobus Martinus Kruithof Date: Sun, 12 Jun 2005 18:04:16 +0000 Subject: [PATCH] Removed unused private fields git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@278421 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/org/apache/tools/ant/taskdefs/CopyPath.java | 2 ++ src/main/org/apache/tools/ant/taskdefs/Execute.java | 2 +- .../taskdefs/optional/depend/DirectoryIterator.java | 12 ------------ .../tools/ant/taskdefs/optional/ssh/SSHBase.java | 1 - .../tools/ant/taskdefs/optional/ssh/SSHExec.java | 2 -- .../org/apache/tools/ant/types/ResourceLocation.java | 6 ------ .../org/apache/tools/bzip2/CBZip2OutputStream.java | 3 --- src/main/org/apache/tools/tar/TarEntry.java | 6 ------ src/main/org/apache/tools/tar/TarInputStream.java | 8 -------- 9 files changed, 3 insertions(+), 39 deletions(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/CopyPath.java b/src/main/org/apache/tools/ant/taskdefs/CopyPath.java index e16287697..ac305356c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/CopyPath.java +++ b/src/main/org/apache/tools/ant/taskdefs/CopyPath.java @@ -45,6 +45,8 @@ public class CopyPath extends Task { private File destDir; protected FileUtils fileUtils; + + //TODO not read, yet in a public setter private long granularity = 0; protected boolean preserveLastModified = false; diff --git a/src/main/org/apache/tools/ant/taskdefs/Execute.java b/src/main/org/apache/tools/ant/taskdefs/Execute.java index 09b762418..17c605ad3 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Execute.java +++ b/src/main/org/apache/tools/ant/taskdefs/Execute.java @@ -59,7 +59,7 @@ public class Execute { private File workingDirectory = null; private Project project = null; private boolean newEnvironment = false; - //TODO: nothing appears to read this. + //TODO: nothing appears to read this but is set using a public setter. private boolean spawn = false; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/depend/DirectoryIterator.java b/src/main/org/apache/tools/ant/taskdefs/optional/depend/DirectoryIterator.java index 0832067d1..67f005b15 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/depend/DirectoryIterator.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/depend/DirectoryIterator.java @@ -46,12 +46,6 @@ public class DirectoryIterator implements ClassFileIterator { */ private Enumeration currentEnum; - /** - * The length of the root directory. This is used to remove the root - * directory from full paths. - */ - private int rootLength; - /** * Creates a directory iterator. The directory iterator is created to * scan the root directory. If the changeInto flag is given, then the @@ -71,12 +65,6 @@ public class DirectoryIterator implements ClassFileIterator { enumStack = new Stack(); - if (rootDirectory.isAbsolute() || changeInto) { - rootLength = rootDirectory.getPath().length() + 1; - } else { - rootLength = 0; - } - Vector filesInRoot = getDirectoryEntries(rootDirectory); currentEnum = filesInRoot.elements(); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHBase.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHBase.java index 918b5e2c7..2892646f8 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHBase.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHBase.java @@ -36,7 +36,6 @@ public abstract class SSHBase extends Task implements LogListener { private static final int SSH_PORT = 22; private String host; - private String keyfile; private String knownHosts; private int port = SSH_PORT; private boolean failOnError = true; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.java index fc4de8f47..87e3e4d2d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.java @@ -37,8 +37,6 @@ import com.jcraft.jsch.Session; */ public class SSHExec extends SSHBase { - private static final int BUFFER_SIZE = 1024; - /** the command to execute via ssh */ private String command = null; diff --git a/src/main/org/apache/tools/ant/types/ResourceLocation.java b/src/main/org/apache/tools/ant/types/ResourceLocation.java index 3ac1e8611..252ac22c2 100644 --- a/src/main/org/apache/tools/ant/types/ResourceLocation.java +++ b/src/main/org/apache/tools/ant/types/ResourceLocation.java @@ -39,12 +39,6 @@ import java.net.URL; public class ResourceLocation { //-- Fields ---------------------------------------------------------------- - - /** - * name of the catalog entry type, as per OASIS spec. - */ - private String name = null; - /** publicId of the dtd/entity. */ private String publicId = null; diff --git a/src/main/org/apache/tools/bzip2/CBZip2OutputStream.java b/src/main/org/apache/tools/bzip2/CBZip2OutputStream.java index 7d3d2e2c4..8ca75f4ca 100644 --- a/src/main/org/apache/tools/bzip2/CBZip2OutputStream.java +++ b/src/main/org/apache/tools/bzip2/CBZip2OutputStream.java @@ -182,9 +182,6 @@ public class CBZip2OutputStream extends OutputStream implements BZip2Constants { */ protected static final int QSORT_STACK_SIZE = 1000; - private static final int FALLBACK_QSORT_SMALL_THRESH = 10; - private static final int FALLBACK_QSORT_STACK_SIZE = 100; - /** * Knuth's increments seem to work better than Incerpi-Sedgewick * here. Possibly because the number of elems to sort is usually diff --git a/src/main/org/apache/tools/tar/TarEntry.java b/src/main/org/apache/tools/tar/TarEntry.java index e927ea932..e060065a6 100644 --- a/src/main/org/apache/tools/tar/TarEntry.java +++ b/src/main/org/apache/tools/tar/TarEntry.java @@ -94,9 +94,6 @@ public class TarEntry implements TarConstants { /** The entry's modification time. */ private long modTime; - /** The entry's checksum. */ - private int checkSum; - /** The entry's link flag. */ private byte linkFlag; @@ -173,7 +170,6 @@ public class TarEntry implements TarConstants { this.userId = 0; this.groupId = 0; this.size = 0; - this.checkSum = 0; this.modTime = (new Date()).getTime() / MILLIS_PER_SECOND; this.linkName = new StringBuffer(""); this.userName = new StringBuffer(""); @@ -258,7 +254,6 @@ public class TarEntry implements TarConstants { this.size = file.length(); this.modTime = file.lastModified() / MILLIS_PER_SECOND; - this.checkSum = 0; this.devMajor = 0; this.devMinor = 0; } @@ -625,7 +620,6 @@ public class TarEntry implements TarConstants { offset += SIZELEN; this.modTime = TarUtils.parseOctal(header, offset, MODTIMELEN); offset += MODTIMELEN; - this.checkSum = (int) TarUtils.parseOctal(header, offset, CHKSUMLEN); offset += CHKSUMLEN; this.linkFlag = header[offset++]; this.linkName = TarUtils.parseName(header, offset, NAMELEN); diff --git a/src/main/org/apache/tools/tar/TarInputStream.java b/src/main/org/apache/tools/tar/TarInputStream.java index 8686cdfd6..0f866c034 100644 --- a/src/main/org/apache/tools/tar/TarInputStream.java +++ b/src/main/org/apache/tools/tar/TarInputStream.java @@ -43,7 +43,6 @@ public class TarInputStream extends FilterInputStream { protected byte[] readBuf; protected TarBuffer buffer; protected TarEntry currEntry; - private boolean v7Format; /** * This contents of this array is not used at all in this class, @@ -83,7 +82,6 @@ public class TarInputStream extends FilterInputStream { this.oneBuf = new byte[1]; this.debug = false; this.hasHitEOF = false; - this.v7Format = false; } /** @@ -238,12 +236,6 @@ public class TarInputStream extends FilterInputStream { } else { this.currEntry = new TarEntry(headerBuf); - if (!(headerBuf[257] == 'u' && headerBuf[258] == 's' - && headerBuf[259] == 't' && headerBuf[260] == 'a' - && headerBuf[261] == 'r')) { - this.v7Format = true; - } - if (this.debug) { System.err.println("TarInputStream: SET CURRENTRY '" + this.currEntry.getName()