summaryrefslogtreecommitdiffstats
path: root/org.aspectj.ajdt.core
diff options
context:
space:
mode:
authorjhugunin <jhugunin>2003-01-14 17:33:36 +0000
committerjhugunin <jhugunin>2003-01-14 17:33:36 +0000
commita5fb21459045ea1ed295c21836672eecf2ca0242 (patch)
treeaf4f1b261483237ff2d2484e7245a8dc41048d0f /org.aspectj.ajdt.core
parent08c86843265088699f88a4fedc4c78c5d7081d6a (diff)
downloadaspectj-a5fb21459045ea1ed295c21836672eecf2ca0242.tar.gz
aspectj-a5fb21459045ea1ed295c21836672eecf2ca0242.zip
renamed "declare dominates" to "declare precedence"
Diffstat (limited to 'org.aspectj.ajdt.core')
-rw-r--r--org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java2
-rw-r--r--org.aspectj.ajdt.core/testdata/src1/UnimplementedSyntax.java2
-rw-r--r--org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/BasicCommandTestCase.java2
3 files changed, 4 insertions, 2 deletions
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java
index 26b4be2a0..c6a4a3b58 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java
@@ -76,7 +76,7 @@ public class AspectDeclaration extends MemberTypeDeclaration {
if (dominatesPattern != null) {
scope.problemReporter().signalError(
dominatesPattern.getStart(), dominatesPattern.getEnd(),
- "dominates has changed for 1.1, use 'declare dominates: " +
+ "dominates has changed for 1.1, use 'declare precedence: " +
new String(this.name) + ", " + dominatesPattern.toString() + ";' " +
"in the body of the aspect instead");
}
diff --git a/org.aspectj.ajdt.core/testdata/src1/UnimplementedSyntax.java b/org.aspectj.ajdt.core/testdata/src1/UnimplementedSyntax.java
index 3ea1a1685..de99c1905 100644
--- a/org.aspectj.ajdt.core/testdata/src1/UnimplementedSyntax.java
+++ b/org.aspectj.ajdt.core/testdata/src1/UnimplementedSyntax.java
@@ -18,6 +18,8 @@ aspect C {
pointcut p(): handler(Foo);
pointcut p2(): initialization(Object.new(..));
+
+ declare dominates: A, B;
}
aspect D a b c {} \ No newline at end of file
diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/BasicCommandTestCase.java b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/BasicCommandTestCase.java
index 2ee04a21d..22e8a6412 100644
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/BasicCommandTestCase.java
+++ b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/BasicCommandTestCase.java
@@ -82,7 +82,7 @@ public class BasicCommandTestCase extends CommandTestCase {
public void testUnimplementedSyntax() {
checkCompile("src1/UnimplementedSyntax.java",
- new int[] {5, 15, 16, 23});
+ new int[] {5, 15, 16, 22, 25});
}
public void testXlintWarn() {
checkCompile("src1/Xlint.java", NO_ERRORS);