ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/depend DirectoryIterator.java
Date Sun, 12 Jun 2005 18:04:16 GMT
jkf         2005/06/12 11:04:16

  Modified:    src/main/org/apache/tools/tar TarInputStream.java
                        TarEntry.java
               src/main/org/apache/tools/ant/taskdefs CopyPath.java
                        Execute.java
               src/main/org/apache/tools/ant/taskdefs/optional/ssh
                        SSHExec.java SSHBase.java
               src/main/org/apache/tools/bzip2 CBZip2OutputStream.java
               src/main/org/apache/tools/ant/types ResourceLocation.java
               src/main/org/apache/tools/ant/taskdefs/optional/depend
                        DirectoryIterator.java
  Log:
  Removed unused private fields
  
  Revision  Changes    Path
  1.22      +0 -8      ant/src/main/org/apache/tools/tar/TarInputStream.java
  
  Index: TarInputStream.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/tar/TarInputStream.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- TarInputStream.java	7 Jun 2005 15:32:48 -0000	1.21
  +++ TarInputStream.java	12 Jun 2005 18:04:16 -0000	1.22
  @@ -43,7 +43,6 @@
       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 @@
           this.oneBuf = new byte[1];
           this.debug = false;
           this.hasHitEOF = false;
  -        this.v7Format = false;
       }
   
       /**
  @@ -238,12 +236,6 @@
           } 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()
  
  
  
  1.24      +0 -6      ant/src/main/org/apache/tools/tar/TarEntry.java
  
  Index: TarEntry.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/tar/TarEntry.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- TarEntry.java	12 Nov 2004 15:17:11 -0000	1.23
  +++ TarEntry.java	12 Jun 2005 18:04:16 -0000	1.24
  @@ -94,9 +94,6 @@
       /** 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 @@
           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 @@
   
           this.size = file.length();
           this.modTime = file.lastModified() / MILLIS_PER_SECOND;
  -        this.checkSum = 0;
           this.devMajor = 0;
           this.devMinor = 0;
       }
  @@ -625,7 +620,6 @@
           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);
  
  
  
  1.4       +2 -0      ant/src/main/org/apache/tools/ant/taskdefs/CopyPath.java
  
  Index: CopyPath.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/CopyPath.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- CopyPath.java	12 Jun 2005 15:54:14 -0000	1.3
  +++ CopyPath.java	12 Jun 2005 18:04:16 -0000	1.4
  @@ -45,6 +45,8 @@
   
       private File destDir;
       protected FileUtils fileUtils;
  +    
  +    //TODO not read, yet in a public setter
       private long granularity = 0;
       protected boolean preserveLastModified = false;
   
  
  
  
  1.95      +1 -1      ant/src/main/org/apache/tools/ant/taskdefs/Execute.java
  
  Index: Execute.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Execute.java,v
  retrieving revision 1.94
  retrieving revision 1.95
  diff -u -r1.94 -r1.95
  --- Execute.java	28 Mar 2005 21:43:18 -0000	1.94
  +++ Execute.java	12 Jun 2005 18:04:16 -0000	1.95
  @@ -59,7 +59,7 @@
       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;
   
   
  
  
  
  1.21      +0 -2      ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.java
  
  Index: SSHExec.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- SSHExec.java	3 Jun 2005 16:46:55 -0000	1.20
  +++ SSHExec.java	12 Jun 2005 18:04:16 -0000	1.21
  @@ -37,8 +37,6 @@
    */
   public class SSHExec extends SSHBase {
   
  -    private static final int BUFFER_SIZE = 1024;
  -
       /** the command to execute via ssh */
       private String command = null;
   
  
  
  
  1.12      +0 -1      ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHBase.java
  
  Index: SSHBase.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHBase.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- SSHBase.java	7 Apr 2004 13:30:30 -0000	1.11
  +++ SSHBase.java	12 Jun 2005 18:04:16 -0000	1.12
  @@ -36,7 +36,6 @@
       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;
  
  
  
  1.25      +0 -3      ant/src/main/org/apache/tools/bzip2/CBZip2OutputStream.java
  
  Index: CBZip2OutputStream.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/bzip2/CBZip2OutputStream.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- CBZip2OutputStream.java	26 Apr 2005 11:54:15 -0000	1.24
  +++ CBZip2OutputStream.java	12 Jun 2005 18:04:16 -0000	1.25
  @@ -182,9 +182,6 @@
        */
       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
  
  
  
  1.12      +0 -6      ant/src/main/org/apache/tools/ant/types/ResourceLocation.java
  
  Index: ResourceLocation.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/ResourceLocation.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- ResourceLocation.java	9 Mar 2005 00:38:19 -0000	1.11
  +++ ResourceLocation.java	12 Jun 2005 18:04:16 -0000	1.12
  @@ -39,12 +39,6 @@
   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;
   
  
  
  
  1.16      +0 -12     ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/DirectoryIterator.java
  
  Index: DirectoryIterator.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/DirectoryIterator.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- DirectoryIterator.java	9 Mar 2004 16:48:16 -0000	1.15
  +++ DirectoryIterator.java	12 Jun 2005 18:04:16 -0000	1.16
  @@ -47,12 +47,6 @@
       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
        * entries returned will be relative to this directory and not the
  @@ -71,12 +65,6 @@
   
           enumStack = new Stack();
   
  -        if (rootDirectory.isAbsolute() || changeInto) {
  -            rootLength = rootDirectory.getPath().length() + 1;
  -        } else {
  -            rootLength = 0;
  -        }
  -
           Vector filesInRoot = getDirectoryEntries(rootDirectory);
   
           currentEnum = filesInRoot.elements();
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message