diff options
| -rw-r--r-- | tests/src/org/aspectj/systemtest/ajc163/ajc163.xml | 6 | ||||
| -rw-r--r-- | weaver/src/org/aspectj/weaver/bcel/BcelMethod.java | 6 | ||||
| -rw-r--r-- | weaver/testsrc/org/aspectj/weaver/bcel/WorldTestCase.java | 2 |
3 files changed, 6 insertions, 8 deletions
diff --git a/tests/src/org/aspectj/systemtest/ajc163/ajc163.xml b/tests/src/org/aspectj/systemtest/ajc163/ajc163.xml index 0664d78a1..c26204aa5 100644 --- a/tests/src/org/aspectj/systemtest/ajc163/ajc163.xml +++ b/tests/src/org/aspectj/systemtest/ajc163/ajc163.xml @@ -42,13 +42,13 @@ <run class="CallTest"> <stdout> <line text="public abstract boolean Authorization.mayPerform(java.lang.String,java.lang.String)"/> - <line text="public abstract interface boolean AuthorizationAdmin.mayPerform(java.lang.String, java.lang.String)"/> + <line text="public abstract boolean AuthorizationAdmin.mayPerform(java.lang.String, java.lang.String)"/> <line text="mayPerform() executing"/> <line text="public abstract boolean AuthorizationAdmin.mayPerform2(java.lang.String,java.lang.String)"/> - <line text="public abstract interface boolean AuthorizationAdmin.mayPerform2(java.lang.String, java.lang.String)"/> + <line text="public abstract boolean AuthorizationAdmin.mayPerform2(java.lang.String, java.lang.String)"/> <line text="mayPerform2() executing"/> <line text="public abstract boolean Authorization.mayPerform(java.lang.String,java.lang.String)"/> - <line text="public abstract interface boolean Authorization.mayPerform(java.lang.String, java.lang.String)"/> + <line text="public abstract boolean Authorization.mayPerform(java.lang.String, java.lang.String)"/> <line text="mayPerform() executing"/> </stdout> </run> diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelMethod.java b/weaver/src/org/aspectj/weaver/bcel/BcelMethod.java index 13f883f1e..7fc78b59d 100644 --- a/weaver/src/org/aspectj/weaver/bcel/BcelMethod.java +++ b/weaver/src/org/aspectj/weaver/bcel/BcelMethod.java @@ -83,8 +83,7 @@ class BcelMethod extends ResolvedMemberImpl { BcelMethod(BcelObjectType declaringType, Method method) { super(method.getName().equals("<init>") ? CONSTRUCTOR : (method.getName().equals("<clinit>") ? STATIC_INITIALIZATION - : METHOD), declaringType.getResolvedTypeX(), declaringType.isInterface() ? method.getModifiers() - | Modifier.INTERFACE : method.getModifiers(), method.getName(), method.getSignature()); + : METHOD), declaringType.getResolvedTypeX(), method.getModifiers(), method.getName(), method.getSignature()); this.method = method; sourceContext = declaringType.getResolvedTypeX().getSourceContext(); bcelObjectType = declaringType; @@ -97,8 +96,7 @@ class BcelMethod extends ResolvedMemberImpl { */ BcelMethod(BcelObjectType declaringType, Method method, List<AjAttribute> attributes) { super(method.getName().equals("<init>") ? CONSTRUCTOR : (method.getName().equals("<clinit>") ? STATIC_INITIALIZATION - : METHOD), declaringType.getResolvedTypeX(), declaringType.isInterface() ? method.getModifiers() - | Modifier.INTERFACE : method.getModifiers(), method.getName(), method.getSignature()); + : METHOD), declaringType.getResolvedTypeX(), method.getModifiers(), method.getName(), method.getSignature()); this.method = method; sourceContext = declaringType.getResolvedTypeX().getSourceContext(); bcelObjectType = declaringType; diff --git a/weaver/testsrc/org/aspectj/weaver/bcel/WorldTestCase.java b/weaver/testsrc/org/aspectj/weaver/bcel/WorldTestCase.java index 111d7e54d..1fb756852 100644 --- a/weaver/testsrc/org/aspectj/weaver/bcel/WorldTestCase.java +++ b/weaver/testsrc/org/aspectj/weaver/bcel/WorldTestCase.java @@ -123,7 +123,7 @@ public class WorldTestCase extends CommonWorldTests { }); ResolvedMember remove = iter.lookupMethod(MemberImpl.method(iter, 0, "remove", "()V")); assertNotNull("iterator doesn't have remove", remove); - modifiersTest(remove, Modifier.PUBLIC | Modifier.INTERFACE); // no longer abstract in Java8 (default instead) + modifiersTest(remove, Modifier.PUBLIC); // no longer abstract in Java8 (default instead) exceptionsTest(remove, UnresolvedType.NONE); ResolvedMember clone = iter.lookupMethod(MemberImpl.method(UnresolvedType.OBJECT, 0, "clone", "()Ljava/lang/Object;")); |