ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: jakarta-ant/proposal/myrmidon/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 Sun, 16 Dec 2001 00:37:20 GMT
donaldp     01/12/15 16:37:20

  Modified:    proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend
                        ClassFile.java ClassFileIterator.java
                        DirectoryIterator.java JarFileIterator.java
               proposal/myrmidon/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:
  BuildException -> TaskException
  
  Removed uneeded imports.
  
  Processed code through style formatter.
  
  Revision  Changes    Path
  1.2       +3 -3      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFile.java
  
  Index: ClassFile.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFile.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ClassFile.java	2001/12/15 12:06:25	1.1
  +++ ClassFile.java	2001/12/16 00:37:19	1.2
  @@ -6,6 +6,7 @@
    * the LICENSE file.
    */
   package org.apache.tools.ant.taskdefs.optional.depend;
  +
   import java.io.DataInputStream;
   import java.io.IOException;
   import java.io.InputStream;
  @@ -40,7 +41,6 @@
        */
       private ConstantPool constantPool;
   
  -
       /**
        * Get the classes which this class references.
        *
  @@ -57,7 +57,7 @@
   
               if( entry != null && entry.getTag() == ConstantPoolEntry.CONSTANT_Class
)
               {
  -                ClassCPInfo classEntry = ( ClassCPInfo )entry;
  +                ClassCPInfo classEntry = (ClassCPInfo)entry;
   
                   if( !classEntry.getClassName().equals( className ) )
                   {
  @@ -112,7 +112,7 @@
           int accessFlags = classStream.readUnsignedShort();
           int thisClassIndex = classStream.readUnsignedShort();
           int superClassIndex = classStream.readUnsignedShort();
  -        className = ( ( ClassCPInfo )constantPool.getEntry( thisClassIndex ) ).getClassName();
  +        className = ( (ClassCPInfo)constantPool.getEntry( thisClassIndex ) ).getClassName();
       }
   }
   
  
  
  
  1.2       +0 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFileIterator.java
  
  Index: ClassFileIterator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFileIterator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ClassFileIterator.java	2001/12/15 12:06:25	1.1
  +++ ClassFileIterator.java	2001/12/16 00:37:19	1.2
  @@ -7,7 +7,6 @@
    */
   package org.apache.tools.ant.taskdefs.optional.depend;
   
  -
   public interface ClassFileIterator
   {
   
  
  
  
  1.2       +4 -3      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/DirectoryIterator.java
  
  Index: DirectoryIterator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/DirectoryIterator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DirectoryIterator.java	2001/12/15 12:06:25	1.1
  +++ DirectoryIterator.java	2001/12/16 00:37:19	1.2
  @@ -6,6 +6,7 @@
    * the LICENSE file.
    */
   package org.apache.tools.ant.taskdefs.optional.depend;
  +
   import java.io.File;
   import java.io.FileInputStream;
   import java.io.IOException;
  @@ -101,7 +102,7 @@
               {
                   if( currentEnum.hasMoreElements() )
                   {
  -                    File element = ( File )currentEnum.nextElement();
  +                    File element = (File)currentEnum.nextElement();
   
                       if( element.isDirectory() )
                       {
  @@ -141,7 +142,7 @@
                       }
                       else
                       {
  -                        currentEnum = ( Enumeration )enumStack.pop();
  +                        currentEnum = (Enumeration)enumStack.pop();
                       }
                   }
               }
  @@ -174,7 +175,7 @@
   
               for( int i = 0; i < length; ++i )
               {
  -                files.addElement( new File( directory, filesInDir[i] ) );
  +                files.addElement( new File( directory, filesInDir[ i ] ) );
               }
           }
   
  
  
  
  1.2       +2 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/JarFileIterator.java
  
  Index: JarFileIterator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/JarFileIterator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JarFileIterator.java	2001/12/15 12:06:25	1.1
  +++ JarFileIterator.java	2001/12/16 00:37:19	1.2
  @@ -6,6 +6,7 @@
    * the LICENSE file.
    */
   package org.apache.tools.ant.taskdefs.optional.depend;
  +
   import java.io.ByteArrayOutputStream;
   import java.io.IOException;
   import java.io.InputStream;
  @@ -78,7 +79,7 @@
       private byte[] getEntryBytes( InputStream stream )
           throws IOException
       {
  -        byte[] buffer = new byte[8192];
  +        byte[] buffer = new byte[ 8192 ];
           ByteArrayOutputStream baos = new ByteArrayOutputStream( 2048 );
           int n;
   
  
  
  
  1.2       +2 -2      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ClassCPInfo.java
  
  Index: ClassCPInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ClassCPInfo.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ClassCPInfo.java	2001/12/15 12:06:26	1.1
  +++ ClassCPInfo.java	2001/12/16 00:37:19	1.2
  @@ -6,10 +6,10 @@
    * the LICENSE file.
    */
   package org.apache.tools.ant.taskdefs.optional.depend.constantpool;
  +
   import java.io.DataInputStream;
   import java.io.IOException;
   
  -
   /**
    * The constant pool entry which stores class information.
    *
  @@ -70,7 +70,7 @@
        */
       public void resolve( ConstantPool constantPool )
       {
  -        className = ( ( Utf8CPInfo )constantPool.getEntry( index ) ).getValue();
  +        className = ( (Utf8CPInfo)constantPool.getEntry( index ) ).getValue();
   
           super.resolve( constantPool );
       }
  
  
  
  1.2       +0 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantCPInfo.java
  
  Index: ConstantCPInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantCPInfo.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ConstantCPInfo.java	2001/12/15 12:06:26	1.1
  +++ ConstantCPInfo.java	2001/12/16 00:37:19	1.2
  @@ -7,7 +7,6 @@
    */
   package org.apache.tools.ant.taskdefs.optional.depend.constantpool;
   
  -
   /**
    * A Constant Pool entry which represents a constant value.
    *
  
  
  
  1.2       +17 -17    jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPool.java
  
  Index: ConstantPool.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPool.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ConstantPool.java	2001/12/15 12:06:26	1.1
  +++ ConstantPool.java	2001/12/16 00:37:19	1.2
  @@ -6,6 +6,7 @@
    * the LICENSE file.
    */
   package org.apache.tools.ant.taskdefs.optional.depend.constantpool;
  +
   import java.io.DataInputStream;
   import java.io.IOException;
   import java.util.Enumeration;
  @@ -67,7 +68,7 @@
   
               if( element instanceof ClassCPInfo )
               {
  -                ClassCPInfo classinfo = ( ClassCPInfo )element;
  +                ClassCPInfo classinfo = (ClassCPInfo)element;
   
                   if( classinfo.getClassName().equals( className ) )
                   {
  @@ -96,7 +97,7 @@
   
               if( element instanceof ConstantCPInfo )
               {
  -                ConstantCPInfo constantEntry = ( ConstantCPInfo )element;
  +                ConstantCPInfo constantEntry = (ConstantCPInfo)element;
   
                   if( constantEntry.getValue().equals( constantValue ) )
                   {
  @@ -108,7 +109,6 @@
           return index;
       }
   
  -
       /**
        * Get an constant pool entry at a particular index.
        *
  @@ -117,7 +117,7 @@
        */
       public ConstantPoolEntry getEntry( int index )
       {
  -        return ( ConstantPoolEntry )entries.elementAt( index );
  +        return (ConstantPoolEntry)entries.elementAt( index );
       }
   
       /**
  @@ -140,10 +140,10 @@
   
               if( element instanceof FieldRefCPInfo )
               {
  -                FieldRefCPInfo fieldRefEntry = ( FieldRefCPInfo )element;
  +                FieldRefCPInfo fieldRefEntry = (FieldRefCPInfo)element;
   
                   if( fieldRefEntry.getFieldClassName().equals( fieldClassName ) &&
fieldRefEntry.getFieldName().equals( fieldName )
  -                     && fieldRefEntry.getFieldType().equals( fieldType ) )
  +                    && fieldRefEntry.getFieldType().equals( fieldType ) )
                   {
                       index = i;
                   }
  @@ -175,11 +175,11 @@
   
               if( element instanceof InterfaceMethodRefCPInfo )
               {
  -                InterfaceMethodRefCPInfo interfaceMethodRefEntry = ( InterfaceMethodRefCPInfo
)element;
  +                InterfaceMethodRefCPInfo interfaceMethodRefEntry = (InterfaceMethodRefCPInfo)element;
   
                   if( interfaceMethodRefEntry.getInterfaceMethodClassName().equals( interfaceMethodClassName
)
  -                     && interfaceMethodRefEntry.getInterfaceMethodName().equals(
interfaceMethodName )
  -                     && interfaceMethodRefEntry.getInterfaceMethodType().equals(
interfaceMethodType ) )
  +                    && interfaceMethodRefEntry.getInterfaceMethodName().equals(
interfaceMethodName )
  +                    && interfaceMethodRefEntry.getInterfaceMethodType().equals(
interfaceMethodType ) )
                   {
                       index = i;
                   }
  @@ -209,10 +209,10 @@
   
               if( element instanceof MethodRefCPInfo )
               {
  -                MethodRefCPInfo methodRefEntry = ( MethodRefCPInfo )element;
  +                MethodRefCPInfo methodRefEntry = (MethodRefCPInfo)element;
   
                   if( methodRefEntry.getMethodClassName().equals( methodClassName )
  -                     && methodRefEntry.getMethodName().equals( methodName ) &&
methodRefEntry.getMethodType().equals( methodType ) )
  +                    && methodRefEntry.getMethodName().equals( methodName ) &&
methodRefEntry.getMethodType().equals( methodType ) )
                   {
                       index = i;
                   }
  @@ -240,7 +240,7 @@
   
               if( element instanceof NameAndTypeCPInfo )
               {
  -                NameAndTypeCPInfo nameAndTypeEntry = ( NameAndTypeCPInfo )element;
  +                NameAndTypeCPInfo nameAndTypeEntry = (NameAndTypeCPInfo)element;
   
                   if( nameAndTypeEntry.getName().equals( name ) && nameAndTypeEntry.getType().equals(
type ) )
                   {
  @@ -262,7 +262,7 @@
       public int getUTF8Entry( String value )
       {
           int index = -1;
  -        Integer indexInteger = ( Integer )utf8Indexes.get( value );
  +        Integer indexInteger = (Integer)utf8Indexes.get( value );
   
           if( indexInteger != null )
           {
  @@ -294,7 +294,7 @@
   
           if( entry instanceof Utf8CPInfo )
           {
  -            Utf8CPInfo utf8Info = ( Utf8CPInfo )entry;
  +            Utf8CPInfo utf8Info = (Utf8CPInfo)entry;
   
               utf8Indexes.put( utf8Info.getValue(), new Integer( index ) );
           }
  @@ -314,7 +314,7 @@
       {
           int numEntries = classStream.readUnsignedShort();
   
  -        for( int i = 1; i < numEntries;  )
  +        for( int i = 1; i < numEntries; )
           {
               ConstantPoolEntry nextEntry = ConstantPoolEntry.readEntry( classStream );
   
  @@ -331,9 +331,9 @@
        */
       public void resolve()
       {
  -        for( Enumeration i = entries.elements(); i.hasMoreElements();  )
  +        for( Enumeration i = entries.elements(); i.hasMoreElements(); )
           {
  -            ConstantPoolEntry poolInfo = ( ConstantPoolEntry )i.nextElement();
  +            ConstantPoolEntry poolInfo = (ConstantPoolEntry)i.nextElement();
   
               if( poolInfo != null && !poolInfo.isResolved() )
               {
  
  
  
  1.2       +47 -47    jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPoolEntry.java
  
  Index: ConstantPoolEntry.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPoolEntry.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ConstantPoolEntry.java	2001/12/15 12:06:26	1.1
  +++ ConstantPoolEntry.java	2001/12/16 00:37:19	1.2
  @@ -6,10 +6,10 @@
    * the LICENSE file.
    */
   package org.apache.tools.ant.taskdefs.optional.depend.constantpool;
  +
   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
  @@ -126,55 +126,55 @@
           ConstantPoolEntry cpInfo = null;
           int cpTag = cpStream.readUnsignedByte();
   
  -        switch ( cpTag )
  +        switch( cpTag )
           {
   
  -        case CONSTANT_Utf8:
  -            cpInfo = new Utf8CPInfo();
  +            case CONSTANT_Utf8:
  +                cpInfo = new Utf8CPInfo();
   
  -            break;
  -        case CONSTANT_Integer:
  -            cpInfo = new IntegerCPInfo();
  -
  -            break;
  -        case CONSTANT_Float:
  -            cpInfo = new FloatCPInfo();
  -
  -            break;
  -        case CONSTANT_Long:
  -            cpInfo = new LongCPInfo();
  -
  -            break;
  -        case CONSTANT_Double:
  -            cpInfo = new DoubleCPInfo();
  -
  -            break;
  -        case CONSTANT_Class:
  -            cpInfo = new ClassCPInfo();
  -
  -            break;
  -        case CONSTANT_String:
  -            cpInfo = new StringCPInfo();
  -
  -            break;
  -        case CONSTANT_FieldRef:
  -            cpInfo = new FieldRefCPInfo();
  -
  -            break;
  -        case CONSTANT_MethodRef:
  -            cpInfo = new MethodRefCPInfo();
  -
  -            break;
  -        case CONSTANT_InterfaceMethodRef:
  -            cpInfo = new InterfaceMethodRefCPInfo();
  -
  -            break;
  -        case CONSTANT_NameAndType:
  -            cpInfo = new NameAndTypeCPInfo();
  -
  -            break;
  -        default:
  -            throw new ClassFormatError( "Invalid Constant Pool entry Type " + cpTag );
  +                break;
  +            case CONSTANT_Integer:
  +                cpInfo = new IntegerCPInfo();
  +
  +                break;
  +            case CONSTANT_Float:
  +                cpInfo = new FloatCPInfo();
  +
  +                break;
  +            case CONSTANT_Long:
  +                cpInfo = new LongCPInfo();
  +
  +                break;
  +            case CONSTANT_Double:
  +                cpInfo = new DoubleCPInfo();
  +
  +                break;
  +            case CONSTANT_Class:
  +                cpInfo = new ClassCPInfo();
  +
  +                break;
  +            case CONSTANT_String:
  +                cpInfo = new StringCPInfo();
  +
  +                break;
  +            case CONSTANT_FieldRef:
  +                cpInfo = new FieldRefCPInfo();
  +
  +                break;
  +            case CONSTANT_MethodRef:
  +                cpInfo = new MethodRefCPInfo();
  +
  +                break;
  +            case CONSTANT_InterfaceMethodRef:
  +                cpInfo = new InterfaceMethodRefCPInfo();
  +
  +                break;
  +            case CONSTANT_NameAndType:
  +                cpInfo = new NameAndTypeCPInfo();
  +
  +                break;
  +            default:
  +                throw new ClassFormatError( "Invalid Constant Pool entry Type " + cpTag
);
           }
   
           cpInfo.read( cpStream );
  
  
  
  1.2       +1 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/DoubleCPInfo.java
  
  Index: DoubleCPInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/DoubleCPInfo.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DoubleCPInfo.java	2001/12/15 12:06:26	1.1
  +++ DoubleCPInfo.java	2001/12/16 00:37:19	1.2
  @@ -6,9 +6,9 @@
    * the LICENSE file.
    */
   package org.apache.tools.ant.taskdefs.optional.depend.constantpool;
  +
   import java.io.DataInputStream;
   import java.io.IOException;
  -
   
   /**
    * The constant pool entry subclass used to represent double constant values.
  
  
  
  1.2       +3 -3      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/FieldRefCPInfo.java
  
  Index: FieldRefCPInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/FieldRefCPInfo.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- FieldRefCPInfo.java	2001/12/15 12:06:26	1.1
  +++ FieldRefCPInfo.java	2001/12/16 00:37:19	1.2
  @@ -6,10 +6,10 @@
    * the LICENSE file.
    */
   package org.apache.tools.ant.taskdefs.optional.depend.constantpool;
  +
   import java.io.DataInputStream;
   import java.io.IOException;
   
  -
   /**
    * A FieldRef CP Info
    *
  @@ -70,13 +70,13 @@
        */
       public void resolve( ConstantPool constantPool )
       {
  -        ClassCPInfo fieldClass = ( ClassCPInfo )constantPool.getEntry( classIndex );
  +        ClassCPInfo fieldClass = (ClassCPInfo)constantPool.getEntry( classIndex );
   
           fieldClass.resolve( constantPool );
   
           fieldClassName = fieldClass.getClassName();
   
  -        NameAndTypeCPInfo nt = ( NameAndTypeCPInfo )constantPool.getEntry( nameAndTypeIndex
);
  +        NameAndTypeCPInfo nt = (NameAndTypeCPInfo)constantPool.getEntry( nameAndTypeIndex
);
   
           nt.resolve( constantPool );
   
  
  
  
  1.2       +1 -0      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/FloatCPInfo.java
  
  Index: FloatCPInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/FloatCPInfo.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- FloatCPInfo.java	2001/12/15 12:06:26	1.1
  +++ FloatCPInfo.java	2001/12/16 00:37:19	1.2
  @@ -6,6 +6,7 @@
    * the LICENSE file.
    */
   package org.apache.tools.ant.taskdefs.optional.depend.constantpool;
  +
   import java.io.DataInputStream;
   import java.io.IOException;
   
  
  
  
  1.2       +1 -0      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/IntegerCPInfo.java
  
  Index: IntegerCPInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/IntegerCPInfo.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- IntegerCPInfo.java	2001/12/15 12:06:26	1.1
  +++ IntegerCPInfo.java	2001/12/16 00:37:19	1.2
  @@ -6,6 +6,7 @@
    * the LICENSE file.
    */
   package org.apache.tools.ant.taskdefs.optional.depend.constantpool;
  +
   import java.io.DataInputStream;
   import java.io.IOException;
   
  
  
  
  1.2       +4 -4      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/InterfaceMethodRefCPInfo.java
  
  Index: InterfaceMethodRefCPInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/InterfaceMethodRefCPInfo.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- InterfaceMethodRefCPInfo.java	2001/12/15 12:06:26	1.1
  +++ InterfaceMethodRefCPInfo.java	2001/12/16 00:37:19	1.2
  @@ -6,10 +6,10 @@
    * the LICENSE file.
    */
   package org.apache.tools.ant.taskdefs.optional.depend.constantpool;
  +
   import java.io.DataInputStream;
   import java.io.IOException;
   
  -
   /**
    * A InterfaceMethodRef CP Info
    *
  @@ -70,13 +70,13 @@
        */
       public void resolve( ConstantPool constantPool )
       {
  -        ClassCPInfo interfaceMethodClass = ( ClassCPInfo )constantPool.getEntry( classIndex
);
  +        ClassCPInfo interfaceMethodClass = (ClassCPInfo)constantPool.getEntry( classIndex
);
   
           interfaceMethodClass.resolve( constantPool );
   
           interfaceMethodClassName = interfaceMethodClass.getClassName();
   
  -        NameAndTypeCPInfo nt = ( NameAndTypeCPInfo )constantPool.getEntry( nameAndTypeIndex
);
  +        NameAndTypeCPInfo nt = (NameAndTypeCPInfo)constantPool.getEntry( nameAndTypeIndex
);
   
           nt.resolve( constantPool );
   
  @@ -98,7 +98,7 @@
           if( isResolved() )
           {
               value = "InterfaceMethod : Class = " + interfaceMethodClassName + ", name =
" + interfaceMethodName + ", type = "
  -                 + interfaceMethodType;
  +                + interfaceMethodType;
           }
           else
           {
  
  
  
  1.2       +1 -0      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/LongCPInfo.java
  
  Index: LongCPInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/LongCPInfo.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- LongCPInfo.java	2001/12/15 12:06:26	1.1
  +++ LongCPInfo.java	2001/12/16 00:37:19	1.2
  @@ -6,6 +6,7 @@
    * the LICENSE file.
    */
   package org.apache.tools.ant.taskdefs.optional.depend.constantpool;
  +
   import java.io.DataInputStream;
   import java.io.IOException;
   
  
  
  
  1.2       +3 -3      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/MethodRefCPInfo.java
  
  Index: MethodRefCPInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/MethodRefCPInfo.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MethodRefCPInfo.java	2001/12/15 12:06:26	1.1
  +++ MethodRefCPInfo.java	2001/12/16 00:37:19	1.2
  @@ -6,10 +6,10 @@
    * the LICENSE file.
    */
   package org.apache.tools.ant.taskdefs.optional.depend.constantpool;
  +
   import java.io.DataInputStream;
   import java.io.IOException;
   
  -
   /**
    * A MethodRef CP Info
    *
  @@ -70,13 +70,13 @@
        */
       public void resolve( ConstantPool constantPool )
       {
  -        ClassCPInfo methodClass = ( ClassCPInfo )constantPool.getEntry( classIndex );
  +        ClassCPInfo methodClass = (ClassCPInfo)constantPool.getEntry( classIndex );
   
           methodClass.resolve( constantPool );
   
           methodClassName = methodClass.getClassName();
   
  -        NameAndTypeCPInfo nt = ( NameAndTypeCPInfo )constantPool.getEntry( nameAndTypeIndex
);
  +        NameAndTypeCPInfo nt = (NameAndTypeCPInfo)constantPool.getEntry( nameAndTypeIndex
);
   
           nt.resolve( constantPool );
   
  
  
  
  1.2       +3 -3      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/NameAndTypeCPInfo.java
  
  Index: NameAndTypeCPInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/NameAndTypeCPInfo.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- NameAndTypeCPInfo.java	2001/12/15 12:06:26	1.1
  +++ NameAndTypeCPInfo.java	2001/12/16 00:37:19	1.2
  @@ -6,10 +6,10 @@
    * the LICENSE file.
    */
   package org.apache.tools.ant.taskdefs.optional.depend.constantpool;
  +
   import java.io.DataInputStream;
   import java.io.IOException;
   
  -
   /**
    * A NameAndType CP Info
    *
  @@ -65,8 +65,8 @@
        */
       public void resolve( ConstantPool constantPool )
       {
  -        name = ( ( Utf8CPInfo )constantPool.getEntry( nameIndex ) ).getValue();
  -        type = ( ( Utf8CPInfo )constantPool.getEntry( descriptorIndex ) ).getValue();
  +        name = ( (Utf8CPInfo)constantPool.getEntry( nameIndex ) ).getValue();
  +        type = ( (Utf8CPInfo)constantPool.getEntry( descriptorIndex ) ).getValue();
   
           super.resolve( constantPool );
       }
  
  
  
  1.2       +2 -2      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/StringCPInfo.java
  
  Index: StringCPInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/StringCPInfo.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- StringCPInfo.java	2001/12/15 12:06:26	1.1
  +++ StringCPInfo.java	2001/12/16 00:37:19	1.2
  @@ -6,10 +6,10 @@
    * the LICENSE file.
    */
   package org.apache.tools.ant.taskdefs.optional.depend.constantpool;
  +
   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.
  @@ -54,7 +54,7 @@
        */
       public void resolve( ConstantPool constantPool )
       {
  -        setValue( ( ( Utf8CPInfo )constantPool.getEntry( index ) ).getValue() );
  +        setValue( ( (Utf8CPInfo)constantPool.getEntry( index ) ).getValue() );
           super.resolve( constantPool );
       }
   
  
  
  
  1.2       +1 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/Utf8CPInfo.java
  
  Index: Utf8CPInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/Utf8CPInfo.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Utf8CPInfo.java	2001/12/15 12:06:26	1.1
  +++ Utf8CPInfo.java	2001/12/16 00:37:19	1.2
  @@ -6,9 +6,9 @@
    * the LICENSE file.
    */
   package org.apache.tools.ant.taskdefs.optional.depend.constantpool;
  +
   import java.io.DataInputStream;
   import java.io.IOException;
  -
   
   /**
    * A UTF8 Constant Pool Entry.
  
  
  

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