more ajdoc changes - see pr121711 - from Helen.

12 files changed, 136 insertions, 14 deletions

diff --git a/ajdoc/testdata/coverage/foo/ModelCoverage.java b/ajdoc/testdata/coverage/foo/ModelCoverage.java
index b05d7bc72..695026642 100644
--- a/ajdoc/testdata/coverage/foo/ModelCoverage.java
+++ b/ajdoc/testdata/coverage/foo/ModelCoverage.java
@@ -6,6 +6,10 @@ import java.util.List;
  
 interface I { } 
 
+/**
+ * doc about the Point class........
+ *
+ */
 class Point { 
 	int x;
 	static int sx;
@@ -28,7 +32,8 @@ class Point {
 	}
 	 
 	public int changeX(int x) { 
-		this.x = x;
+		//this.x = x;
+		setX(x);
 		return x;
 	}
 	
diff --git a/ajdoc/testdata/coverage/pkg/A.aj b/ajdoc/testdata/coverage/pkg/A.aj
new file mode 100644
index 000000000..7c720c670
--- /dev/null
+++ b/ajdoc/testdata/coverage/pkg/A.aj
@@ -0,0 +1,5 @@
+package pkg;
+
+public aspect A {
+		
+}
diff --git a/ajdoc/testdata/coverage/pkg/A2.aj b/ajdoc/testdata/coverage/pkg/A2.aj
new file mode 100644
index 000000000..4f876dc65
--- /dev/null
+++ b/ajdoc/testdata/coverage/pkg/A2.aj
@@ -0,0 +1,20 @@
+package pkg;
+
+public aspect A2 {
+		
+	pointcut p() : execution(* C2.amethod(..));
+	pointcut p2() : execution(* C2.amethod(..));
+	
+	before() : p() {
+	}
+	
+	before() : p2() {
+	}
+	
+}
+
+class C2 {
+	
+	public void amethod() {
+	}
+}
diff --git a/ajdoc/testdata/coverage/pkg/C.java b/ajdoc/testdata/coverage/pkg/C.java
new file mode 100644
index 000000000..e817b5163
--- /dev/null
+++ b/ajdoc/testdata/coverage/pkg/C.java
@@ -0,0 +1,5 @@
+package pkg;
+
+public class C {
+	
+}
diff --git a/ajdoc/testdata/declareForms/A.aj b/ajdoc/testdata/declareForms/A.aj
new file mode 100644
index 000000000..947d9d2cb
--- /dev/null
+++ b/ajdoc/testdata/declareForms/A.aj
@@ -0,0 +1,19 @@
+package foo;
+
+public aspect A {
+	
+	pointcut p() : execution(* C.amethod(..));
+	
+	declare warning : p() : "warning";
+	
+	before() : p() {
+	}
+	
+}
+
+class C {
+	
+	public void amethod() {
+	}
+	
+}
diff --git a/ajdoc/testdata/declareForms/DeclareAtConstructor.aj b/ajdoc/testdata/declareForms/DeclareAtConstructor.aj
new file mode 100644
index 000000000..1d43cac39
--- /dev/null
+++ b/ajdoc/testdata/declareForms/DeclareAtConstructor.aj
@@ -0,0 +1,17 @@
+package foo;
+
+@interface MyAnnotation {	
+}
+
+public aspect DeclareAtConstructor {
+
+	declare @constructor : C.new(..) : @MyAnnotation;
+	
+}
+
+class C {
+	
+	public C(String s) {		
+	}
+	
+}
diff --git a/ajdoc/testdata/declareForms/DeclareAtField.aj b/ajdoc/testdata/declareForms/DeclareAtField.aj
new file mode 100644
index 000000000..ea5230a86
--- /dev/null
+++ b/ajdoc/testdata/declareForms/DeclareAtField.aj
@@ -0,0 +1,16 @@
+package foo;
+
+@interface MyAnnotation {	
+}
+
+public aspect DeclareAtField {
+
+	declare @field : int C.* : @MyAnnotation;
+	
+}
+
+class C {
+	
+	int x = 1;
+	
+}
diff --git a/ajdoc/testdata/declareForms/DeclareAtMethod.aj b/ajdoc/testdata/declareForms/DeclareAtMethod.aj
new file mode 100644
index 000000000..2dc6ca739
--- /dev/null
+++ b/ajdoc/testdata/declareForms/DeclareAtMethod.aj
@@ -0,0 +1,17 @@
+package foo;
+
+@interface MyAnnotation {	
+}
+
+public aspect DeclareAtMethod {
+
+	declare @method : public * C.*(..) : @MyAnnotation;
+	
+}
+
+class C {
+	
+	public void amethod() {
+	}
+	
+}
diff --git a/ajdoc/testdata/declareForms/AnnotationTest.aj b/ajdoc/testdata/declareForms/DeclareAtType.aj
index 28a72736a..44f60b633 100644
--- a/ajdoc/testdata/declareForms/AnnotationTest.aj
+++ b/ajdoc/testdata/declareForms/DeclareAtType.aj
@@ -3,7 +3,7 @@ package foo;
 @interface MyAnnotation {	
 }
 
-public aspect AnnotationTest {
+public aspect DeclareAtType {
 
 	declare @type : C : @MyAnnotation;
 	
diff --git a/ajdoc/testdata/declareForms/DeclareCoverage2.aj b/ajdoc/testdata/declareForms/DeclareCoverage2.aj
index 6300298e9..1ea6b6322 100644
--- a/ajdoc/testdata/declareForms/DeclareCoverage2.aj
+++ b/ajdoc/testdata/declareForms/DeclareCoverage2.aj
@@ -2,20 +2,23 @@ package foo;
 
 public aspect DeclareCoverage2 {
 
-    pointcut illegalNewFigElt(): call(Point.new(..)) && !withincode(* *.doIt(..));
+    pointcut illegalNewFigElt(): call(Point2.new(..)) && !withincode(* *.doIt(..));
     
     declare error: illegalNewFigElt(): "Illegal constructor call.";
-    declare warning: call(* Point.setX(..)): "Illegal call.";
+    declare warning: call(* Point2.setX(..)): "Illegal call.";
+    declare warning : execution(* Point2.setX(..)) : "blah";
 
-    declare parents: Point extends java.io.Serializable;
-	declare parents: Line implements java.util.Observable;
-    declare soft: SizeException : call(* Point.getX());
-	declare precedence: DeclareCoverage2, InterTypeDecCoverage, *;
+    declare parents: Point2 implements java.io.Serializable;
+    declare soft: SizeException2 : call(* Point2.getX());
+	declare precedence: DeclareCoverage2, InterTypeDecCoverage2, *;
 }
 
-aspect InterTypeDecCoverage {}
+aspect InterTypeDecCoverage2 {}
 
-class Point { 
+/**
+ * comment about class Point2
+ */
+class Point2 { 
 	
 	int x = 2;
 	public void setX(int x) {
@@ -27,18 +30,18 @@ class Point {
 	}
 }
 
-class Line {
+class Line2 {
 }
 
-class SizeException extends Throwable { }
+class SizeException2 extends Throwable { }
 
-class Main {
+class Main2 {
 	
 	public static void main(String[] args) {
 	}
 	
 	public void doIt() {
-		Point p = new Point();
+		Point2 p = new Point2();
 		p.setX(3);
 		p.getX();
 	}
diff --git a/ajdoc/testdata/declareForms/DeclareParents.aj b/ajdoc/testdata/declareForms/DeclareParents.aj
new file mode 100644
index 000000000..c86784690
--- /dev/null
+++ b/ajdoc/testdata/declareForms/DeclareParents.aj
@@ -0,0 +1,12 @@
+package foo;
+
+public aspect DeclareParents {
+	declare parents: Class1 implements java.io.Serializable;
+    declare parents: Class2 extends java.util.Observable;
+}
+
+class Class1 {	
+}
+
+class Class2 {
+}
diff --git a/ajdoc/testdata/pr119453/src/pack/A.aj b/ajdoc/testdata/pr119453/src/pack/A.aj
index 21517b07f..1741b6165 100644
--- a/ajdoc/testdata/pr119453/src/pack/A.aj
+++ b/ajdoc/testdata/pr119453/src/pack/A.aj
@@ -18,4 +18,7 @@ public aspect A {
 	before() : p() {
 	}
 	
+	pointcut p1() : execution(public String C.method1(..));
+	after() returning : p1() {
+	}
 }