diff options
| author | Andy Clement <aclement@gopivotal.com> | 2015-05-12 12:14:55 -0700 |
|---|---|---|
| committer | Andy Clement <aclement@gopivotal.com> | 2015-05-12 12:14:55 -0700 |
| commit | ef453a5ff86b4cf84e0d7845f7233fa1f0b3907b (patch) | |
| tree | db2aa0f30a4112a6b3535c5de621793c3e05cb34 /weaver | |
| parent | e7c66d3794b07c1a44df75b5baba4ac2937c6eb8 (diff) | |
| download | aspectj-ef453a5ff86b4cf84e0d7845f7233fa1f0b3907b.tar.gz aspectj-ef453a5ff86b4cf84e0d7845f7233fa1f0b3907b.zip | |
Do not attach INTERFACE modifier to methods from interfaces
Diffstat (limited to 'weaver')
| -rw-r--r-- | weaver/src/org/aspectj/weaver/bcel/BcelMethod.java | 6 | ||||
| -rw-r--r-- | weaver/testsrc/org/aspectj/weaver/bcel/WorldTestCase.java | 2 |
2 files changed, 3 insertions, 5 deletions
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;")); |