From: aclement Date: Thu, 23 Feb 2006 07:57:40 +0000 (+0000) Subject: need to keep Mr Build Machine happy. X-Git-Tag: POST_MEMORY_CHANGES~30 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b09439bdc4f336b34233d85e9c87f1018457e707;p=aspectj.git need to keep Mr Build Machine happy. --- diff --git a/weaver/src/org/aspectj/weaver/SimpleAnnotationValue.java b/weaver/src/org/aspectj/weaver/SimpleAnnotationValue.java index 836de9462..44e086d28 100644 --- a/weaver/src/org/aspectj/weaver/SimpleAnnotationValue.java +++ b/weaver/src/org/aspectj/weaver/SimpleAnnotationValue.java @@ -11,8 +11,6 @@ * ******************************************************************/ package org.aspectj.weaver; -import sun.reflect.generics.reflectiveObjects.NotImplementedException; - public class SimpleAnnotationValue extends AnnotationValue { public SimpleAnnotationValue(int kind) { @@ -32,8 +30,7 @@ public class SimpleAnnotationValue extends AnnotationValue { case AnnotationValue.PRIMITIVE_SHORT: theShort = ((Short)value).shortValue(); break; case AnnotationValue.PRIMITIVE_BOOLEAN: theBoolean = ((Boolean)value).booleanValue(); break; default: - System.err.println("value = "+whatKindIsThis(kind)); - throw new NotImplementedException(); + throw new BCException("Not implemented for this kind: "+whatKindIsThis(kind)); } } @@ -73,7 +70,7 @@ public class SimpleAnnotationValue extends AnnotationValue { return Boolean.toString(theBoolean); case 's': // String return theString; - default: throw new NotImplementedException(); + default: throw new BCException("Do not understand this kind: "+valueKind); } } diff --git a/weaver/src/org/aspectj/weaver/asm/AjASMAttribute.java b/weaver/src/org/aspectj/weaver/asm/AjASMAttribute.java index 2a13514cf..59903ca40 100644 --- a/weaver/src/org/aspectj/weaver/asm/AjASMAttribute.java +++ b/weaver/src/org/aspectj/weaver/asm/AjASMAttribute.java @@ -19,8 +19,6 @@ import org.aspectj.org.objectweb.asm.ClassReader; import org.aspectj.org.objectweb.asm.ClassWriter; import org.aspectj.org.objectweb.asm.Label; -import sun.reflect.generics.reflectiveObjects.NotImplementedException; - class AjASMAttribute extends Attribute { private boolean unpacked = false; @@ -49,7 +47,7 @@ class AjASMAttribute extends Attribute { * These attributes are read only, an attempt to write them violates this fundamental assumption. */ protected ByteVector write(ClassWriter cw, byte[] code, int len, int maxStack, int maxLocals) { - throw new NotImplementedException();// "Attempt to write out the AjASMAttribute for "+this.type); + throw new BCException("Attempt to write out the AjASMAttribute for "+this.type); // return new ByteVector().putByteArray(data, 0, data.length); } diff --git a/weaver/src/org/aspectj/weaver/asm/AnnVisitor.java b/weaver/src/org/aspectj/weaver/asm/AnnVisitor.java index e27a6dd92..9717d50ad 100644 --- a/weaver/src/org/aspectj/weaver/asm/AnnVisitor.java +++ b/weaver/src/org/aspectj/weaver/asm/AnnVisitor.java @@ -16,13 +16,13 @@ import org.aspectj.weaver.AnnotationAnnotationValue; import org.aspectj.weaver.AnnotationNameValuePair; import org.aspectj.weaver.AnnotationValue; import org.aspectj.weaver.ArrayAnnotationValue; +import org.aspectj.weaver.BCException; import org.aspectj.weaver.ClassAnnotationValue; import org.aspectj.weaver.EnumAnnotationValue; import org.aspectj.weaver.SimpleAnnotationValue; import org.aspectj.org.objectweb.asm.AnnotationVisitor; import org.aspectj.org.objectweb.asm.Type; -import sun.reflect.generics.reflectiveObjects.NotImplementedException; /** * Constructed with an annotation to 'fill in' with the values we encounter whilst visting it. @@ -58,8 +58,7 @@ class AnnVisitor implements AnnotationVisitor { if (val!=null) { a.addNameValuePair(new AnnotationNameValuePair(name,val)); } else { - System.err.println("Choking on "+name+" = "+value); - throw new NotImplementedException(); + throw new BCException("Annotation visitor choked on "+name+" = "+value); } } diff --git a/weaver/src/org/aspectj/weaver/asm/ArrayAnnotationVisitor.java b/weaver/src/org/aspectj/weaver/asm/ArrayAnnotationVisitor.java index 4f0a3a5e6..778f44807 100644 --- a/weaver/src/org/aspectj/weaver/asm/ArrayAnnotationVisitor.java +++ b/weaver/src/org/aspectj/weaver/asm/ArrayAnnotationVisitor.java @@ -18,13 +18,13 @@ import org.aspectj.weaver.AnnotationAJ; import org.aspectj.weaver.AnnotationAnnotationValue; import org.aspectj.weaver.AnnotationValue; import org.aspectj.weaver.ArrayAnnotationValue; +import org.aspectj.weaver.BCException; import org.aspectj.weaver.ClassAnnotationValue; import org.aspectj.weaver.EnumAnnotationValue; import org.aspectj.weaver.SimpleAnnotationValue; import org.aspectj.org.objectweb.asm.AnnotationVisitor; import org.aspectj.org.objectweb.asm.Type; -import sun.reflect.generics.reflectiveObjects.NotImplementedException; class ArrayAnnotationVisitor implements AnnotationVisitor { List arrayValues = new ArrayList(); @@ -51,8 +51,7 @@ class ArrayAnnotationVisitor implements AnnotationVisitor { if (val!=null) { arrayValues.add(val); } else { - System.err.println("Choking on "+name+" = "+value); - throw new NotImplementedException(); + throw new BCException("ArrayAnnotationVisitor choking on "+name+" = "+value); } }