You are viewing a plain text version of this content. The canonical link for it is here.
Posted to bcel-dev@jakarta.apache.org by sk...@apache.org on 2005/02/02 01:58:08 UTC

cvs commit: jakarta-bcel/src/java/org/apache/bcel/verifier/structurals Subroutines.java

skitching    2005/02/01 16:58:08

  Modified:    src/java/org/apache/bcel/classfile ConstantPool.java
                        InnerClasses.java LineNumberTable.java
                        PMGClass.java Signature.java StackMap.java
                        Utility.java
               src/java/org/apache/bcel/generic BranchInstruction.java
                        CHECKCAST.java ClassGen.java ConstantPoolGen.java
                        IfInstruction.java Instruction.java
                        InstructionList.java LocalVariableGen.java
                        Select.java TABLESWITCH.java
               src/java/org/apache/bcel/verifier/structurals
                        Subroutines.java
  Log:
  PR: 32980
  Submitted by: Dave Brosius
  
  Revision  Changes    Path
  1.9       +2 -2      jakarta-bcel/src/java/org/apache/bcel/classfile/ConstantPool.java
  
  Index: ConstantPool.java
  ===================================================================
  RCS file: /home/cvs/jakarta-bcel/src/java/org/apache/bcel/classfile/ConstantPool.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ConstantPool.java	15 Dec 2004 08:28:30 -0000	1.8
  +++ ConstantPool.java	2 Feb 2005 00:58:08 -0000	1.9
  @@ -91,7 +91,7 @@
     /**
      * Resolve constant to a string representation.
      *
  -   * @param  constant Constant to be printed
  +   * @param  c Constant to be printed
      * @return String representation
      */
     public String constantToString(Constant c)
  
  
  
  1.5       +1 -2      jakarta-bcel/src/java/org/apache/bcel/classfile/InnerClasses.java
  
  Index: InnerClasses.java
  ===================================================================
  RCS file: /home/cvs/jakarta-bcel/src/java/org/apache/bcel/classfile/InnerClasses.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- InnerClasses.java	15 Dec 2004 08:28:30 -0000	1.4
  +++ InnerClasses.java	2 Feb 2005 00:58:08 -0000	1.5
  @@ -48,7 +48,6 @@
      * @param length Content length in bytes
      * @param inner_classes array of inner classes attributes
      * @param constant_pool Array of constants
  -   * @param sourcefile_index Index in constant pool to CONSTANT_Utf8
      */
     public InnerClasses(int name_index, int length, 
   		      InnerClass[] inner_classes,
  
  
  
  1.6       +2 -2      jakarta-bcel/src/java/org/apache/bcel/classfile/LineNumberTable.java
  
  Index: LineNumberTable.java
  ===================================================================
  RCS file: /home/cvs/jakarta-bcel/src/java/org/apache/bcel/classfile/LineNumberTable.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- LineNumberTable.java	15 Dec 2004 08:28:30 -0000	1.5
  +++ LineNumberTable.java	2 Feb 2005 00:58:08 -0000	1.6
  @@ -62,8 +62,8 @@
      * @param name_index Index of name
      * @param length Content length in bytes
      * @param file Input stream
  -   * @throws IOException
      * @param constant_pool Array of constants
  +   * @throws IOException
      */
     LineNumberTable(int name_index, int length, DataInputStream file,
   		  ConstantPool constant_pool) throws IOException
  
  
  
  1.5       +3 -2      jakarta-bcel/src/java/org/apache/bcel/classfile/PMGClass.java
  
  Index: PMGClass.java
  ===================================================================
  RCS file: /home/cvs/jakarta-bcel/src/java/org/apache/bcel/classfile/PMGClass.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- PMGClass.java	15 Dec 2004 08:28:30 -0000	1.4
  +++ PMGClass.java	2 Feb 2005 00:58:08 -0000	1.5
  @@ -59,8 +59,9 @@
     /**
      * @param name_index Index in constant pool to CONSTANT_Utf8
      * @param length Content length in bytes
  +   * @param pmg_index index in constant pool for source file name
  +   * @param pmg_class_index Index in constant pool to CONSTANT_Utf8
      * @param constant_pool Array of constants
  -   * @param PMGClass_index Index in constant pool to CONSTANT_Utf8
      */
     public PMGClass(int name_index, int length, int pmg_index, int pmg_class_index,
   		  ConstantPool constant_pool)
  
  
  
  1.6       +3 -3      jakarta-bcel/src/java/org/apache/bcel/classfile/Signature.java
  
  Index: Signature.java
  ===================================================================
  RCS file: /home/cvs/jakarta-bcel/src/java/org/apache/bcel/classfile/Signature.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Signature.java	15 Dec 2004 08:28:30 -0000	1.5
  +++ Signature.java	2 Feb 2005 00:58:08 -0000	1.6
  @@ -56,8 +56,8 @@
     /**
      * @param name_index Index in constant pool to CONSTANT_Utf8
      * @param length Content length in bytes
  +   * @param signature_index Index in constant pool to CONSTANT_Utf8
      * @param constant_pool Array of constants
  -   * @param Signature_index Index in constant pool to CONSTANT_Utf8
      */
     public Signature(int name_index, int length, int signature_index,
   		  ConstantPool constant_pool)
  @@ -96,7 +96,7 @@
     public final int getSignatureIndex() { return signature_index; }    
   
     /**
  -   * @param Signature_index.
  +   * @param signature_index.
      */
     public final void setSignatureIndex(int signature_index) {
       this.signature_index = signature_index;
  
  
  
  1.5       +2 -2      jakarta-bcel/src/java/org/apache/bcel/classfile/StackMap.java
  
  Index: StackMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-bcel/src/java/org/apache/bcel/classfile/StackMap.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- StackMap.java	15 Dec 2004 08:28:30 -0000	1.4
  +++ StackMap.java	2 Feb 2005 00:58:08 -0000	1.5
  @@ -58,8 +58,8 @@
      * @param name_index Index of name
      * @param length Content length in bytes
      * @param file Input stream
  -   * @throws IOException
      * @param constant_pool Array of constants
  +   * @throws IOException
      */
     StackMap(int name_index, int length, DataInputStream file,
   	   ConstantPool constant_pool) throws IOException
  
  
  
  1.9       +3 -3      jakarta-bcel/src/java/org/apache/bcel/classfile/Utility.java
  
  Index: Utility.java
  ===================================================================
  RCS file: /home/cvs/jakarta-bcel/src/java/org/apache/bcel/classfile/Utility.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Utility.java	15 Dec 2004 08:28:30 -0000	1.8
  +++ Utility.java	2 Feb 2005 00:58:08 -0000	1.9
  @@ -729,7 +729,7 @@
      *
      * @param str String to permute
      * @param old String to be replaced
  -   * @param new Replacement string
  +   * @param new_ Replacement string
      * @return new String object
      */
     public static final String replace(String str, String old, String new_) {
  @@ -1198,7 +1198,7 @@
   
     /** Decode a string back to a byte array.
      *
  -   * @param bytes the byte array to convert
  +   * @param s the string to convert
      * @param uncompress use gzip to uncompress the stream of bytes
      */
     public static byte[] decode(String s, boolean uncompress) throws IOException {
  
  
  
  1.4       +2 -2      jakarta-bcel/src/java/org/apache/bcel/generic/BranchInstruction.java
  
  Index: BranchInstruction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-bcel/src/java/org/apache/bcel/generic/BranchInstruction.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- BranchInstruction.java	15 Dec 2004 08:28:34 -0000	1.3
  +++ BranchInstruction.java	2 Feb 2005 00:58:08 -0000	1.4
  @@ -41,7 +41,7 @@
     BranchInstruction() {}
   
     /** Common super constructor
  -   * @param opcodee Instruction opcode
  +   * @param opcode Instruction opcode
      * @param target instruction to branch to
      */
     protected BranchInstruction(short opcode, InstructionHandle target) {
  
  
  
  1.4       +2 -2      jakarta-bcel/src/java/org/apache/bcel/generic/CHECKCAST.java
  
  Index: CHECKCAST.java
  ===================================================================
  RCS file: /home/cvs/jakarta-bcel/src/java/org/apache/bcel/generic/CHECKCAST.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- CHECKCAST.java	15 Dec 2004 08:28:34 -0000	1.3
  +++ CHECKCAST.java	2 Feb 2005 00:58:08 -0000	1.4
  @@ -33,7 +33,7 @@
     CHECKCAST() {}
   
     /** Check whether object is of given type
  -   * @param n index to class in constant pool
  +   * @param index index to class in constant pool
      */
     public CHECKCAST(int index) {
       super(org.apache.bcel.Constants.CHECKCAST, index);
  
  
  
  1.6       +2 -2      jakarta-bcel/src/java/org/apache/bcel/generic/ClassGen.java
  
  Index: ClassGen.java
  ===================================================================
  RCS file: /home/cvs/jakarta-bcel/src/java/org/apache/bcel/generic/ClassGen.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ClassGen.java	15 Dec 2004 08:28:34 -0000	1.5
  +++ ClassGen.java	2 Feb 2005 00:58:08 -0000	1.6
  @@ -246,7 +246,7 @@
      * Convenience method.
      *
      * Add an empty constructor to this class that does nothing but calling super().
  -   * @param access rights for constructor
  +   * @param access_flags rights for constructor
      */
     public void addEmptyConstructor(int access_flags) {
       InstructionList il = new InstructionList();
  
  
  
  1.7       +14 -7     jakarta-bcel/src/java/org/apache/bcel/generic/ConstantPoolGen.java
  
  Index: ConstantPoolGen.java
  ===================================================================
  RCS file: /home/cvs/jakarta-bcel/src/java/org/apache/bcel/generic/ConstantPoolGen.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ConstantPoolGen.java	15 Dec 2004 08:28:34 -0000	1.6
  +++ ConstantPoolGen.java	2 Feb 2005 00:58:08 -0000	1.7
  @@ -53,7 +53,7 @@
     /**
      * Initialize with given array of constants.
      *
  -   * @param c array of given constants, new ones will be appended
  +   * @param cs array of given constants, new ones will be appended
      */
     public ConstantPoolGen(Constant[] cs) {
       if(cs.length > size) {
  @@ -222,7 +222,7 @@
     /**
      * Add a new Class reference to the ConstantPool for a given type.
      *
  -   * @param str Class to add
  +   * @param type Class to add
      * @return index of entry
      */
     public int addClass(ObjectType type) {
  @@ -456,7 +456,8 @@
      * Add a new NameAndType constant to the ConstantPool if it is not already 
      * in there.
      *
  -   * @param n NameAndType string to add
  +   * @param name Name string to add
  +   * @param signature signature string to add
      * @return index of entry
      */
     public int addNameAndType(String name, String signature) {
  @@ -502,7 +503,9 @@
      * Add a new Methodref constant to the ConstantPool, if it is not already 
      * in there.
      *
  -   * @param n Methodref string to add
  +   * @param class_name class name string to add
  +   * @param method_name method name string to add
  +   * @param signature method signature string to add
      * @return index of entry
      */
     public int addMethodref(String class_name, String method_name, String signature) {
  @@ -552,7 +555,9 @@
      * Add a new InterfaceMethodref constant to the ConstantPool, if it is not already 
      * in there.
      *
  -   * @param n InterfaceMethodref string to add
  +   * @param class_name class name string to add
  +   * @param method_name method name string to add
  +   * @param signature signature string to add
      * @return index of entry
      */
     public int addInterfaceMethodref(String class_name, String method_name, String signature) {
  @@ -597,7 +602,9 @@
      * Add a new Fieldref constant to the ConstantPool, if it is not already 
      * in there.
      *
  -   * @param n Fieldref string to add
  +   * @param class_name class name string to add
  +   * @param field_name field name string to add
  +   * @param signature signature string to add
      * @return index of entry
      */
     public int addFieldref(String class_name, String field_name, String signature) {
  
  
  
  1.4       +3 -2      jakarta-bcel/src/java/org/apache/bcel/generic/IfInstruction.java
  
  Index: IfInstruction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-bcel/src/java/org/apache/bcel/generic/IfInstruction.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- IfInstruction.java	15 Dec 2004 08:28:34 -0000	1.3
  +++ IfInstruction.java	2 Feb 2005 00:58:08 -0000	1.4
  @@ -31,7 +31,8 @@
     IfInstruction() {}
   
     /**
  -   * @param instruction Target instruction to branch to
  +   * @param opcode opcode of instruction
  +   * @param target Target instruction to branch to
      */
     protected IfInstruction(short opcode, InstructionHandle target) {
       super(opcode, target);
  
  
  
  1.6       +2 -2      jakarta-bcel/src/java/org/apache/bcel/generic/Instruction.java
  
  Index: Instruction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-bcel/src/java/org/apache/bcel/generic/Instruction.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Instruction.java	15 Dec 2004 08:28:34 -0000	1.5
  +++ Instruction.java	2 Feb 2005 00:58:08 -0000	1.6
  @@ -131,7 +131,7 @@
      * Read an instruction from (byte code) input stream and return the
      * appropiate object.
      *
  -   * @param file file to read from
  +   * @param bytes input stream bytes
      * @return instruction object being read
      */
     public static final Instruction readInstruction(ByteSequence bytes)
  
  
  
  1.6       +2 -2      jakarta-bcel/src/java/org/apache/bcel/generic/InstructionList.java
  
  Index: InstructionList.java
  ===================================================================
  RCS file: /home/cvs/jakarta-bcel/src/java/org/apache/bcel/generic/InstructionList.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- InstructionList.java	15 Dec 2004 08:28:34 -0000	1.5
  +++ InstructionList.java	2 Feb 2005 00:58:08 -0000	1.6
  @@ -405,7 +405,7 @@
      * Insert another list before Instruction handle ih contained in this list.
      * Consumes argument list, i.e., it becomes empty.
      *
  -   * @param i  where to append the instruction list 
  +   * @param ih  where to append the instruction list 
      * @param il Instruction list to insert
      * @return instruction handle of the first inserted instruction
      */
  
  
  
  1.6       +1 -2      jakarta-bcel/src/java/org/apache/bcel/generic/LocalVariableGen.java
  
  Index: LocalVariableGen.java
  ===================================================================
  RCS file: /home/cvs/jakarta-bcel/src/java/org/apache/bcel/generic/LocalVariableGen.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- LocalVariableGen.java	15 Dec 2004 08:28:35 -0000	1.5
  +++ LocalVariableGen.java	2 Feb 2005 00:58:08 -0000	1.6
  @@ -74,7 +74,6 @@
      * start_pc+length ending at first index beyond the end of the code are
      * valid.
      *
  -   * @param il instruction list (byte code) which this variable belongs to
      * @param cp constant pool
      */
     public LocalVariable getLocalVariable(ConstantPoolGen cp) {
  
  
  
  1.6       +2 -2      jakarta-bcel/src/java/org/apache/bcel/generic/Select.java
  
  Index: Select.java
  ===================================================================
  RCS file: /home/cvs/jakarta-bcel/src/java/org/apache/bcel/generic/Select.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Select.java	15 Dec 2004 08:28:36 -0000	1.5
  +++ Select.java	2 Feb 2005 00:58:08 -0000	1.6
  @@ -52,7 +52,7 @@
      *
      * @param match array of matching values
      * @param targets instruction targets
  -   * @param target default instruction target
  +   * @param defaultTarget default instruction target
      */
     Select(short opcode, int[] match, InstructionHandle[] targets,
   	 InstructionHandle defaultTarget) {
  
  
  
  1.5       +2 -2      jakarta-bcel/src/java/org/apache/bcel/generic/TABLESWITCH.java
  
  Index: TABLESWITCH.java
  ===================================================================
  RCS file: /home/cvs/jakarta-bcel/src/java/org/apache/bcel/generic/TABLESWITCH.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- TABLESWITCH.java	15 Dec 2004 08:28:36 -0000	1.4
  +++ TABLESWITCH.java	2 Feb 2005 00:58:08 -0000	1.5
  @@ -37,7 +37,7 @@
      * @param match sorted array of match values, match[0] must be low value, 
      * match[match_length - 1] high value
      * @param targets where to branch for matched values
  -   * @param target default branch
  +   * @param defaultTarget default branch
      */
     public TABLESWITCH(int[] match, InstructionHandle[] targets,
   		     InstructionHandle defaultTarget) {
  
  
  
  1.3       +2 -2      jakarta-bcel/src/java/org/apache/bcel/verifier/structurals/Subroutines.java
  
  Index: Subroutines.java
  ===================================================================
  RCS file: /home/cvs/jakarta-bcel/src/java/org/apache/bcel/verifier/structurals/Subroutines.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Subroutines.java	15 Dec 2004 08:28:55 -0000	1.2
  +++ Subroutines.java	2 Feb 2005 00:58:08 -0000	1.3
  @@ -343,7 +343,7 @@
   
   	/**
   	 * Constructor.
  -	 * @param il A MethodGen object representing method to
  +	 * @param mg A MethodGen object representing method to
   	 * create the Subroutine objects of.
   	 */
   	public Subroutines(MethodGen mg){
  
  
  

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