diff options
6 files changed, 42 insertions, 15 deletions
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/PointcutDeclaration.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/PointcutDeclaration.java index 3d9990ad1..087e87d6c 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/PointcutDeclaration.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/PointcutDeclaration.java @@ -26,9 +26,11 @@ import org.aspectj.org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclarat import org.aspectj.org.eclipse.jdt.internal.compiler.ast.TypeDeclaration; import org.aspectj.org.eclipse.jdt.internal.compiler.ast.TypeReference; import org.aspectj.org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants; +import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.AnnotationBinding; import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.ClassScope; import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.ExtraCompilerModifiers; import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding; +import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.SourceTypeBinding; import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.TagBits; import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.TypeBinding; import org.aspectj.org.eclipse.jdt.internal.compiler.parser.Parser; @@ -89,17 +91,7 @@ public class PointcutDeclaration extends AjMethodDeclaration { // } if (Modifier.isAbstract(this.declaredModifiers)) { - if (!(typeDec instanceof AspectDeclaration)) { - // check for @Aspect - if (isAtAspectJ(typeDec)) { - // no need to check abstract class as JDT does that - } else { - typeDec.scope.problemReporter().signalError(sourceStart, sourceEnd, - "The abstract pointcut " + new String(declaredName) + " can only be defined in an aspect"); - ignoreFurtherInvestigation = true; - return; - } - } else if (!Modifier.isAbstract(typeDec.modifiers)) { + if ((typeDec instanceof AspectDeclaration) && !Modifier.isAbstract(typeDec.modifiers)) { typeDec.scope.problemReporter().signalError(sourceStart, sourceEnd, "The abstract pointcut " + new String(declaredName) + " can only be defined in an abstract aspect"); @@ -116,10 +108,9 @@ public class PointcutDeclaration extends AjMethodDeclaration { private boolean isAtAspectJ(TypeDeclaration typeDec) { if (typeDec.annotations == null) return false; - for (int i = 0; i < typeDec.annotations.length; i++) { Annotation annotation = typeDec.annotations[i]; - if ("Lorg/aspectj/lang/annotation/Aspect;".equals(new String(annotation.resolvedType.signature()))) { + if (CharOperation.equals(annotation.resolvedType.signature(),ASPECT_CHARS)) { return true; } } @@ -174,6 +165,8 @@ public class PointcutDeclaration extends AjMethodDeclaration { generateSyntheticPointcutMethod = true; // mangleSelector = false; } + + private static char[] ASPECT_CHARS = "Lorg/aspectj/lang/annotation/Aspect;".toCharArray(); public void resolve(ClassScope upperScope) { // we attempted to resolve annotations below, but that was too early, so we do it again @@ -181,6 +174,18 @@ public class PointcutDeclaration extends AjMethodDeclaration { if (binding != null) { binding.tagBits -= TagBits.AnnotationResolved; resolveAnnotations(scope, this.annotations, this.binding); + + TypeDeclaration typeDec = upperScope.referenceContext; + if (Modifier.isAbstract(this.declaredModifiers)) { + if (!(typeDec instanceof AspectDeclaration)) { + if (!isAtAspectJ(typeDec)) { + typeDec.scope.problemReporter().signalError(sourceStart, sourceEnd, + "The abstract pointcut " + new String(declaredName) + " can only be defined in an aspect"); + ignoreFurtherInvestigation = true; + return; + } + } + } } // for the rest of the resolution process, this method should do nothing, use the entry point below... } diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceType.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceType.java index dc82d4aac..174f27215 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceType.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceType.java @@ -465,11 +465,11 @@ public class EclipseSourceType extends AbstractReferenceTypeDelegate { } if (pointcuts[i].isAbstract()) { if (!this.isAspect()) { - eclipseWorld().showMessage(IMessage.ERROR, "abstract pointcut only allowed in aspect" + pointcuts[i].getName(), + eclipseWorld().showMessage(IMessage.ERROR, "The abstract pointcut " + pointcuts[i].getName()+ " can only be defined in an aspect", pointcuts[i].getSourceLocation(), null); sawError = true; } else if (!binding.isAbstract()) { - eclipseWorld().showMessage(IMessage.ERROR, "abstract pointcut in concrete aspect" + pointcuts[i], + eclipseWorld().showMessage(IMessage.ERROR, "abstract pointcut in concrete aspect: " + pointcuts[i], pointcuts[i].getSourceLocation(), null); sawError = true; } diff --git a/tests/bugs189/485583/Bar.aj b/tests/bugs189/485583/Bar.aj new file mode 100644 index 000000000..aa69e37f0 --- /dev/null +++ b/tests/bugs189/485583/Bar.aj @@ -0,0 +1,8 @@ +//import org.aspectj.lang.annotation.*; +// +//@SuppressLoggerWarning +@org.aspectj.lang.annotation.Aspect +public abstract class Bar { + public abstract pointcut applicationCode(); +} + diff --git a/tests/bugs189/485583/Foo.aj b/tests/bugs189/485583/Foo.aj new file mode 100644 index 000000000..3997385f7 --- /dev/null +++ b/tests/bugs189/485583/Foo.aj @@ -0,0 +1,4 @@ + +public abstract class Foo { + public abstract pointcut deprecatedCode(); +} diff --git a/tests/src/org/aspectj/systemtest/ajc189/Ajc189Tests.java b/tests/src/org/aspectj/systemtest/ajc189/Ajc189Tests.java index 138787853..a3a191a61 100644 --- a/tests/src/org/aspectj/systemtest/ajc189/Ajc189Tests.java +++ b/tests/src/org/aspectj/systemtest/ajc189/Ajc189Tests.java @@ -22,6 +22,10 @@ import org.aspectj.testing.XMLBasedAjcTestCase; */ public class Ajc189Tests extends org.aspectj.testing.XMLBasedAjcTestCase { + public void testNPEAtAspectJ() throws Exception { + runTest("NPE at aspectj"); + } + public void testLostBounds() throws Exception { runTest("lost bounds"); // This type has I added via declare parents diff --git a/tests/src/org/aspectj/systemtest/ajc189/ajc189.xml b/tests/src/org/aspectj/systemtest/ajc189/ajc189.xml index 594f7f11d..586ff771e 100644 --- a/tests/src/org/aspectj/systemtest/ajc189/ajc189.xml +++ b/tests/src/org/aspectj/systemtest/ajc189/ajc189.xml @@ -2,6 +2,12 @@ <suite> +<ajc-test dir="bugs189/485583" title="NPE at aspectj"> + <compile files="Foo.aj Bar.aj" options="-1.8"> + <message kind="error" text="The abstract pointcut deprecatedCode can only be defined in an aspect"/> + </compile> +</ajc-test> + <ajc-test dir="bugs189/486612" title="lost bounds"> <compile files="Code.java Azpect.java" options="-1.8"/> </ajc-test> |