summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraclement <aclement>2006-02-01 15:38:11 +0000
committeraclement <aclement>2006-02-01 15:38:11 +0000
commitc5678d506d3d1ea2b18049d898c9c4fff4a2d1dc (patch)
tree647e237b3237d50fd4865d30d50f0163b54c7a60
parent795cd9eadc225d0c1c6d0297853bcd5ca8937be4 (diff)
downloadaspectj-c5678d506d3d1ea2b18049d898c9c4fff4a2d1dc.tar.gz
aspectj-c5678d506d3d1ea2b18049d898c9c4fff4a2d1dc.zip
oops
-rw-r--r--org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java21
-rw-r--r--tests/src/org/aspectj/systemtest/ajc151/Ajc151Tests.java8
2 files changed, 15 insertions, 14 deletions
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java
index e0d3d79ba..8409b0e58 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java
@@ -437,16 +437,17 @@ public class AjLookupEnvironment extends LookupEnvironment implements AnonymousC
* Return true if the declaration has @Aspect annotation
*/
private boolean isAnnotationStyleAspectDeclaration(TypeDeclaration dec) {
- Annotation[] annotations = dec.annotations;
- boolean isAtAspect = false;
- if (annotations != null) {
- for (int i = 0; i < annotations.length && !isAtAspect; i++) {
- if (annotations[i].resolvedType.debugName().equals("org.aspectj.lang.annotation.Aspect")) {
- isAtAspect = true;
- }
- }
- }
- return isAtAspect;
+ return false;
+// Annotation[] annotations = dec.annotations;
+// boolean isAtAspect = false;
+// if (annotations != null) {
+// for (int i = 0; i < annotations.length && !isAtAspect; i++) {
+// if (annotations[i].resolvedType.debugName().equals("org.aspectj.lang.annotation.Aspect")) {
+// isAtAspect = true;
+// }
+// }
+// }
+// return isAtAspect;
}
private void buildInterTypeAndPerClause(ClassScope s) {
diff --git a/tests/src/org/aspectj/systemtest/ajc151/Ajc151Tests.java b/tests/src/org/aspectj/systemtest/ajc151/Ajc151Tests.java
index d47e36d8f..a6a1d54f5 100644
--- a/tests/src/org/aspectj/systemtest/ajc151/Ajc151Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc151/Ajc151Tests.java
@@ -77,10 +77,10 @@ public class Ajc151Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
// public void testAtAspectInheritsAdviceWithTJPAndThis_pr125699 () {
// runTest("inherit adivce with this() and thisJoinPoint");
// }
-
- public void testAtAspectInheritsAbstractPointcut_pr125810 () {
- runTest("warning when inherited pointcut not made concrete");
- }
+//
+// public void testAtAspectInheritsAbstractPointcut_pr125810 () {
+// runTest("warning when inherited pointcut not made concrete");
+// }
/*
* Load-time weaving bugs and enhancements