ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sbaill...@apache.org
Subject cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool ClassCPInfo.java ConstantCPInfo.java ConstantPool.java ConstantPoolEntry.java DoubleCPInfo.java FieldRefCPInfo.java FloatCPInfo.java IntegerCPInfo.java InterfaceMethodRefCPInfo.java LongCPInfo.java MethodRefCPInfo.java NameAndTypeCPInfo.java StringCPInfo.java Utf8CPInfo.java
Date Tue, 08 Jan 2002 23:48:00 GMT
sbailliez    02/01/08 15:48:00

  Modified:    src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool
                        ClassCPInfo.java ConstantCPInfo.java
                        ConstantPool.java ConstantPoolEntry.java
                        DoubleCPInfo.java FieldRefCPInfo.java
                        FloatCPInfo.java IntegerCPInfo.java
                        InterfaceMethodRefCPInfo.java LongCPInfo.java
                        MethodRefCPInfo.java NameAndTypeCPInfo.java
                        StringCPInfo.java Utf8CPInfo.java
  Log:
  Code layout only.
  
  Revision  Changes    Path
  1.4       +17 -17    jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ClassCPInfo.java
  
  Index: ClassCPInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ClassCPInfo.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ClassCPInfo.java	28 Oct 2001 21:30:19 -0000	1.3
  +++ ClassCPInfo.java	8 Jan 2002 23:47:59 -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 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -9,7 +9,7 @@
    * are met:
    *
    * 1. Redistributions of source code must retain the above copyright
  - *    notice, this list of conditions and the following disclaimer. 
  + *    notice, this list of conditions and the following disclaimer.
    *
    * 2. Redistributions in binary form must reproduce the above copyright
    *    notice, this list of conditions and the following disclaimer in
  @@ -17,15 +17,15 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:  
  - *       "This product includes software developed by the 
  + *    any, must include the following acknowlegement:
  + *       "This product includes software developed by the
    *        Apache Software Foundation (http://www.apache.org/)."
    *    Alternately, this acknowlegement may appear in the software itself,
    *    if and wherever such third-party acknowlegements normally appear.
    *
    * 4. The names "The Jakarta Project", "Ant", and "Apache Software
    *    Foundation" must not be used to endorse or promote products derived
  - *    from this software without prior written permission. For written 
  + *    from this software without prior written permission. For written
    *    permission, please contact apache@apache.org.
    *
    * 5. Products derived from this software may not be called "Apache"
  @@ -53,13 +53,13 @@
    */
   package org.apache.tools.ant.taskdefs.optional.depend.constantpool;
   
  -import java.io.IOException;
   import java.io.DataInputStream;
  +import java.io.IOException;
   
   
   /**
    * The constant pool entry which stores class information.
  - * 
  + *
    * @author Conor MacNeill
    */
   public class ClassCPInfo extends ConstantPoolEntry {
  @@ -75,11 +75,11 @@
        * name is changed, this entry is invalid until this entry is connected to a constant
        * pool.
        */
  -    private int    index;
  +    private int index;
   
       /**
        * Constructor.
  -     * 
  +     *
        * Sets the tag value for this entry to type Class
        */
       public ClassCPInfo() {
  @@ -88,42 +88,42 @@
   
       /**
        * Read the entry from a stream.
  -     * 
  +     *
        * @param cpStream the stream containing the constant pool entry to be read.
  -     * 
  +     *
        * @exception IOException thrown if there is a problem reading the entry from the stream.
        */
       public void read(DataInputStream cpStream) throws IOException {
           index = cpStream.readUnsignedShort();
           className = "unresolved";
  -    } 
  +    }
   
       /**
        * Generate a string readable version of this entry
        */
       public String toString() {
           return "Class Constant Pool Entry for " + className + "[" + index + "]";
  -    } 
  +    }
   
       /**
        * Resolve this class info against the given constant pool.
  -     * 
  +     *
        * @param constantPool the constant pool with which to resolve the class.
        */
       public void resolve(ConstantPool constantPool) {
           className = ((Utf8CPInfo) constantPool.getEntry(index)).getValue();
   
           super.resolve(constantPool);
  -    } 
  +    }
   
       /**
        * Get the class name of this entry.
  -     * 
  +     *
        * @return the class' name.
        */
       public String getClassName() {
           return className;
  -    } 
  +    }
   
   }
   
  
  
  
  1.4       +13 -14    jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantCPInfo.java
  
  Index: ConstantCPInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantCPInfo.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ConstantCPInfo.java	28 Oct 2001 21:30:19 -0000	1.3
  +++ ConstantCPInfo.java	8 Jan 2002 23:47:59 -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 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -9,7 +9,7 @@
    * are met:
    *
    * 1. Redistributions of source code must retain the above copyright
  - *    notice, this list of conditions and the following disclaimer. 
  + *    notice, this list of conditions and the following disclaimer.
    *
    * 2. Redistributions in binary form must reproduce the above copyright
    *    notice, this list of conditions and the following disclaimer in
  @@ -17,15 +17,15 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:  
  - *       "This product includes software developed by the 
  + *    any, must include the following acknowlegement:
  + *       "This product includes software developed by the
    *        Apache Software Foundation (http://www.apache.org/)."
    *    Alternately, this acknowlegement may appear in the software itself,
    *    if and wherever such third-party acknowlegements normally appear.
    *
    * 4. The names "The Jakarta Project", "Ant", and "Apache Software
    *    Foundation" must not be used to endorse or promote products derived
  - *    from this software without prior written permission. For written 
  + *    from this software without prior written permission. For written
    *    permission, please contact apache@apache.org.
    *
    * 5. Products derived from this software may not be called "Apache"
  @@ -54,18 +54,17 @@
   package org.apache.tools.ant.taskdefs.optional.depend.constantpool;
   
   
  -
   /**
    * A Constant Pool entry which represents a constant value.
  - * 
  - * 
  + *
  + *
    * @author Conor MacNeill
    */
   abstract public class ConstantCPInfo extends ConstantPoolEntry {
   
       /**
        * The entry's untyped value.
  -     * 
  +     *
        * Each subclass interprets the constant value based on the subclass's type.
        * The value here must be compatible.
        */
  @@ -73,7 +72,7 @@
   
       /**
        * Initialise the constant entry.
  -     * 
  +     *
        * @param tagValue the constant pool entry type to be used.
        * @param entries the number of constant pool entry slots occupied by this entry.
        */
  @@ -83,21 +82,21 @@
   
       /**
        * Get the value of the constant.
  -     * 
  +     *
        * @return the value of the constant (untyped).
        */
       public Object getValue() {
           return value;
  -    } 
  +    }
   
       /**
        * Set the constant value.
  -     * 
  +     *
        * @param newValue the new untyped value of this constant.
        */
       public void setValue(Object newValue) {
           value = newValue;
  -    } 
  +    }
   
   }
   
  
  
  
  1.4       +80 -80    jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPool.java
  
  Index: ConstantPool.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPool.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ConstantPool.java	28 Oct 2001 21:30:19 -0000	1.3
  +++ ConstantPool.java	8 Jan 2002 23:47:59 -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 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -9,7 +9,7 @@
    * are met:
    *
    * 1. Redistributions of source code must retain the above copyright
  - *    notice, this list of conditions and the following disclaimer. 
  + *    notice, this list of conditions and the following disclaimer.
    *
    * 2. Redistributions in binary form must reproduce the above copyright
    *    notice, this list of conditions and the following disclaimer in
  @@ -17,15 +17,15 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:  
  - *       "This product includes software developed by the 
  + *    any, must include the following acknowlegement:
  + *       "This product includes software developed by the
    *        Apache Software Foundation (http://www.apache.org/)."
    *    Alternately, this acknowlegement may appear in the software itself,
    *    if and wherever such third-party acknowlegements normally appear.
    *
    * 4. The names "The Jakarta Project", "Ant", and "Apache Software
    *    Foundation" must not be used to endorse or promote products derived
  - *    from this software without prior written permission. For written 
  + *    from this software without prior written permission. For written
    *    permission, please contact apache@apache.org.
    *
    * 5. Products derived from this software may not be called "Apache"
  @@ -53,20 +53,20 @@
    */
   package org.apache.tools.ant.taskdefs.optional.depend.constantpool;
   
  -import java.io.IOException;
   import java.io.DataInputStream;
  -import java.util.Vector;
  -import java.util.Hashtable;
  +import java.io.IOException;
   import java.util.Enumeration;
  +import java.util.Hashtable;
  +import java.util.Vector;
   
   /**
    * The constant pool of a Java class.
  - * 
  + *
    * The constant pool is a collection of constants used in a Java class file. It stores
    * strings, constant values, class names, method names, field names etc.
  - * 
  + *
    * @see <a href="http://java.sun.com/docs/books/vmspec/">The Java Virtual Machine Specification</a>
  - * 
  + *
    * @author Conor MacNeill
    */
   public class ConstantPool {
  @@ -96,23 +96,23 @@
   
       /**
        * Read the constant pool from a class input stream.
  -     * 
  +     *
        * @param classStream the DataInputStream of a class file.
  -     * 
  +     *
        * @throws IOException if there is a problem reading the constant pool
        * from the stream
        */
       public void read(DataInputStream classStream) throws IOException {
           int numEntries = classStream.readUnsignedShort();
   
  -        for (int i = 1; i < numEntries; ) {
  +        for (int i = 1; i < numEntries;) {
               ConstantPoolEntry nextEntry = ConstantPoolEntry.readEntry(classStream);
   
               i += nextEntry.getNumEntries();
   
               addEntry(nextEntry);
  -        } 
  -    } 
  +        }
  +    }
   
       /**
        * Get the size of the constant pool.
  @@ -120,12 +120,12 @@
       public int size() {
           return entries.size();
       }
  -    
  +
       /**
        * Add an entry to the constant pool.
  -     * 
  +     *
        * @param entry the new entry to be added to the constant pool.
  -     * 
  +     *
        * @return the index into the constant pool at which the entry is stored.
        */
       public int addEntry(ConstantPoolEntry entry) {
  @@ -138,69 +138,69 @@
           // add null entries for any additional slots required.
           for (int j = 0; j < numSlots - 1; ++j) {
               entries.addElement(null);
  -        } 
  +        }
   
           if (entry instanceof Utf8CPInfo) {
               Utf8CPInfo utf8Info = (Utf8CPInfo) entry;
   
               utf8Indexes.put(utf8Info.getValue(), new Integer(index));
  -        } 
  +        }
   
           return index;
  -    } 
  +    }
   
       /**
        * Resolve the entries in the constant pool.
  -     * 
  +     *
        * Resolution of the constant pool involves transforming indexes to
        * other constant pool entries into the actual data for that entry.
        */
       public void resolve() {
  -        for (Enumeration i = entries.elements(); i.hasMoreElements(); ) {
  +        for (Enumeration i = entries.elements(); i.hasMoreElements();) {
               ConstantPoolEntry poolInfo = (ConstantPoolEntry) i.nextElement();
   
  -            if (poolInfo != null &&!poolInfo.isResolved()) {
  +            if (poolInfo != null && !poolInfo.isResolved()) {
                   poolInfo.resolve(this);
  -            } 
  -        } 
  -    } 
  +            }
  +        }
  +    }
   
   
       /**
        * Get an constant pool entry at a particular index.
  -     * 
  +     *
        * @param index the index into the constant pool.
  -     * 
  +     *
        * @return the constant pool entry at that index.
        */
       public ConstantPoolEntry getEntry(int index) {
           return (ConstantPoolEntry) entries.elementAt(index);
  -    } 
  +    }
   
       /**
        * Get the index of a given UTF8 constant pool entry.
  -     * 
  +     *
        * @param value the string value of the UTF8 entry.
  -     * 
  +     *
        * @return the index at which the given string occurs in the
        * constant pool or -1 if the value does not occur.
        */
       public int getUTF8Entry(String value) {
  -        int     index = -1;
  +        int index = -1;
           Integer indexInteger = (Integer) utf8Indexes.get(value);
   
           if (indexInteger != null) {
               index = indexInteger.intValue();
  -        } 
  +        }
   
           return index;
  -    } 
  +    }
   
       /**
        * Get the index of a given CONSTANT_Class entry in the constant pool.
  -     * 
  +     *
        * @param className the name of the class for which the class entry index is required.
  -     * 
  +     *
        * @return the index at which the given class entry occurs in the
        * constant pool or -1 if the value does not occur.
        */
  @@ -215,18 +215,18 @@
   
                   if (classinfo.getClassName().equals(className)) {
                       index = i;
  -                } 
  -            } 
  -        } 
  +                }
  +            }
  +        }
   
           return index;
  -    } 
  +    }
   
       /**
        * Get the index of a given constant value entry in the constant pool.
  -     * 
  +     *
        * @param constantValue the constant value for which the index is required.
  -     * 
  +     *
        * @return the index at which the given value entry occurs in the
        * constant pool or -1 if the value does not occur.
        */
  @@ -241,21 +241,21 @@
   
                   if (constantEntry.getValue().equals(constantValue)) {
                       index = i;
  -                } 
  -            } 
  -        } 
  +                }
  +            }
  +        }
   
           return index;
  -    } 
  +    }
   
       /**
        * Get the index of a given CONSTANT_MethodRef entry in the constant pool.
  -     * 
  +     *
        * @param methodClassName the name of the class which contains the method
        * being referenced.
        * @param methodName the name of the method being referenced.
        * @param methodType the type descriptor of the metho dbeing referenced.
  -     * 
  +     *
        * @return the index at which the given method ref entry occurs in the
        * constant pool or -1 if the value does not occur.
        */
  @@ -268,24 +268,24 @@
               if (element instanceof MethodRefCPInfo) {
                   MethodRefCPInfo methodRefEntry = (MethodRefCPInfo) element;
   
  -                if (methodRefEntry.getMethodClassName().equals(methodClassName) 
  +                if (methodRefEntry.getMethodClassName().equals(methodClassName)
                           && methodRefEntry.getMethodName().equals(methodName) && methodRefEntry.getMethodType().equals(methodType)) {
                       index = i;
  -                } 
  -            } 
  -        } 
  +                }
  +            }
  +        }
   
           return index;
  -    } 
  +    }
   
       /**
        * Get the index of a given CONSTANT_InterfaceMethodRef entry in the constant pool.
  -     * 
  +     *
        * @param interfaceMethodClassName the name of the interface which contains the method
        * being referenced.
        * @param interfaceMethodName the name of the method being referenced.
        * @param interfaceMethodType the type descriptor of the metho dbeing referenced.
  -     * 
  +     *
        * @return the index at which the given method ref entry occurs in the
        * constant pool or -1 if the value does not occur.
        */
  @@ -298,25 +298,25 @@
               if (element instanceof InterfaceMethodRefCPInfo) {
                   InterfaceMethodRefCPInfo interfaceMethodRefEntry = (InterfaceMethodRefCPInfo) element;
   
  -                if (interfaceMethodRefEntry.getInterfaceMethodClassName().equals(interfaceMethodClassName) 
  -                        && interfaceMethodRefEntry.getInterfaceMethodName().equals(interfaceMethodName) 
  +                if (interfaceMethodRefEntry.getInterfaceMethodClassName().equals(interfaceMethodClassName)
  +                        && interfaceMethodRefEntry.getInterfaceMethodName().equals(interfaceMethodName)
                           && interfaceMethodRefEntry.getInterfaceMethodType().equals(interfaceMethodType)) {
                       index = i;
  -                } 
  -            } 
  -        } 
  +                }
  +            }
  +        }
   
           return index;
  -    } 
  +    }
   
       /**
        * Get the index of a given CONSTANT_FieldRef entry in the constant pool.
  -     * 
  +     *
        * @param fieldClassName the name of the class which contains the field
        * being referenced.
        * @param fieldName the name of the field being referenced.
        * @param fieldType the type descriptor of the field being referenced.
  -     * 
  +     *
        * @return the index at which the given field ref entry occurs in the
        * constant pool or -1 if the value does not occur.
        */
  @@ -329,22 +329,22 @@
               if (element instanceof FieldRefCPInfo) {
                   FieldRefCPInfo fieldRefEntry = (FieldRefCPInfo) element;
   
  -                if (fieldRefEntry.getFieldClassName().equals(fieldClassName) && fieldRefEntry.getFieldName().equals(fieldName) 
  +                if (fieldRefEntry.getFieldClassName().equals(fieldClassName) && fieldRefEntry.getFieldName().equals(fieldName)
                           && fieldRefEntry.getFieldType().equals(fieldType)) {
                       index = i;
  -                } 
  -            } 
  -        } 
  +                }
  +            }
  +        }
   
           return index;
  -    } 
  +    }
   
       /**
        * Get the index of a given CONSTANT_NameAndType entry in the constant pool.
  -     * 
  +     *
        * @param name the name
        * @param type the type
  -     * 
  +     *
        * @return the index at which the given NameAndType entry occurs in the
        * constant pool or -1 if the value does not occur.
        */
  @@ -359,28 +359,28 @@
   
                   if (nameAndTypeEntry.getName().equals(name) && nameAndTypeEntry.getType().equals(type)) {
                       index = i;
  -                } 
  -            } 
  -        } 
  +                }
  +            }
  +        }
   
           return index;
  -    } 
  +    }
   
       /**
        * Dump the constant pool to a string.
  -     * 
  +     *
        * @return the constant pool entries as strings
        */
       public String toString() {
           StringBuffer sb = new StringBuffer("\n");
  -        int          size = entries.size();
  +        int size = entries.size();
   
           for (int i = 0; i < size; ++i) {
               sb.append("[" + i + "] = " + getEntry(i) + "\n");
  -        } 
  +        }
   
           return sb.toString();
  -    } 
  +    }
   
   }
   
  
  
  
  1.4       +65 -65    jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPoolEntry.java
  
  Index: ConstantPoolEntry.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPoolEntry.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ConstantPoolEntry.java	28 Oct 2001 21:30:19 -0000	1.3
  +++ ConstantPoolEntry.java	8 Jan 2002 23:47:59 -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 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -9,7 +9,7 @@
    * are met:
    *
    * 1. Redistributions of source code must retain the above copyright
  - *    notice, this list of conditions and the following disclaimer. 
  + *    notice, this list of conditions and the following disclaimer.
    *
    * 2. Redistributions in binary form must reproduce the above copyright
    *    notice, this list of conditions and the following disclaimer in
  @@ -17,15 +17,15 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:  
  - *       "This product includes software developed by the 
  + *    any, must include the following acknowlegement:
  + *       "This product includes software developed by the
    *        Apache Software Foundation (http://www.apache.org/)."
    *    Alternately, this acknowlegement may appear in the software itself,
    *    if and wherever such third-party acknowlegements normally appear.
    *
    * 4. The names "The Jakarta Project", "Ant", and "Apache Software
    *    Foundation" must not be used to endorse or promote products derived
  - *    from this software without prior written permission. For written 
  + *    from this software without prior written permission. For written
    *    permission, please contact apache@apache.org.
    *
    * 5. Products derived from this software may not be called "Apache"
  @@ -53,16 +53,16 @@
    */
   package org.apache.tools.ant.taskdefs.optional.depend.constantpool;
   
  -import java.io.IOException;
   import java.io.DataInputStream;
  +import java.io.IOException;
   
   
   /**
    * An entry in the constant pool.
  - * 
  + *
    * This class contains a represenation of the constant pool entries. It is
    * an abstract base class for all the different forms of constant pool entry.
  - * 
  + *
    * @author Conor MacNeill
    * @see ConstantPool
    */
  @@ -126,21 +126,21 @@
       /**
        * This entry's tag which identifies the type of this constant pool entry.
        */
  -    private int             tag;
  +    private int tag;
   
       /**
        * The number of slots in the constant pool, occupied by this entry.
        */
  -    private int             numEntries;
  +    private int numEntries;
   
       /**
        * A flag which indiciates if this entry has been resolved or not.
        */
  -    private boolean         resolved;
  +    private boolean resolved;
   
       /**
        * Initialse the constant pool entry.
  -     * 
  +     *
        * @param tagValue the tag value which identifies which type of constant pool entry this is.
        * @param entries the number of constant pool entry slots this entry occupies.
        */
  @@ -152,139 +152,139 @@
   
       /**
        * Read a constant pool entry from a stream.
  -     * 
  +     *
        * This is a factory method which reads a constant pool entry
        * form a stream and returns the appropriate subclass for the
        * entry.
  -     * 
  +     *
        * @param cpStream the stream from which the constant pool entry is to be read.
  -     * 
  +     *
        * @returns the appropriate ConstantPoolEntry subclass representing the
        * constant pool entry from the stream.
  -     * 
  +     *
        * @throws IOExcception if there is a problem reading the entry from the stream.
        */
       public static ConstantPoolEntry readEntry(DataInputStream cpStream) throws IOException {
           ConstantPoolEntry cpInfo = null;
  -        int               cpTag = cpStream.readUnsignedByte();
  +        int cpTag = cpStream.readUnsignedByte();
   
           switch (cpTag) {
   
  -        case CONSTANT_Utf8:
  -            cpInfo = new Utf8CPInfo();
  +            case CONSTANT_Utf8:
  +                cpInfo = new Utf8CPInfo();
   
  -            break;
  +                break;
   
  -        case CONSTANT_Integer:
  -            cpInfo = new IntegerCPInfo();
  +            case CONSTANT_Integer:
  +                cpInfo = new IntegerCPInfo();
   
  -            break;
  +                break;
   
  -        case CONSTANT_Float:
  -            cpInfo = new FloatCPInfo();
  +            case CONSTANT_Float:
  +                cpInfo = new FloatCPInfo();
   
  -            break;
  +                break;
   
  -        case CONSTANT_Long:
  -            cpInfo = new LongCPInfo();
  +            case CONSTANT_Long:
  +                cpInfo = new LongCPInfo();
   
  -            break;
  +                break;
   
  -        case CONSTANT_Double:
  -            cpInfo = new DoubleCPInfo();
  +            case CONSTANT_Double:
  +                cpInfo = new DoubleCPInfo();
   
  -            break;
  +                break;
   
  -        case CONSTANT_Class:
  -            cpInfo = new ClassCPInfo();
  +            case CONSTANT_Class:
  +                cpInfo = new ClassCPInfo();
   
  -            break;
  +                break;
   
  -        case CONSTANT_String:
  -            cpInfo = new StringCPInfo();
  +            case CONSTANT_String:
  +                cpInfo = new StringCPInfo();
   
  -            break;
  +                break;
   
  -        case CONSTANT_FieldRef:
  -            cpInfo = new FieldRefCPInfo();
  +            case CONSTANT_FieldRef:
  +                cpInfo = new FieldRefCPInfo();
   
  -            break;
  +                break;
   
  -        case CONSTANT_MethodRef:
  -            cpInfo = new MethodRefCPInfo();
  +            case CONSTANT_MethodRef:
  +                cpInfo = new MethodRefCPInfo();
   
  -            break;
  +                break;
   
  -        case CONSTANT_InterfaceMethodRef:
  -            cpInfo = new InterfaceMethodRefCPInfo();
  +            case CONSTANT_InterfaceMethodRef:
  +                cpInfo = new InterfaceMethodRefCPInfo();
   
  -            break;
  +                break;
   
  -        case CONSTANT_NameAndType:
  -            cpInfo = new NameAndTypeCPInfo();
  +            case CONSTANT_NameAndType:
  +                cpInfo = new NameAndTypeCPInfo();
   
  -            break;
  +                break;
   
  -        default:
  -            throw new ClassFormatError("Invalid Constant Pool entry Type " + cpTag);
  +            default:
  +                throw new ClassFormatError("Invalid Constant Pool entry Type " + cpTag);
           }
   
           cpInfo.read(cpStream);
   
           return cpInfo;
  -    } 
  +    }
   
       /**
        * Indicates whether this entry has been resolved.
  -     * 
  +     *
        * In general a constant pool entry can reference another constant
        * pool entry by its index value. Resolution involves replacing this
        * index value with the constant pool entry at that index.
  -     * 
  +     *
        * @return true if this entry has been resolved.
        */
       public boolean isResolved() {
           return resolved;
  -    } 
  +    }
   
       /**
        * Resolve this constant pool entry with respect to its dependents in
        * the constant pool.
  -     * 
  +     *
        * @param constantPool the constant pool of which this entry is a member
        * and against which this entry is to be resolved.
        */
       public void resolve(ConstantPool constantPool) {
           resolved = true;
  -    } 
  +    }
   
       /**
        * read a constant pool entry from a class stream.
  -     * 
  +     *
        * @param cpStream the DataInputStream which contains the constant pool entry to be read.
  -     * 
  +     *
        * @throws IOException if there is a problem reading the entry from the stream.
        */
       public abstract void read(DataInputStream cpStream) throws IOException;
   
       /**
        * Get the Entry's type tag.
  -     * 
  +     *
        * @return The Tag value of this entry
        */
       public int getTag() {
           return tag;
  -    } 
  +    }
   
       /**
        * Get the number of Constant Pool Entry slots within the constant pool occupied by this entry.
  -     * 
  +     *
        * @return the number of slots used.
  -     * 
  +     *
        */
       public final int getNumEntries() {
           return numEntries;
  -    } 
  +    }
   
   }
   
  
  
  
  1.4       +12 -12    jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/DoubleCPInfo.java
  
  Index: DoubleCPInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/DoubleCPInfo.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DoubleCPInfo.java	28 Oct 2001 21:30:19 -0000	1.3
  +++ DoubleCPInfo.java	8 Jan 2002 23:47:59 -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 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -9,7 +9,7 @@
    * are met:
    *
    * 1. Redistributions of source code must retain the above copyright
  - *    notice, this list of conditions and the following disclaimer. 
  + *    notice, this list of conditions and the following disclaimer.
    *
    * 2. Redistributions in binary form must reproduce the above copyright
    *    notice, this list of conditions and the following disclaimer in
  @@ -17,15 +17,15 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:  
  - *       "This product includes software developed by the 
  + *    any, must include the following acknowlegement:
  + *       "This product includes software developed by the
    *        Apache Software Foundation (http://www.apache.org/)."
    *    Alternately, this acknowlegement may appear in the software itself,
    *    if and wherever such third-party acknowlegements normally appear.
    *
    * 4. The names "The Jakarta Project", "Ant", and "Apache Software
    *    Foundation" must not be used to endorse or promote products derived
  - *    from this software without prior written permission. For written 
  + *    from this software without prior written permission. For written
    *    permission, please contact apache@apache.org.
    *
    * 5. Products derived from this software may not be called "Apache"
  @@ -53,13 +53,13 @@
    */
   package org.apache.tools.ant.taskdefs.optional.depend.constantpool;
   
  -import java.io.IOException;
   import java.io.DataInputStream;
  +import java.io.IOException;
   
   
   /**
    * The constant pool entry subclass used to represent double constant values.
  - * 
  + *
    * @author Conor MacNeill
    */
   public class DoubleCPInfo extends ConstantCPInfo {
  @@ -69,23 +69,23 @@
   
       /**
        * read a constant pool entry from a class stream.
  -     * 
  +     *
        * @param cpStream the DataInputStream which contains the constant pool entry to be read.
  -     * 
  +     *
        * @throws IOException if there is a problem reading the entry from the stream.
        */
       public void read(DataInputStream cpStream) throws IOException {
           setValue(new Double(cpStream.readDouble()));
  -    } 
  +    }
   
       /**
        * Print a readable version of the constant pool entry.
  -     * 
  +     *
        * @return the string representation of this constant pool entry.
        */
       public String toString() {
           return "Double Constant Pool Entry: " + getValue();
  -    } 
  +    }
   
   }
   
  
  
  
  1.4       +21 -21    jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/FieldRefCPInfo.java
  
  Index: FieldRefCPInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/FieldRefCPInfo.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- FieldRefCPInfo.java	28 Oct 2001 21:30:19 -0000	1.3
  +++ FieldRefCPInfo.java	8 Jan 2002 23:47:59 -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 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -9,7 +9,7 @@
    * are met:
    *
    * 1. Redistributions of source code must retain the above copyright
  - *    notice, this list of conditions and the following disclaimer. 
  + *    notice, this list of conditions and the following disclaimer.
    *
    * 2. Redistributions in binary form must reproduce the above copyright
    *    notice, this list of conditions and the following disclaimer in
  @@ -17,15 +17,15 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:  
  - *       "This product includes software developed by the 
  + *    any, must include the following acknowlegement:
  + *       "This product includes software developed by the
    *        Apache Software Foundation (http://www.apache.org/)."
    *    Alternately, this acknowlegement may appear in the software itself,
    *    if and wherever such third-party acknowlegements normally appear.
    *
    * 4. The names "The Jakarta Project", "Ant", and "Apache Software
    *    Foundation" must not be used to endorse or promote products derived
  - *    from this software without prior written permission. For written 
  + *    from this software without prior written permission. For written
    *    permission, please contact apache@apache.org.
    *
    * 5. Products derived from this software may not be called "Apache"
  @@ -53,25 +53,25 @@
    */
   package org.apache.tools.ant.taskdefs.optional.depend.constantpool;
   
  -import java.io.IOException;
   import java.io.DataInputStream;
  +import java.io.IOException;
   
   
   /**
    * A FieldRef CP Info
  - * 
  + *
    * @author Conor MacNeill
    */
   public class FieldRefCPInfo extends ConstantPoolEntry {
       private String fieldClassName;
       private String fieldName;
       private String fieldType;
  -    private int    classIndex;
  -    private int    nameAndTypeIndex;
  +    private int classIndex;
  +    private int nameAndTypeIndex;
   
       /**
        * Constructor.
  -     * 
  +     *
        */
       public FieldRefCPInfo() {
           super(CONSTANT_FieldRef, 1);
  @@ -79,20 +79,20 @@
   
       /**
        * read a constant pool entry from a class stream.
  -     * 
  +     *
        * @param cpStream the DataInputStream which contains the constant pool entry to be read.
  -     * 
  +     *
        * @throws IOException if there is a problem reading the entry from the stream.
        */
       public void read(DataInputStream cpStream) throws IOException {
           classIndex = cpStream.readUnsignedShort();
           nameAndTypeIndex = cpStream.readUnsignedShort();
  -    } 
  +    }
   
       /**
        * Resolve this constant pool entry with respect to its dependents in
        * the constant pool.
  -     * 
  +     *
        * @param constantPool the constant pool of which this entry is a member
        * and against which this entry is to be resolved.
        */
  @@ -111,11 +111,11 @@
           fieldType = nt.getType();
   
           super.resolve(constantPool);
  -    } 
  +    }
   
       /**
        * Print a readable version of the constant pool entry.
  -     * 
  +     *
        * @return the string representation of this constant pool entry.
        */
       public String toString() {
  @@ -125,22 +125,22 @@
               value = "Field : Class = " + fieldClassName + ", name = " + fieldName + ", type = " + fieldType;
           } else {
               value = "Field : Class index = " + classIndex + ", name and type index = " + nameAndTypeIndex;
  -        } 
  +        }
   
           return value;
  -    } 
  +    }
   
       public String getFieldClassName() {
           return fieldClassName;
  -    } 
  +    }
   
       public String getFieldName() {
           return fieldName;
  -    } 
  +    }
   
       public String getFieldType() {
           return fieldType;
  -    } 
  +    }
   
   }
   
  
  
  
  1.4       +13 -13    jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/FloatCPInfo.java
  
  Index: FloatCPInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/FloatCPInfo.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- FloatCPInfo.java	28 Oct 2001 21:30:19 -0000	1.3
  +++ FloatCPInfo.java	8 Jan 2002 23:47:59 -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 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -9,7 +9,7 @@
    * are met:
    *
    * 1. Redistributions of source code must retain the above copyright
  - *    notice, this list of conditions and the following disclaimer. 
  + *    notice, this list of conditions and the following disclaimer.
    *
    * 2. Redistributions in binary form must reproduce the above copyright
    *    notice, this list of conditions and the following disclaimer in
  @@ -17,15 +17,15 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:  
  - *       "This product includes software developed by the 
  + *    any, must include the following acknowlegement:
  + *       "This product includes software developed by the
    *        Apache Software Foundation (http://www.apache.org/)."
    *    Alternately, this acknowlegement may appear in the software itself,
    *    if and wherever such third-party acknowlegements normally appear.
    *
    * 4. The names "The Jakarta Project", "Ant", and "Apache Software
    *    Foundation" must not be used to endorse or promote products derived
  - *    from this software without prior written permission. For written 
  + *    from this software without prior written permission. For written
    *    permission, please contact apache@apache.org.
    *
    * 5. Products derived from this software may not be called "Apache"
  @@ -53,19 +53,19 @@
    */
   package org.apache.tools.ant.taskdefs.optional.depend.constantpool;
   
  -import java.io.IOException;
   import java.io.DataInputStream;
  +import java.io.IOException;
   
   /**
    * A Float CP Info
  - * 
  + *
    * @author Conor MacNeill
    */
   public class FloatCPInfo extends ConstantCPInfo {
   
       /**
        * Constructor.
  -     * 
  +     *
        */
       public FloatCPInfo() {
           super(CONSTANT_Float, 1);
  @@ -73,23 +73,23 @@
   
       /**
        * read a constant pool entry from a class stream.
  -     * 
  +     *
        * @param cpStream the DataInputStream which contains the constant pool entry to be read.
  -     * 
  +     *
        * @throws IOException if there is a problem reading the entry from the stream.
        */
       public void read(DataInputStream cpStream) throws IOException {
           setValue(new Float(cpStream.readFloat()));
  -    } 
  +    }
   
       /**
        * Print a readable version of the constant pool entry.
  -     * 
  +     *
        * @return the string representation of this constant pool entry.
        */
       public String toString() {
           return "Float Constant Pool Entry: " + getValue();
  -    } 
  +    }
   
   }
   
  
  
  
  1.4       +13 -13    jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/IntegerCPInfo.java
  
  Index: IntegerCPInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/IntegerCPInfo.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- IntegerCPInfo.java	28 Oct 2001 21:30:19 -0000	1.3
  +++ IntegerCPInfo.java	8 Jan 2002 23:47:59 -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 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -9,7 +9,7 @@
    * are met:
    *
    * 1. Redistributions of source code must retain the above copyright
  - *    notice, this list of conditions and the following disclaimer. 
  + *    notice, this list of conditions and the following disclaimer.
    *
    * 2. Redistributions in binary form must reproduce the above copyright
    *    notice, this list of conditions and the following disclaimer in
  @@ -17,15 +17,15 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:  
  - *       "This product includes software developed by the 
  + *    any, must include the following acknowlegement:
  + *       "This product includes software developed by the
    *        Apache Software Foundation (http://www.apache.org/)."
    *    Alternately, this acknowlegement may appear in the software itself,
    *    if and wherever such third-party acknowlegements normally appear.
    *
    * 4. The names "The Jakarta Project", "Ant", and "Apache Software
    *    Foundation" must not be used to endorse or promote products derived
  - *    from this software without prior written permission. For written 
  + *    from this software without prior written permission. For written
    *    permission, please contact apache@apache.org.
    *
    * 5. Products derived from this software may not be called "Apache"
  @@ -53,19 +53,19 @@
    */
   package org.apache.tools.ant.taskdefs.optional.depend.constantpool;
   
  -import java.io.IOException;
   import java.io.DataInputStream;
  +import java.io.IOException;
   
   /**
    * An Integer CP Info
  - * 
  + *
    * @author Conor MacNeill
    */
   public class IntegerCPInfo extends ConstantCPInfo {
   
       /**
        * Constructor.
  -     * 
  +     *
        */
       public IntegerCPInfo() {
           super(CONSTANT_Integer, 1);
  @@ -73,23 +73,23 @@
   
       /**
        * read a constant pool entry from a class stream.
  -     * 
  +     *
        * @param cpStream the DataInputStream which contains the constant pool entry to be read.
  -     * 
  +     *
        * @throws IOException if there is a problem reading the entry from the stream.
        */
       public void read(DataInputStream cpStream) throws IOException {
           setValue(new Integer(cpStream.readInt()));
  -    } 
  +    }
   
       /**
        * Print a readable version of the constant pool entry.
  -     * 
  +     *
        * @return the string representation of this constant pool entry.
        */
       public String toString() {
           return "Integer Constant Pool Entry: " + getValue();
  -    } 
  +    }
   
   }
   
  
  
  
  1.4       +23 -23    jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/InterfaceMethodRefCPInfo.java
  
  Index: InterfaceMethodRefCPInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/InterfaceMethodRefCPInfo.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- InterfaceMethodRefCPInfo.java	28 Oct 2001 21:30:19 -0000	1.3
  +++ InterfaceMethodRefCPInfo.java	8 Jan 2002 23:47:59 -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 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -9,7 +9,7 @@
    * are met:
    *
    * 1. Redistributions of source code must retain the above copyright
  - *    notice, this list of conditions and the following disclaimer. 
  + *    notice, this list of conditions and the following disclaimer.
    *
    * 2. Redistributions in binary form must reproduce the above copyright
    *    notice, this list of conditions and the following disclaimer in
  @@ -17,15 +17,15 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:  
  - *       "This product includes software developed by the 
  + *    any, must include the following acknowlegement:
  + *       "This product includes software developed by the
    *        Apache Software Foundation (http://www.apache.org/)."
    *    Alternately, this acknowlegement may appear in the software itself,
    *    if and wherever such third-party acknowlegements normally appear.
    *
    * 4. The names "The Jakarta Project", "Ant", and "Apache Software
    *    Foundation" must not be used to endorse or promote products derived
  - *    from this software without prior written permission. For written 
  + *    from this software without prior written permission. For written
    *    permission, please contact apache@apache.org.
    *
    * 5. Products derived from this software may not be called "Apache"
  @@ -53,26 +53,26 @@
    */
   package org.apache.tools.ant.taskdefs.optional.depend.constantpool;
   
  -import java.io.IOException;
   import java.io.DataInputStream;
  +import java.io.IOException;
   
   
   /**
    * A InterfaceMethodRef CP Info
  - * 
  - * 
  + *
  + *
    * @author Conor MacNeill
    */
   public class InterfaceMethodRefCPInfo extends ConstantPoolEntry {
       private String interfaceMethodClassName;
       private String interfaceMethodName;
       private String interfaceMethodType;
  -    private int    classIndex;
  -    private int    nameAndTypeIndex;
  +    private int classIndex;
  +    private int nameAndTypeIndex;
   
       /**
        * Constructor.
  -     * 
  +     *
        */
       public InterfaceMethodRefCPInfo() {
           super(CONSTANT_InterfaceMethodRef, 1);
  @@ -80,20 +80,20 @@
   
       /**
        * read a constant pool entry from a class stream.
  -     * 
  +     *
        * @param cpStream the DataInputStream which contains the constant pool entry to be read.
  -     * 
  +     *
        * @throws IOException if there is a problem reading the entry from the stream.
        */
       public void read(DataInputStream cpStream) throws IOException {
           classIndex = cpStream.readUnsignedShort();
           nameAndTypeIndex = cpStream.readUnsignedShort();
  -    } 
  +    }
   
       /**
        * Resolve this constant pool entry with respect to its dependents in
        * the constant pool.
  -     * 
  +     *
        * @param constantPool the constant pool of which this entry is a member
        * and against which this entry is to be resolved.
        */
  @@ -112,37 +112,37 @@
           interfaceMethodType = nt.getType();
   
           super.resolve(constantPool);
  -    } 
  +    }
   
       /**
        * Print a readable version of the constant pool entry.
  -     * 
  +     *
        * @return the string representation of this constant pool entry.
        */
       public String toString() {
           String value;
   
           if (isResolved()) {
  -            value = "InterfaceMethod : Class = " + interfaceMethodClassName + ", name = " + interfaceMethodName + ", type = " 
  +            value = "InterfaceMethod : Class = " + interfaceMethodClassName + ", name = " + interfaceMethodName + ", type = "
                       + interfaceMethodType;
           } else {
               value = "InterfaceMethod : Class index = " + classIndex + ", name and type index = " + nameAndTypeIndex;
  -        } 
  +        }
   
           return value;
  -    } 
  +    }
   
       public String getInterfaceMethodClassName() {
           return interfaceMethodClassName;
  -    } 
  +    }
   
       public String getInterfaceMethodName() {
           return interfaceMethodName;
  -    } 
  +    }
   
       public String getInterfaceMethodType() {
           return interfaceMethodType;
  -    } 
  +    }
   
   }
   
  
  
  
  1.4       +13 -13    jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/LongCPInfo.java
  
  Index: LongCPInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/LongCPInfo.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- LongCPInfo.java	28 Oct 2001 21:30:19 -0000	1.3
  +++ LongCPInfo.java	8 Jan 2002 23:47:59 -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 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -9,7 +9,7 @@
    * are met:
    *
    * 1. Redistributions of source code must retain the above copyright
  - *    notice, this list of conditions and the following disclaimer. 
  + *    notice, this list of conditions and the following disclaimer.
    *
    * 2. Redistributions in binary form must reproduce the above copyright
    *    notice, this list of conditions and the following disclaimer in
  @@ -17,15 +17,15 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:  
  - *       "This product includes software developed by the 
  + *    any, must include the following acknowlegement:
  + *       "This product includes software developed by the
    *        Apache Software Foundation (http://www.apache.org/)."
    *    Alternately, this acknowlegement may appear in the software itself,
    *    if and wherever such third-party acknowlegements normally appear.
    *
    * 4. The names "The Jakarta Project", "Ant", and "Apache Software
    *    Foundation" must not be used to endorse or promote products derived
  - *    from this software without prior written permission. For written 
  + *    from this software without prior written permission. For written
    *    permission, please contact apache@apache.org.
    *
    * 5. Products derived from this software may not be called "Apache"
  @@ -53,19 +53,19 @@
    */
   package org.apache.tools.ant.taskdefs.optional.depend.constantpool;
   
  -import java.io.IOException;
   import java.io.DataInputStream;
  +import java.io.IOException;
   
   /**
    * A Long CP Info
  - * 
  + *
    * @author Conor MacNeill
    */
   public class LongCPInfo extends ConstantCPInfo {
   
       /**
        * Constructor.
  -     * 
  +     *
        */
       public LongCPInfo() {
           super(CONSTANT_Long, 2);
  @@ -73,23 +73,23 @@
   
       /**
        * read a constant pool entry from a class stream.
  -     * 
  +     *
        * @param cpStream the DataInputStream which contains the constant pool entry to be read.
  -     * 
  +     *
        * @throws IOException if there is a problem reading the entry from the stream.
        */
       public void read(DataInputStream cpStream) throws IOException {
           setValue(new Long(cpStream.readLong()));
  -    } 
  +    }
   
       /**
        * Print a readable version of the constant pool entry.
  -     * 
  +     *
        * @return the string representation of this constant pool entry.
        */
       public String toString() {
           return "Long Constant Pool Entry: " + getValue();
  -    } 
  +    }
   
   }
   
  
  
  
  1.4       +21 -21    jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/MethodRefCPInfo.java
  
  Index: MethodRefCPInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/MethodRefCPInfo.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- MethodRefCPInfo.java	28 Oct 2001 21:30:19 -0000	1.3
  +++ MethodRefCPInfo.java	8 Jan 2002 23:47:59 -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 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -9,7 +9,7 @@
    * are met:
    *
    * 1. Redistributions of source code must retain the above copyright
  - *    notice, this list of conditions and the following disclaimer. 
  + *    notice, this list of conditions and the following disclaimer.
    *
    * 2. Redistributions in binary form must reproduce the above copyright
    *    notice, this list of conditions and the following disclaimer in
  @@ -17,15 +17,15 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:  
  - *       "This product includes software developed by the 
  + *    any, must include the following acknowlegement:
  + *       "This product includes software developed by the
    *        Apache Software Foundation (http://www.apache.org/)."
    *    Alternately, this acknowlegement may appear in the software itself,
    *    if and wherever such third-party acknowlegements normally appear.
    *
    * 4. The names "The Jakarta Project", "Ant", and "Apache Software
    *    Foundation" must not be used to endorse or promote products derived
  - *    from this software without prior written permission. For written 
  + *    from this software without prior written permission. For written
    *    permission, please contact apache@apache.org.
    *
    * 5. Products derived from this software may not be called "Apache"
  @@ -53,25 +53,25 @@
    */
   package org.apache.tools.ant.taskdefs.optional.depend.constantpool;
   
  -import java.io.IOException;
   import java.io.DataInputStream;
  +import java.io.IOException;
   
   
   /**
    * A MethodRef CP Info
  - * 
  + *
    * @author Conor MacNeill
    */
   public class MethodRefCPInfo extends ConstantPoolEntry {
       private String methodClassName;
       private String methodName;
       private String methodType;
  -    private int    classIndex;
  -    private int    nameAndTypeIndex;
  +    private int classIndex;
  +    private int nameAndTypeIndex;
   
       /**
        * Constructor.
  -     * 
  +     *
        */
       public MethodRefCPInfo() {
           super(CONSTANT_MethodRef, 1);
  @@ -79,19 +79,19 @@
   
       /**
        * read a constant pool entry from a class stream.
  -     * 
  +     *
        * @param cpStream the DataInputStream which contains the constant pool entry to be read.
  -     * 
  +     *
        * @throws IOException if there is a problem reading the entry from the stream.
        */
       public void read(DataInputStream cpStream) throws IOException {
           classIndex = cpStream.readUnsignedShort();
           nameAndTypeIndex = cpStream.readUnsignedShort();
  -    } 
  +    }
   
       /**
        * Print a readable version of the constant pool entry.
  -     * 
  +     *
        * @return the string representation of this constant pool entry.
        */
       public String toString() {
  @@ -101,15 +101,15 @@
               value = "Method : Class = " + methodClassName + ", name = " + methodName + ", type = " + methodType;
           } else {
               value = "Method : Class index = " + classIndex + ", name and type index = " + nameAndTypeIndex;
  -        } 
  +        }
   
           return value;
  -    } 
  +    }
   
       /**
        * Resolve this constant pool entry with respect to its dependents in
        * the constant pool.
  -     * 
  +     *
        * @param constantPool the constant pool of which this entry is a member
        * and against which this entry is to be resolved.
        */
  @@ -128,19 +128,19 @@
           methodType = nt.getType();
   
           super.resolve(constantPool);
  -    } 
  +    }
   
       public String getMethodClassName() {
           return methodClassName;
  -    } 
  +    }
   
       public String getMethodName() {
           return methodName;
  -    } 
  +    }
   
       public String getMethodType() {
           return methodType;
  -    } 
  +    }
   
   }
   
  
  
  
  1.4       +20 -20    jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/NameAndTypeCPInfo.java
  
  Index: NameAndTypeCPInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/NameAndTypeCPInfo.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- NameAndTypeCPInfo.java	28 Oct 2001 21:30:19 -0000	1.3
  +++ NameAndTypeCPInfo.java	8 Jan 2002 23:47:59 -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 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -9,7 +9,7 @@
    * are met:
    *
    * 1. Redistributions of source code must retain the above copyright
  - *    notice, this list of conditions and the following disclaimer. 
  + *    notice, this list of conditions and the following disclaimer.
    *
    * 2. Redistributions in binary form must reproduce the above copyright
    *    notice, this list of conditions and the following disclaimer in
  @@ -17,15 +17,15 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:  
  - *       "This product includes software developed by the 
  + *    any, must include the following acknowlegement:
  + *       "This product includes software developed by the
    *        Apache Software Foundation (http://www.apache.org/)."
    *    Alternately, this acknowlegement may appear in the software itself,
    *    if and wherever such third-party acknowlegements normally appear.
    *
    * 4. The names "The Jakarta Project", "Ant", and "Apache Software
    *    Foundation" must not be used to endorse or promote products derived
  - *    from this software without prior written permission. For written 
  + *    from this software without prior written permission. For written
    *    permission, please contact apache@apache.org.
    *
    * 5. Products derived from this software may not be called "Apache"
  @@ -53,20 +53,20 @@
    */
   package org.apache.tools.ant.taskdefs.optional.depend.constantpool;
   
  -import java.io.IOException;
   import java.io.DataInputStream;
  +import java.io.IOException;
   
   
   /**
    * A NameAndType CP Info
  - * 
  + *
    * @author Conor MacNeill
    */
   public class NameAndTypeCPInfo extends ConstantPoolEntry {
   
       /**
        * Constructor.
  -     * 
  +     *
        */
       public NameAndTypeCPInfo() {
           super(CONSTANT_NameAndType, 1);
  @@ -74,19 +74,19 @@
   
       /**
        * read a constant pool entry from a class stream.
  -     * 
  +     *
        * @param cpStream the DataInputStream which contains the constant pool entry to be read.
  -     * 
  +     *
        * @throws IOException if there is a problem reading the entry from the stream.
        */
       public void read(DataInputStream cpStream) throws IOException {
           nameIndex = cpStream.readUnsignedShort();
           descriptorIndex = cpStream.readUnsignedShort();
  -    } 
  +    }
   
       /**
        * Print a readable version of the constant pool entry.
  -     * 
  +     *
        * @return the string representation of this constant pool entry.
        */
       public String toString() {
  @@ -96,15 +96,15 @@
               value = "Name = " + name + ", type = " + type;
           } else {
               value = "Name index = " + nameIndex + ", descriptor index = " + descriptorIndex;
  -        } 
  +        }
   
           return value;
  -    } 
  +    }
   
       /**
        * Resolve this constant pool entry with respect to its dependents in
        * the constant pool.
  -     * 
  +     *
        * @param constantPool the constant pool of which this entry is a member
        * and against which this entry is to be resolved.
        */
  @@ -113,19 +113,19 @@
           type = ((Utf8CPInfo) constantPool.getEntry(descriptorIndex)).getValue();
   
           super.resolve(constantPool);
  -    } 
  +    }
   
       public String getName() {
           return name;
  -    } 
  +    }
   
       public String getType() {
           return type;
  -    } 
  +    }
   
       private String name;
       private String type;
  -    private int    nameIndex;
  -    private int    descriptorIndex;
  +    private int nameIndex;
  +    private int descriptorIndex;
   }
   
  
  
  
  1.4       +16 -16    jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/StringCPInfo.java
  
  Index: StringCPInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/StringCPInfo.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- StringCPInfo.java	28 Oct 2001 21:30:19 -0000	1.3
  +++ StringCPInfo.java	8 Jan 2002 23:47:59 -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 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -9,7 +9,7 @@
    * are met:
    *
    * 1. Redistributions of source code must retain the above copyright
  - *    notice, this list of conditions and the following disclaimer. 
  + *    notice, this list of conditions and the following disclaimer.
    *
    * 2. Redistributions in binary form must reproduce the above copyright
    *    notice, this list of conditions and the following disclaimer in
  @@ -17,15 +17,15 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:  
  - *       "This product includes software developed by the 
  + *    any, must include the following acknowlegement:
  + *       "This product includes software developed by the
    *        Apache Software Foundation (http://www.apache.org/)."
    *    Alternately, this acknowlegement may appear in the software itself,
    *    if and wherever such third-party acknowlegements normally appear.
    *
    * 4. The names "The Jakarta Project", "Ant", and "Apache Software
    *    Foundation" must not be used to endorse or promote products derived
  - *    from this software without prior written permission. For written 
  + *    from this software without prior written permission. For written
    *    permission, please contact apache@apache.org.
    *
    * 5. Products derived from this software may not be called "Apache"
  @@ -53,23 +53,23 @@
    */
   package org.apache.tools.ant.taskdefs.optional.depend.constantpool;
   
  -import java.io.IOException;
   import java.io.DataInputStream;
  +import java.io.IOException;
   
   
   /**
    * A String Constant Pool Entry.
  - * 
  + *
    * The String info contains an index into the constant pool where
    * a UTF8 string is stored.
  - * 
  + *
    * @author Conor MacNeill
    */
   public class StringCPInfo extends ConstantCPInfo {
   
       /**
        * Constructor.
  -     * 
  +     *
        */
       public StringCPInfo() {
           super(CONSTANT_String, 1);
  @@ -77,37 +77,37 @@
   
       /**
        * read a constant pool entry from a class stream.
  -     * 
  +     *
        * @param cpStream the DataInputStream which contains the constant pool entry to be read.
  -     * 
  +     *
        * @throws IOException if there is a problem reading the entry from the stream.
        */
       public void read(DataInputStream cpStream) throws IOException {
           index = cpStream.readUnsignedShort();
   
           setValue("unresolved");
  -    } 
  +    }
   
       /**
        * Print a readable version of the constant pool entry.
  -     * 
  +     *
        * @return the string representation of this constant pool entry.
        */
       public String toString() {
           return "String Constant Pool Entry for " + getValue() + "[" + index + "]";
  -    } 
  +    }
   
       /**
        * Resolve this constant pool entry with respect to its dependents in
        * the constant pool.
  -     * 
  +     *
        * @param constantPool the constant pool of which this entry is a member
        * and against which this entry is to be resolved.
        */
       public void resolve(ConstantPool constantPool) {
           setValue(((Utf8CPInfo) constantPool.getEntry(index)).getValue());
           super.resolve(constantPool);
  -    } 
  +    }
   
       private int index;
   }
  
  
  
  1.4       +14 -14    jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/Utf8CPInfo.java
  
  Index: Utf8CPInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/Utf8CPInfo.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Utf8CPInfo.java	28 Oct 2001 21:30:19 -0000	1.3
  +++ Utf8CPInfo.java	8 Jan 2002 23:47:59 -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 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -9,7 +9,7 @@
    * are met:
    *
    * 1. Redistributions of source code must retain the above copyright
  - *    notice, this list of conditions and the following disclaimer. 
  + *    notice, this list of conditions and the following disclaimer.
    *
    * 2. Redistributions in binary form must reproduce the above copyright
    *    notice, this list of conditions and the following disclaimer in
  @@ -17,15 +17,15 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:  
  - *       "This product includes software developed by the 
  + *    any, must include the following acknowlegement:
  + *       "This product includes software developed by the
    *        Apache Software Foundation (http://www.apache.org/)."
    *    Alternately, this acknowlegement may appear in the software itself,
    *    if and wherever such third-party acknowlegements normally appear.
    *
    * 4. The names "The Jakarta Project", "Ant", and "Apache Software
    *    Foundation" must not be used to endorse or promote products derived
  - *    from this software without prior written permission. For written 
  + *    from this software without prior written permission. For written
    *    permission, please contact apache@apache.org.
    *
    * 5. Products derived from this software may not be called "Apache"
  @@ -53,13 +53,13 @@
    */
   package org.apache.tools.ant.taskdefs.optional.depend.constantpool;
   
  -import java.io.IOException;
   import java.io.DataInputStream;
  +import java.io.IOException;
   
   
   /**
    * A UTF8 Constant Pool Entry.
  - * 
  + *
    * @author Conor MacNeill
    */
   public class Utf8CPInfo extends ConstantPoolEntry {
  @@ -67,7 +67,7 @@
   
       /**
        * Constructor.
  -     * 
  +     *
        */
       public Utf8CPInfo() {
           super(CONSTANT_Utf8, 1);
  @@ -75,27 +75,27 @@
   
       /**
        * read a constant pool entry from a class stream.
  -     * 
  +     *
        * @param cpStream the DataInputStream which contains the constant pool entry to be read.
  -     * 
  +     *
        * @throws IOException if there is a problem reading the entry from the stream.
        */
       public void read(DataInputStream cpStream) throws IOException {
           value = cpStream.readUTF();
  -    } 
  +    }
   
       /**
        * Print a readable version of the constant pool entry.
  -     * 
  +     *
        * @return the string representation of this constant pool entry.
        */
       public String toString() {
           return "UTF8 Value = " + value;
  -    } 
  +    }
   
       public String getValue() {
           return value;
  -    } 
  +    }
   
   }
   
  
  
  

--
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