svn commit: r826331 - in /jakarta/bcel/trunk/src/main/java/org/apache/bcel: classfile/ generic/

[email protected] Sun, 18 Oct 2009 01:35:26 -0000
Newsgroups gmane.comp.jakarta.bcel.devel
Message-ID <[email protected]>
Author: dbrosius
Date: Sun Oct 18 01:35:23 2009
New Revision: 826331

URL: http://svn.apache.org/viewvc?rev=826331&view=rev
Log:
better exception messages

Modified:
    jakarta/bcel/trunk/src/main/java/org/apache/bcel/classfile/AnnotationElementValue.java
    jakarta/bcel/trunk/src/main/java/org/apache/bcel/classfile/ArrayElementValue.java
    jakarta/bcel/trunk/src/main/java/org/apache/bcel/classfile/Attribute.java
    jakarta/bcel/trunk/src/main/java/org/apache/bcel/classfile/EnumElementValue.java
    jakarta/bcel/trunk/src/main/java/org/apache/bcel/classfile/StackMapTableEntry.java
    jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/AnnotationElementValueGen.java
    jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/ArrayElementValueGen.java
    jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/BranchInstruction.java
    jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/EnumElementValueGen.java
    jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/Instruction.java
    jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/Select.java

Modified: jakarta/bcel/trunk/src/main/java/org/apache/bcel/classfile/AnnotationElementValue.java
URL: http://svn.apache.org/viewvc/jakarta/bcel/trunk/src/main/java/org/apache/bcel/classfile/AnnotationElementValue.java?rev=826331&r1=826330&r2=826331&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/main/java/org/apache/bcel/classfile/AnnotationElementValue.java (original)
+++ jakarta/bcel/trunk/src/main/java/org/apache/bcel/classfile/AnnotationElementValue.java Sun Oct 18 01:35:23 2009
@@ -14,7 +14,7 @@
 		super(type, cpool);
 		if (type != ANNOTATION)
 			throw new RuntimeException(
-					"Only element values of type annotation can be built with this ctor");
+					"Only element values of type annotation can be built with this ctor - type specified: " + type);
 		this.annotationEntry = annotationEntry;
 	}
 

Modified: jakarta/bcel/trunk/src/main/java/org/apache/bcel/classfile/ArrayElementValue.java
URL: http://svn.apache.org/viewvc/jakarta/bcel/trunk/src/main/java/org/apache/bcel/classfile/ArrayElementValue.java?rev=826331&r1=826330&r2=826331&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/main/java/org/apache/bcel/classfile/ArrayElementValue.java (original)
+++ jakarta/bcel/trunk/src/main/java/org/apache/bcel/classfile/ArrayElementValue.java Sun Oct 18 01:35:23 2009
@@ -27,7 +27,7 @@
 		super(type, cpool);
 		if (type != ARRAY)
 			throw new RuntimeException(
-					"Only element values of type array can be built with this ctor");
+					"Only element values of type array can be built with this ctor - type specified: " + type);
 		this.evalues = datums;
 	}
 

Modified: jakarta/bcel/trunk/src/main/java/org/apache/bcel/classfile/Attribute.java
URL: http://svn.apache.org/viewvc/jakarta/bcel/trunk/src/main/java/org/apache/bcel/classfile/Attribute.java?rev=826331&r1=826330&r2=826331&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/main/java/org/apache/bcel/classfile/Attribute.java (original)
+++ jakarta/bcel/trunk/src/main/java/org/apache/bcel/classfile/Attribute.java Sun Oct 18 01:35:23 2009
@@ -212,7 +212,7 @@
 		case Constants.ATTR_STACK_MAP_TABLE:
 			return new StackMapTable(name_index, length, file, constant_pool);
 		default: // Never reached
-			throw new IllegalStateException("Ooops! default case reached.");
+			throw new IllegalStateException("Unrecognized attribute type tag parsed: " + tag);
 		}
 	}
 

Modified: jakarta/bcel/trunk/src/main/java/org/apache/bcel/classfile/EnumElementValue.java
URL: http://svn.apache.org/viewvc/jakarta/bcel/trunk/src/main/java/org/apache/bcel/classfile/EnumElementValue.java?rev=826331&r1=826330&r2=826331&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/main/java/org/apache/bcel/classfile/EnumElementValue.java (original)
+++ jakarta/bcel/trunk/src/main/java/org/apache/bcel/classfile/EnumElementValue.java Sun Oct 18 01:35:23 2009
@@ -17,7 +17,7 @@
 		super(type, cpool);
 		if (type != ENUM_CONSTANT)
 			throw new RuntimeException(
-					"Only element values of type enum can be built with this ctor");
+					"Only element values of type enum can be built with this ctor - type specified: " + type);
 		this.typeIdx = typeIdx;
 		this.valueIdx = valueIdx;
 	}

Modified: jakarta/bcel/trunk/src/main/java/org/apache/bcel/classfile/StackMapTableEntry.java
URL: http://svn.apache.org/viewvc/jakarta/bcel/trunk/src/main/java/org/apache/bcel/classfile/StackMapTableEntry.java?rev=826331&r1=826330&r2=826331&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/main/java/org/apache/bcel/classfile/StackMapTableEntry.java (original)
+++ jakarta/bcel/trunk/src/main/java/org/apache/bcel/classfile/StackMapTableEntry.java Sun Oct 18 01:35:23 2009
@@ -25,7 +25,7 @@
 /**
  * This class represents a stack map entry recording the types of
  * local variables and the the of stack items at a given byte code offset.
- * See CLDC specification •À?5.3.1.2
+ * See CLDC specification ��?5.3.1.2
  *
  * @version $Id$
  * @author  <A HREF="mailto:[email protected]">M. Dahm</A>
@@ -88,7 +88,7 @@
         	}
         } else {
         	/* Can't happen */
-        	throw new ClassFormatException ("Illegal Tag");
+        	throw new ClassFormatException ("Invalid frame type found while parsing stack map table: " + frame_type);
         }
     }
 
@@ -140,7 +140,7 @@
             }
         } else {
         	/* Can't happen */
-        	throw new ClassFormatException ("Illegal Tag");
+        	throw new ClassFormatException ("Invalid Stack map table tag: " + frame_type);
         }
     }
 

Modified: jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/AnnotationElementValueGen.java
URL: http://svn.apache.org/viewvc/jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/AnnotationElementValueGen.java?rev=826331&r1=826330&r2=826331&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/AnnotationElementValueGen.java (original)
+++ jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/AnnotationElementValueGen.java Sun Oct 18 01:35:23 2009
@@ -22,7 +22,7 @@
 		super(type, cpool);
 		if (type != ANNOTATION)
 			throw new RuntimeException(
-					"Only element values of type annotation can be built with this ctor");
+					"Only element values of type annotation can be built with this ctor - type specified: " + type);
 		this.a = annotation;
 	}
 

Modified: jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/ArrayElementValueGen.java
URL: http://svn.apache.org/viewvc/jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/ArrayElementValueGen.java?rev=826331&r1=826330&r2=826331&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/ArrayElementValueGen.java (original)
+++ jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/ArrayElementValueGen.java Sun Oct 18 01:35:23 2009
@@ -26,7 +26,7 @@
 		super(type, cpool);
 		if (type != ARRAY)
 			throw new RuntimeException(
-					"Only element values of type array can be built with this ctor");
+					"Only element values of type array can be built with this ctor - type specified: " + type);
 		this.evalues = new ArrayList();
 		for (int i = 0; i < datums.length; i++)
 		{

Modified: jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/BranchInstruction.java
URL: http://svn.apache.org/viewvc/jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/BranchInstruction.java?rev=826331&r1=826330&r2=826331&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/BranchInstruction.java (original)
+++ jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/BranchInstruction.java Sun Oct 18 01:35:23 2009
@@ -62,7 +62,7 @@
         out.writeByte(opcode);
         index = getTargetOffset();
         if (Math.abs(index) >= 32767) {
-            throw new ClassGenException("Branch target offset too large for short");
+            throw new ClassGenException("Branch target offset too large for short: " + index);
         }
         out.writeShort(index); // May be negative, i.e., point backwards
     }

Modified: jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/EnumElementValueGen.java
URL: http://svn.apache.org/viewvc/jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/EnumElementValueGen.java?rev=826331&r1=826330&r2=826331&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/EnumElementValueGen.java (original)
+++ jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/EnumElementValueGen.java Sun Oct 18 01:35:23 2009
@@ -24,7 +24,7 @@
 		super(ElementValueGen.ENUM_CONSTANT, cpool);
 		if (type != ENUM_CONSTANT)
 			throw new RuntimeException(
-					"Only element values of type enum can be built with this ctor");
+					"Only element values of type enum can be built with this ctor - type specified: " + type);
 		this.typeIdx = typeIdx;
 		this.valueIdx = valueIdx;
 	}

Modified: jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/Instruction.java
URL: http://svn.apache.org/viewvc/jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/Instruction.java?rev=826331&r1=826330&r2=826331&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/Instruction.java (original)
+++ jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/Instruction.java Sun Oct 18 01:35:23 2009
@@ -444,7 +444,7 @@
 				obj = new IMPDEP2();
 				break;
 			default:
-				throw new ClassGenException("Illegal opcode detected.");
+				throw new ClassGenException("Illegal opcode detected: " + opcode);
 
 		}
         

Modified: jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/Select.java
URL: http://svn.apache.org/viewvc/jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/Select.java?rev=826331&r1=826330&r2=826331&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/Select.java (original)
+++ jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/Select.java Sun Oct 18 01:35:23 2009
@@ -66,7 +66,7 @@
         }
         this.match = match;
         if ((match_length = match.length) != targets.length) {
-            throw new ClassGenException("Match and target array have not the same length");
+            throw new ClassGenException("Match and target array have not the same length: Match length: " + match.length + " Target length: " + targets.length);
         }
         indices = new int[match_length];
     }