ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject cvs commit: jakarta-ant/src/main/org/apache/tools/tar TarUtils.java
Date Thu, 31 Oct 2002 15:12:53 GMT
bodewig     2002/10/31 07:12:53

  Modified:    src/main/org/apache/tools/ant/listener AnsiColorLogger.java
                        Log4jListener.java
               src/main/org/apache/tools/ant/taskdefs Javadoc.java
               src/main/org/apache/tools/ant/taskdefs/condition Socket.java
               src/main/org/apache/tools/ant/taskdefs/optional
                        PropertyFile.java
               src/main/org/apache/tools/ant/taskdefs/optional/ccm
                        CCMCheck.java CCMReconfigure.java
               src/main/org/apache/tools/ant/taskdefs/optional/depend
                        ClassFile.java JarFileIterator.java
               src/main/org/apache/tools/ant/taskdefs/optional/ide
                        VAJLocalUtil.java
               src/main/org/apache/tools/ant/taskdefs/optional/j2ee
                        JonasHotDeploymentTool.java
               src/main/org/apache/tools/ant/taskdefs/optional/jlink
                        ClassNameReader.java JlinkTask.java jlink.java
               src/main/org/apache/tools/ant/taskdefs/optional/jsp
                        WLJspc.java
               src/main/org/apache/tools/ant/taskdefs/optional/junit
                        JUnitTestRunner.java
               src/main/org/apache/tools/ant/taskdefs/optional/pvcs
                        Pvcs.java
               src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode
                        ClassFile.java
               src/main/org/apache/tools/ant/taskdefs/optional/vss
                        MSVSSCREATE.java MSVSSHISTORY.java
               src/main/org/apache/tools/ant/types/optional/image Draw.java
               src/main/org/apache/tools/ant/util FileUtils.java
               src/main/org/apache/tools/ant/util/depend/bcel
                        AncestorAnalyzer.java FullAnalyzer.java
               src/main/org/apache/tools/tar TarUtils.java
  Log:
  fix issues reported by PMD
  
  Revision  Changes    Path
  1.5       +17 -17    jakarta-ant/src/main/org/apache/tools/ant/listener/AnsiColorLogger.java
  
  Index: AnsiColorLogger.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/listener/AnsiColorLogger.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- AnsiColorLogger.java	25 Jul 2002 15:21:03 -0000	1.4
  +++ AnsiColorLogger.java	31 Oct 2002 15:12:51 -0000	1.5
  @@ -134,31 +134,31 @@
    * @author <a href="mailto:umagesh@apache.org">Magesh Umasankar</a>
    */
   public final class AnsiColorLogger extends DefaultLogger {
  -    private static final int ATTR_NORMAL = 0;
  -    private static final int ATTR_BRIGHT = 1;
  +    // private static final int ATTR_NORMAL = 0;
  +    // private static final int ATTR_BRIGHT = 1;
       private static final int ATTR_DIM = 2;
  -    private static final int ATTR_UNDERLINE = 3;
  -    private static final int ATTR_BLINK = 5;
  -    private static final int ATTR_REVERSE = 7;
  -    private static final int ATTR_HIDDEN = 8;
  +    // private static final int ATTR_UNDERLINE = 3;
  +    // private static final int ATTR_BLINK = 5;
  +    // private static final int ATTR_REVERSE = 7;
  +    // private static final int ATTR_HIDDEN = 8;
   
  -    private static final int FG_BLACK = 30;
  +    // private static final int FG_BLACK = 30;
       private static final int FG_RED = 31;
       private static final int FG_GREEN = 32;
  -    private static final int FG_YELLOW = 33;
  +    // private static final int FG_YELLOW = 33;
       private static final int FG_BLUE = 34;
       private static final int FG_MAGENTA = 35;
       private static final int FG_CYAN = 36;
  -    private static final int FG_WHITE = 37;
  +    // private static final int FG_WHITE = 37;
   
  -    private static final int BG_BLACK = 40;
  -    private static final int BG_RED = 41;
  -    private static final int BG_GREEN = 42;
  -    private static final int BG_YELLOW = 44;
  -    private static final int BG_BLUE = 44;
  -    private static final int BG_MAGENTA = 45;
  -    private static final int BG_CYAN = 46;
  -    private static final int BG_WHITE = 47;
  +    // private static final int BG_BLACK = 40;
  +    // private static final int BG_RED = 41;
  +    // private static final int BG_GREEN = 42;
  +    // private static final int BG_YELLOW = 44;
  +    // private static final int BG_BLUE = 44;
  +    // private static final int BG_MAGENTA = 45;
  +    // private static final int BG_CYAN = 46;
  +    // private static final int BG_WHITE = 47;
   
       private static final String PREFIX = "\u001b[";
       private static final String SUFFIX = "m";
  
  
  
  1.10      +0 -2      jakarta-ant/src/main/org/apache/tools/ant/listener/Log4jListener.java
  
  Index: Log4jListener.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/listener/Log4jListener.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Log4jListener.java	9 Apr 2002 14:19:32 -0000	1.9
  +++ Log4jListener.java	31 Oct 2002 15:12:51 -0000	1.10
  @@ -69,8 +69,6 @@
    * @author Conor MacNeill
    */
   public class Log4jListener implements BuildListener {
  -    /** Log4j Configuration file */
  -    private static final String LOG4J_CONFIG_PROPERTY = "log4j.configuration";
   
       /** Indicates if the listener was initialized. */
       private boolean initialized = false;
  
  
  
  1.103     +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
  
  Index: Javadoc.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javadoc.java,v
  retrieving revision 1.102
  retrieving revision 1.103
  diff -u -r1.102 -r1.103
  --- Javadoc.java	25 Jul 2002 15:21:05 -0000	1.102
  +++ Javadoc.java	31 Oct 2002 15:12:51 -0000	1.103
  @@ -1644,7 +1644,7 @@
                           // is the href a valid URL
                           try {
                               URL base = new URL("file://.");
  -                            URL testHref = new URL(base, la.getHref());
  +                            new URL(base, la.getHref());
                           } catch (MalformedURLException mue) {
                               // ok - just skip
                               log("Link href \"" + la.getHref()
  
  
  
  1.4       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/condition/Socket.java
  
  Index: Socket.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/condition/Socket.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Socket.java	25 Jul 2002 15:21:10 -0000	1.3
  +++ Socket.java	31 Oct 2002 15:12:51 -0000	1.4
  @@ -90,7 +90,7 @@
           log("Checking for listener at " + server + ":" + port, 
               Project.MSG_VERBOSE);
           try {
  -            java.net.Socket socket = new java.net.Socket(server, port);
  +            new java.net.Socket(server, port);
           } catch (IOException e) {
               return false;
           }
  
  
  
  1.26      +0 -8      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java
  
  Index: PropertyFile.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- PropertyFile.java	25 Jul 2002 15:21:11 -0000	1.25
  +++ PropertyFile.java	31 Oct 2002 15:12:52 -0000	1.26
  @@ -149,14 +149,6 @@
   
       /* ========================================================================
       *
  -    * Static variables.
  -    */
  -
  -    private static final String NEWLINE = System.getProperty("line.separator");
  -
  -
  -    /* ========================================================================
  -    *
       * Instance variables.
       */
   
  
  
  
  1.9       +0 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheck.java
  
  Index: CCMCheck.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheck.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- CCMCheck.java	25 Jul 2002 15:21:12 -0000	1.8
  +++ CCMCheck.java	31 Oct 2002 15:12:52 -0000	1.9
  @@ -134,7 +134,6 @@
        */
       public void execute() throws BuildException {
           Commandline commandLine = new Commandline();
  -        Project aProj = getProject();
           int result = 0;
   
           // build the command line from what we got the format is
  
  
  
  1.8       +0 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMReconfigure.java
  
  Index: CCMReconfigure.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMReconfigure.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- CCMReconfigure.java	23 Jul 2002 08:39:56 -0000	1.7
  +++ CCMReconfigure.java	31 Oct 2002 15:12:52 -0000	1.8
  @@ -85,7 +85,6 @@
        */
       public void execute() throws BuildException {
           Commandline commandLine = new Commandline();
  -        Project aProj = getProject();
           int result = 0;
   
           // build the command line from what we got the format
  
  
  
  1.11      +4 -4      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFile.java
  
  Index: ClassFile.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFile.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ClassFile.java	25 Jul 2002 15:21:12 -0000	1.10
  +++ ClassFile.java	31 Oct 2002 15:12:52 -0000	1.11
  @@ -100,8 +100,8 @@
           }
   
           // right we have a good looking class file.
  -        int minorVersion = classStream.readUnsignedShort();
  -        int majorVersion = classStream.readUnsignedShort();
  +        /* int minorVersion = */ classStream.readUnsignedShort();
  +        /* int majorVersion = */ classStream.readUnsignedShort();
   
           // read the constant pool in and resolve it
           constantPool = new ConstantPool();
  @@ -109,9 +109,9 @@
           constantPool.read(classStream);
           constantPool.resolve();
   
  -        int accessFlags = classStream.readUnsignedShort();
  +        /* int accessFlags = */ classStream.readUnsignedShort();
           int thisClassIndex = classStream.readUnsignedShort();
  -        int superClassIndex = classStream.readUnsignedShort();
  +        /* int superClassIndex = */ classStream.readUnsignedShort();
           ClassCPInfo classInfo 
               = (ClassCPInfo) constantPool.getEntry(thisClassIndex);
           className  = classInfo.getClassName();
  
  
  
  1.7       +0 -19     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/JarFileIterator.java
  
  Index: JarFileIterator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/JarFileIterator.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- JarFileIterator.java	3 Feb 2002 21:53:05 -0000	1.6
  +++ JarFileIterator.java	31 Oct 2002 15:12:52 -0000	1.7
  @@ -82,25 +82,6 @@
       }
   
       /**
  -     * Read a stream into an array of bytes
  -     *
  -     * @param stream the stream from which the bytes are read
  -     * @return the stream's content as a byte array
  -     * @exception IOException if the stream cannot be read
  -     */
  -    private byte[] getEntryBytes(InputStream stream) throws IOException {
  -        byte[] buffer = new byte[8192];
  -        ByteArrayOutputStream baos = new ByteArrayOutputStream(2048);
  -        int n;
  -
  -        while ((n = stream.read(buffer, 0, buffer.length)) != -1) {
  -            baos.write(buffer, 0, n);
  -        }
  -
  -        return baos.toByteArray();
  -    }
  -
  -    /**
        * Get the next ClassFile object from the jar
        *
        * @return a ClassFile object describing the class from the jar
  
  
  
  1.10      +0 -22     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalUtil.java
  
  Index: VAJLocalUtil.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalUtil.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- VAJLocalUtil.java	25 Jul 2002 15:21:15 -0000	1.9
  +++ VAJLocalUtil.java	31 Oct 2002 15:12:52 -0000	1.10
  @@ -207,28 +207,6 @@
       }
   
       /**
  -     * returns a list of project names matching the given pattern
  -     */
  -    private Vector findMatchingProjects(String pattern) {
  -        String[] projectNames;
  -        try {
  -            projectNames = getWorkspace().getRepository().getProjectNames();
  -        } catch (IvjException e) {
  -            throw createBuildException("VA Exception occured: ", e);
  -        }
  -
  -        Vector matchingProjects = new Vector();
  -        for (int i = 0; i < projectNames.length; i++) {
  -            if (VAJWorkspaceScanner.match(pattern, projectNames[i])) {
  -                matchingProjects.addElement(projectNames[i]);
  -            }
  -        }
  -
  -        return matchingProjects;
  -    }
  -
  -
  -    /**
        * return project descriptions containing full project names instead
        * of patterns with wildcards.
        */
  
  
  
  1.9       +0 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/JonasHotDeploymentTool.java
  
  Index: JonasHotDeploymentTool.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/JonasHotDeploymentTool.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- JonasHotDeploymentTool.java	25 Jul 2002 15:21:15 -0000	1.8
  +++ JonasHotDeploymentTool.java	31 Oct 2002 15:12:52 -0000	1.9
  @@ -236,8 +236,6 @@
               }
           }
   
  -        String anAction = getTask().getAction();
  -
           if (getServer() != null) {
               java.createArg().setLine("-n " + getServer());
           }
  
  
  
  1.10      +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jlink/ClassNameReader.java
  
  Index: ClassNameReader.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jlink/ClassNameReader.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ClassNameReader.java	25 Jul 2002 15:21:16 -0000	1.9
  +++ ClassNameReader.java	31 Oct 2002 15:12:52 -0000	1.10
  @@ -142,12 +142,12 @@
           if (cookie != 0xCAFEBABE) {
               return null;
           }
  -        int version = data.readInt();
  +        /* int version = */ data.readInt();
           // read the constant pool.
           ConstantPool constants = new ConstantPool(data);
           Object[] values = constants.values;
           // read access flags and class index.
  -        int accessFlags = data.readUnsignedShort();
  +        /* int accessFlags = */ data.readUnsignedShort();
           int classIndex = data.readUnsignedShort();
           Integer stringIndex = (Integer) values[classIndex];
           String className = (String) values[stringIndex.intValue()];
  
  
  
  1.12      +0 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jlink/JlinkTask.java
  
  Index: JlinkTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jlink/JlinkTask.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- JlinkTask.java	25 Jul 2002 15:21:16 -0000	1.11
  +++ JlinkTask.java	31 Oct 2002 15:12:52 -0000	1.12
  @@ -207,8 +207,6 @@
   
       private  boolean compress = false;
   
  -    private  String ps = System.getProperty("path.separator");
  -
   }
   
   
  
  
  
  1.8       +2 -4      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java
  
  Index: jlink.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- jlink.java	25 Jul 2002 15:21:16 -0000	1.7
  +++ jlink.java	31 Oct 2002 15:12:52 -0000	1.8
  @@ -320,8 +320,6 @@
        */
       private void addFile(ZipOutputStream output, File file, String prefix, boolean compress)
throws IOException {
           //Make sure file exists
  -        long checksum = 0;
  -
           if (!file.exists()) {
               return;
           }
  @@ -417,7 +415,7 @@
       private long calcChecksum(File f) throws IOException {
           BufferedInputStream in = new BufferedInputStream(new FileInputStream(f));
   
  -        return calcChecksum(in, f.length());
  +        return calcChecksum(in);
       }
   
   
  @@ -425,7 +423,7 @@
        * Necessary in the case where you add a entry that
        * is not compressed.
        */
  -    private long calcChecksum(InputStream in, long size) throws IOException {
  +    private long calcChecksum(InputStream in) throws IOException {
           CRC32 crc = new CRC32();
           int len = buffer.length;
           int count = -1;
  
  
  
  1.15      +0 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java
  
  Index: WLJspc.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- WLJspc.java	27 Sep 2002 10:57:35 -0000	1.14
  +++ WLJspc.java	31 Oct 2002 15:12:52 -0000	1.15
  @@ -165,7 +165,6 @@
           
           File jspFile = null;
           String parents = "";
  -        String arg = "";
           int j = 0;
           //XXX  this array stuff is a remnant of prev trials.. gotta remove. 
           args[j++] = "-d";
  
  
  
  1.26      +0 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java
  
  Index: JUnitTestRunner.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- JUnitTestRunner.java	25 Jul 2002 15:21:16 -0000	1.25
  +++ JUnitTestRunner.java	31 Oct 2002 15:12:52 -0000	1.26
  @@ -469,7 +469,6 @@
        * </table> 
        */
       public static void main(String[] args) throws IOException {
  -        boolean exitAtEnd = true;
           boolean haltError = false;
           boolean haltFail = false;
           boolean stackfilter = true;
  
  
  
  1.19      +2 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java
  
  Index: Pvcs.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- Pvcs.java	25 Jul 2002 15:21:18 -0000	1.18
  +++ Pvcs.java	31 Oct 2002 15:12:53 -0000	1.19
  @@ -122,10 +122,10 @@
        */
       private static final String PCLI_EXE = "pcli";
   
  -    /**
  +    /*
        * Constant for the PCLI listversionedfiles recursive i a format "get" understands
        */
  -    private static final String PCLI_LVF_ARGS = "lvf -z -aw";
  +    // private static final String PCLI_LVF_ARGS = "lvf -z -aw";
   
       /**
        * Constant for the thing to execute
  @@ -164,7 +164,6 @@
        * @exception org.apache.tools.ant.BuildException Something is stopping the build...
        */
       public void execute() throws org.apache.tools.ant.BuildException {
  -        Project aProj = getProject();
           int result = 0;
   
           if (repository == null || repository.trim().equals("")) {
  
  
  
  1.7       +4 -4      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassFile.java
  
  Index: ClassFile.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassFile.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ClassFile.java	30 Jul 2002 09:12:12 -0000	1.6
  +++ ClassFile.java	31 Oct 2002 15:12:53 -0000	1.7
  @@ -86,9 +86,9 @@
           DataInputStream dis = new DataInputStream(is);
           ConstantPool constantPool = new ConstantPool();
   
  -        int magic = dis.readInt(); // 0xCAFEBABE
  -        int minor = dis.readShort();
  -        int major = dis.readShort();
  +        /* int magic = */ dis.readInt(); // 0xCAFEBABE
  +        /* int minor = */ dis.readShort();
  +        /* int major = */ dis.readShort();
   
           constantPool.read(dis);
           constantPool.resolve();
  @@ -97,7 +97,7 @@
           access_flags = dis.readShort();
           int this_class = dis.readShort();
           fullname = ((ClassCPInfo) constantPool.getEntry(this_class)).getClassName().replace('/',
'.');
  -        int super_class = dis.readShort();
  +        /* int super_class = */ dis.readShort();
   
           // skip interfaces...
           int count = dis.readShort();
  
  
  
  1.6       +0 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCREATE.java
  
  Index: MSVSSCREATE.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCREATE.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- MSVSSCREATE.java	23 Jul 2002 08:39:59 -0000	1.5
  +++ MSVSSCREATE.java	31 Oct 2002 15:12:53 -0000	1.6
  @@ -113,7 +113,6 @@
   public class MSVSSCREATE extends MSVSS {
   
       private String m_AutoResponse = null;
  -    private String m_Name = null;
       private String m_Comment = "-";
       private boolean m_Quiet = false;
     
  
  
  
  1.13      +0 -21     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSHISTORY.java
  
  Index: MSVSSHISTORY.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSHISTORY.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- MSVSSHISTORY.java	25 Jul 2002 15:21:20 -0000	1.12
  +++ MSVSSHISTORY.java	31 Oct 2002 15:12:53 -0000	1.13
  @@ -301,16 +301,6 @@
           }
       }
   
  -    /**
  -     * Builds the User command.
  -     * @param cmd the commandline the command is to be added to
  -     */
  -    private void getUserCommand(Commandline cmd) {
  -        if (m_User != null) {
  -            cmd.createArgument().setValue(FLAG_USER + m_User);
  -        }
  -    }
  -
        /**
        * Calculates the start date for version comparison.
        * <p>
  @@ -341,17 +331,6 @@
        */
       public void setUser(String user) {
           m_User = user;
  -    }
  -
  -    /**
  -     * @return the 'recursive' command if the attribute was 'true', otherwise an empty
string
  -     */
  -    private void getRecursiveCommand(Commandline cmd) {
  -        if (!m_Recursive) {
  -            return;
  -        } else {
  -            cmd.createArgument().setValue(FLAG_RECURSION);
  -        }
       }
   
       /**
  
  
  
  1.2       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/types/optional/image/Draw.java
  
  Index: Draw.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/optional/image/Draw.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Draw.java	29 Jul 2002 15:23:19 -0000	1.1
  +++ Draw.java	31 Oct 2002 15:12:53 -0000	1.2
  @@ -120,7 +120,7 @@
                   BufferedImage child = op.getAsBufferedImage();
                   log("\tDrawing to x=" + xloc + " y=" + yloc);
                   graphics.drawImage(child, null, xloc, yloc);
  -                PlanarImage test = PlanarImage.wrapRenderedImage(bi);
  +                PlanarImage.wrapRenderedImage(bi);
               }
           }
           image = PlanarImage.wrapRenderedImage(bi);
  
  
  
  1.30      +1 -2      jakarta-ant/src/main/org/apache/tools/ant/util/FileUtils.java
  
  Index: FileUtils.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/util/FileUtils.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- FileUtils.java	25 Jul 2002 15:21:24 -0000	1.29
  +++ FileUtils.java	31 Oct 2002 15:12:53 -0000	1.30
  @@ -360,7 +360,6 @@
                           in = new BufferedReader(rdr);
                       }
   
  -                    int length;
                       String newline = null;
                       String line = in.readLine();
                       while (line != null) {
  
  
  
  1.6       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/util/depend/bcel/AncestorAnalyzer.java
  
  Index: AncestorAnalyzer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/util/depend/bcel/AncestorAnalyzer.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- AncestorAnalyzer.java	15 Apr 2002 12:11:51 -0000	1.5
  +++ AncestorAnalyzer.java	31 Oct 2002 15:12:53 -0000	1.6
  @@ -72,7 +72,7 @@
       public AncestorAnalyzer() {
           // force BCEL classes to load now
           try {
  -            ClassParser parser = new ClassParser("force");
  +            new ClassParser("force");
           } catch (IOException e) {
               // ignore
           }
  
  
  
  1.6       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/util/depend/bcel/FullAnalyzer.java
  
  Index: FullAnalyzer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/util/depend/bcel/FullAnalyzer.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- FullAnalyzer.java	15 Apr 2002 12:11:51 -0000	1.5
  +++ FullAnalyzer.java	31 Oct 2002 15:12:53 -0000	1.6
  @@ -72,7 +72,7 @@
       public FullAnalyzer() {
           // force BCEL classes to load now
           try {
  -            ClassParser parser = new ClassParser("force");
  +            new ClassParser("force");
           } catch (IOException e) {
               // ignore
           }
  
  
  
  1.4       +1 -2      jakarta-ant/src/main/org/apache/tools/tar/TarUtils.java
  
  Index: TarUtils.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/tar/TarUtils.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TarUtils.java	10 Jan 2002 10:40:48 -0000	1.3
  +++ TarUtils.java	31 Oct 2002 15:12:53 -0000	1.4
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000,2002 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -157,7 +157,6 @@
        * @return The integer value of the octal bytes.
        */
       public static int getOctalBytes(long value, byte[] buf, int offset, int length) {
  -        byte[] result = new byte[length];
           int    idx = length - 1;
   
           buf[offset + idx] = 0;
  
  
  

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


Mime
View raw message