- Added support for 1.4 sources (use "-source 1.4" option)

- Made output class files go to documentation directory (-d) rather than source directory.

- Added "-XajdocDebug" option that will keep the source files generated from the ASM around in order to help people send better bug reports.

- Any declare forms that ajdoc doesn't know how to generate docs for get printed to the console and indicated as a limitation.

I also extended test coverage to declare forms and added proper clearing of state for multiple invocations from test cases.

1 files changed, 8 insertions, 2 deletions

diff --git a/ajdoc/testsrc/org/aspectj/tools/ajdoc/CoverageTestCase.java b/ajdoc/testsrc/org/aspectj/tools/ajdoc/CoverageTestCase.java
index 790d8302c..7e629f96a 100644
--- a/ajdoc/testsrc/org/aspectj/tools/ajdoc/CoverageTestCase.java
+++ b/ajdoc/testsrc/org/aspectj/tools/ajdoc/CoverageTestCase.java
@@ -29,14 +29,20 @@ public class CoverageTestCase extends TestCase {
 		File aspect1 = new File("testdata/simple/foo/AspectA.java");
 		File file2 = new File("testdata/simple/foo/InterfaceI.java");
 		File file3 = new File("testdata/simple/foo/PlainJava.java");
+		File file4 = new File("testdata/simple/foo/ModelCoverage.java");
 		File outdir = new File("testdata/simple/doc");
 		
-		String[] args = { "-d", 
+		String[] args = { 
+//				"-XajdocDebug",
+				"-source",
+				"1.4",
+				"-d", 
 				outdir.getAbsolutePath(),
 				aspect1.getAbsolutePath(),
 				file1.getAbsolutePath(), 
 				file2.getAbsolutePath(),
-				file3.getAbsolutePath()};
+				file3.getAbsolutePath(),
+				file4.getAbsolutePath()};
 		
 		org.aspectj.tools.ajdoc.Main.main(args);
 	}