Extended test coverage.

15 files changed, 422 insertions, 294 deletions

diff --git a/ajdoc/testdata/simple/.cvsignore b/ajdoc/testdata/patterns/.cvsignore
index 8e695ec83..8e695ec83 100644
--- a/ajdoc/testdata/simple/.cvsignore
+++ b/ajdoc/testdata/patterns/.cvsignore
diff --git a/ajdoc/testdata/patterns/allPatterns.lst b/ajdoc/testdata/patterns/allPatterns.lst
new file mode 100644
index 000000000..40ce4afd4
--- /dev/null
+++ b/ajdoc/testdata/patterns/allPatterns.lst
@@ -0,0 +1,51 @@
+ca/ubc/cs/spl/aspectPatterns/patternLibrary/*.java

+

+ca/ubc/cs/spl/aspectPatterns/examples/abstractFactory/java/*.java

+ca/ubc/cs/spl/aspectPatterns/examples/abstractFactory/aspectj/*.java

+ca/ubc/cs/spl/aspectPatterns/examples/builder/java/*.java

+ca/ubc/cs/spl/aspectPatterns/examples/builder/aspectj/*.java

+ca/ubc/cs/spl/aspectPatterns/examples/factoryMethod/java/*.java

+ca/ubc/cs/spl/aspectPatterns/examples/factoryMethod/aspectj/*.java

+ca/ubc/cs/spl/aspectPatterns/examples/prototype/java/*.java

+ca/ubc/cs/spl/aspectPatterns/examples/prototype/aspectj/*.java

+ca/ubc/cs/spl/aspectPatterns/examples/singleton/java/*.java

+ca/ubc/cs/spl/aspectPatterns/examples/singleton/aspectj/*.java 

+

+ca/ubc/cs/spl/aspectPatterns/examples/adapter/java/*.java

+ca/ubc/cs/spl/aspectPatterns/examples/adapter/aspectj/*.java

+ca/ubc/cs/spl/aspectPatterns/examples/bridge/java/*.java

+ca/ubc/cs/spl/aspectPatterns/examples/bridge/aspectj/*.java

+ca/ubc/cs/spl/aspectPatterns/examples/composite/java/*.java

+ca/ubc/cs/spl/aspectPatterns/examples/composite/aspectj/*.java

+ca/ubc/cs/spl/aspectPatterns/examples/decorator/java/*.java

+ca/ubc/cs/spl/aspectPatterns/examples/decorator/aspectj/*.java

+ca/ubc/cs/spl/aspectPatterns/examples/facade/java/*.java

+ca/ubc/cs/spl/aspectPatterns/examples/facade/aspectj/*.java

+ca/ubc/cs/spl/aspectPatterns/examples/flyweight/java/*.java

+ca/ubc/cs/spl/aspectPatterns/examples/flyweight/aspectj/*.java

+ca/ubc/cs/spl/aspectPatterns/examples/proxy/java/*.java

+ca/ubc/cs/spl/aspectPatterns/examples/proxy/aspectj/*.java

+ca/ubc/cs/spl/aspectPatterns/examples/chainOfResponsibility/java/*.java

+ca/ubc/cs/spl/aspectPatterns/examples/chainOfResponsibility/aspectj/*.java

+ca/ubc/cs/spl/aspectPatterns/examples/command/java/*.java

+ca/ubc/cs/spl/aspectPatterns/examples/command/aspectj/*.java

+ca/ubc/cs/spl/aspectPatterns/examples/interpreter/java/*.java

+ca/ubc/cs/spl/aspectPatterns/examples/interpreter/aspectj/*.java

+ca/ubc/cs/spl/aspectPatterns/examples/iterator/java/*.java

+ca/ubc/cs/spl/aspectPatterns/examples/iterator/aspectj/*.java

+ca/ubc/cs/spl/aspectPatterns/examples/mediator/java/*.java

+ca/ubc/cs/spl/aspectPatterns/examples/mediator/aspectj/*.java

+ca/ubc/cs/spl/aspectPatterns/examples/memento/java/*.java

+ca/ubc/cs/spl/aspectPatterns/examples/memento/aspectj/*.java

+ca/ubc/cs/spl/aspectPatterns/examples/observer/java/*.java

+ca/ubc/cs/spl/aspectPatterns/examples/observer/aspectj/*.java

+ca/ubc/cs/spl/aspectPatterns/examples/state/java/*.java

+ca/ubc/cs/spl/aspectPatterns/examples/state/aspectj/*.java

+ca/ubc/cs/spl/aspectPatterns/examples/strategy/java/*.java

+ca/ubc/cs/spl/aspectPatterns/examples/strategy/aspectj/*.java

+ca/ubc/cs/spl/aspectPatterns/examples/templateMethod/java/*.java

+ca/ubc/cs/spl/aspectPatterns/examples/templateMethod/aspectj/*.java

+ca/ubc/cs/spl/aspectPatterns/examples/visitor/java/*.java

+ca/ubc/cs/spl/aspectPatterns/examples/visitor/aspectj/*.java

+

+

diff --git a/ajdoc/testdata/patterns/tut-all.lst b/ajdoc/testdata/patterns/tut-all.lst
new file mode 100644
index 000000000..1c273ddfd
--- /dev/null
+++ b/ajdoc/testdata/patterns/tut-all.lst
@@ -0,0 +1,253 @@
+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\abstractFactory\aspectj\AbstractFactory.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\abstractFactory\aspectj\AbstractFactoryEnhancement.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\abstractFactory\aspectj\Display.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\abstractFactory\aspectj\FramedFactory.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\abstractFactory\aspectj\Main.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\abstractFactory\aspectj\RegularFactory.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\abstractFactory\java\AbstractFactory.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\abstractFactory\java\Display.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\abstractFactory\java\FramedFactory.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\abstractFactory\java\Main.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\abstractFactory\java\RegularFactory.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\adapter\aspectj\Main.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\adapter\aspectj\PrinterAdapter.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\adapter\aspectj\SystemOutPrinter.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\adapter\aspectj\Writer.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\adapter\java\Main.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\adapter\java\PrinterAdapter.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\adapter\java\SystemOutPrinter.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\adapter\java\Writer.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\bridge\aspectj\AbstractionImplementation.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\bridge\aspectj\CrossCapitalImplementation.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\bridge\aspectj\GreetingScreen.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\bridge\aspectj\InformationScreen.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\bridge\aspectj\Main.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\bridge\aspectj\Screen.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\bridge\aspectj\ScreenImplementation.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\bridge\aspectj\StarImplementation.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\bridge\java\CrossCapitalImplementation.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\bridge\java\GreetingScreen.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\bridge\java\InformationScreen.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\bridge\java\Main.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\bridge\java\Screen.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\bridge\java\ScreenImplementation.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\bridge\java\StarImplementation.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\builder\aspectj\Creator.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\builder\aspectj\CreatorImplementation.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\builder\aspectj\Main.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\builder\aspectj\TextCreator.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\builder\aspectj\XMLCreator.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\builder\java\Creator.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\builder\java\Main.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\builder\java\TextCreator.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\builder\java\XMLCreator.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\chainOfResponsibility\aspectj\Button.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\chainOfResponsibility\aspectj\Click.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\chainOfResponsibility\aspectj\ClickChain.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\chainOfResponsibility\aspectj\Frame.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\chainOfResponsibility\aspectj\Main.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\chainOfResponsibility\aspectj\Panel.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\chainOfResponsibility\java\Button.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\chainOfResponsibility\java\Click.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\chainOfResponsibility\java\ClickHandler.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\chainOfResponsibility\java\Frame.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\chainOfResponsibility\java\Main.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\chainOfResponsibility\java\Panel.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\command\aspectj\Button.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\command\aspectj\ButtonCommand.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\command\aspectj\ButtonCommand2.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\command\aspectj\ButtonCommanding.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\command\aspectj\Main.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\command\aspectj\Printer.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\command\java\Button.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\command\java\ButtonCommand.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\command\java\ButtonCommand2.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\command\java\Command.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\command\java\Main.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\composite\aspectj\Directory.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\composite\aspectj\File.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\composite\aspectj\FileSystemComposition.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\composite\aspectj\Main.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\composite\java\Directory.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\composite\java\File.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\composite\java\FileSystemComponent.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\composite\java\Main.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\decorator\aspectj\BracketDecorator.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\decorator\aspectj\ConcreteOutput.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\decorator\aspectj\Main.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\decorator\aspectj\StarDecorator.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\decorator\java\BracketDecorator.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\decorator\java\ConcreteOutput.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\decorator\java\Main.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\decorator\java\Output.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\decorator\java\OutputDecorator.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\decorator\java\StarDecorator.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\facade\aspectj\Main.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\facade\java\Decoration.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\facade\java\Main.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\facade\java\OutputFacade.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\facade\java\RegularScreen.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\facade\java\StringTransformer.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\factoryMethod\aspectj\ButtonCreator.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\factoryMethod\aspectj\CreatorImplementation.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\factoryMethod\aspectj\GUIComponentCreator.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\factoryMethod\aspectj\LabelCreator.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\factoryMethod\aspectj\Main.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\factoryMethod\java\ButtonCreator.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\factoryMethod\java\GUIComponentCreator.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\factoryMethod\java\LabelCreator.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\factoryMethod\java\Main.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\flyweight\aspect\CharacterFlyweight.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\flyweight\aspect\FlyweightImplementation.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\flyweight\aspect\Main.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\flyweight\aspect\PrintableFlyweight.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\flyweight\aspect\WhitespaceFlyweight.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\flyweight\java\CharacterFlyweight.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\flyweight\java\Main.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\flyweight\java\PrintableFlyweight.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\flyweight\java\PrintableFlyweightFactory.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\flyweight\java\WhitespaceFlyweight.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\interpreter\aspectj\AndExpression.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\interpreter\aspectj\BooleanConstant.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\interpreter\aspectj\BooleanExpression.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\interpreter\aspectj\BooleanInterpretation.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\interpreter\aspectj\ExpressionException.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\interpreter\aspectj\Main.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\interpreter\aspectj\NotExpression.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\interpreter\aspectj\OrExpression.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\interpreter\aspectj\VariableContext.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\interpreter\aspectj\VariableExpression.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\interpreter\java\AndExpression.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\interpreter\java\BooleanConstant.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\interpreter\java\BooleanExpression.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\interpreter\java\ExpressionException.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\interpreter\java\Main.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\interpreter\java\NotExpression.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\interpreter\java\OrExpression.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\interpreter\java\VariableContext.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\interpreter\java\VariableExpression.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\iterator\aspectj\Main.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\iterator\aspectj\OpenList.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\iterator\aspectj\OpenListIteration.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\iterator\aspectj\SimpleList.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\iterator\java\Main.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\iterator\java\OpenList.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\iterator\java\ReverseIterator.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\iterator\java\SimpleList.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\mediator\aspectj\Button.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\mediator\aspectj\Label.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\mediator\aspectj\Main.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\mediator\aspectj\MediatorImplementation.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\mediator\java\Button.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\mediator\java\GUIColleague.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\mediator\java\GUIMediator.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\mediator\java\Label.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\mediator\java\Main.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\memento\aspectj\Counter.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\memento\aspectj\CounterMemento.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\memento\aspectj\Main.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\memento\java\Counter.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\memento\java\CounterMemento.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\memento\java\Main.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\observer\aspectj\ColorObserver.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\observer\aspectj\CoordinateObserver.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\observer\aspectj\Main.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\observer\aspectj\Point.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\observer\aspectj\Screen.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\observer\aspectj\ScreenObserver.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\observer\java\ChangeObserver.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\observer\java\ChangeSubject.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\observer\java\Main.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\observer\java\Point.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\observer\java\Screen.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\prototype\aspectj\Main.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\prototype\aspectj\StringPrototypeA.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\prototype\aspectj\StringPrototypeB.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\prototype\aspectj\StringPrototypes.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\prototype\java\Main.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\prototype\java\StringPrototypeA.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\prototype\java\StringPrototypeB.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\proxy\aspectj\AlternateOutputImplementation.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\proxy\aspectj\Main.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\proxy\aspectj\OutputImplementation.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\proxy\aspectj\RequestBlocking.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\proxy\aspectj\RequestCounting.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\proxy\aspectj\RequestDelegation.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\proxy\java\Main.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\proxy\java\OutputImplementation.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\proxy\java\OutputSubject.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\proxy\java\RequestBlocker.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\proxy\java\RequestCounter.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\singleton\aspectj\Main.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\singleton\aspectj\Printer.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\singleton\aspectj\PrinterSubclass.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\singleton\aspectj\SingletonInstance.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\singleton\java\Main.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\singleton\java\PrinterSingleton.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\singleton\java\PrinterSubclass.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\state\aspectj\Main.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\state\aspectj\Queue.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\state\aspectj\QueueEmpty.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\state\aspectj\QueueFull.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\state\aspectj\QueueNormal.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\state\aspectj\QueueState.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\state\aspectj\QueueStateAspect.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\state\java\Main.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\state\java\Queue.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\state\java\QueueContext.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\state\java\QueueEmpty.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\state\java\QueueFull.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\state\java\QueueNormal.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\state\java\QueueState.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\strategy\aspectj\BubbleSort.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\strategy\aspectj\LinearSort.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\strategy\aspectj\Main.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\strategy\aspectj\Sorter.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\strategy\aspectj\SortingStrategy.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\strategy\java\BubbleSort.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\strategy\java\LinearSort.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\strategy\java\Main.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\strategy\java\Sorter.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\strategy\java\SortingStrategy.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\templateMethod\aspectj\DecoratedStringGenerator.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\templateMethod\aspectj\FancyGenerator.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\templateMethod\aspectj\Generating.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\templateMethod\aspectj\Main.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\templateMethod\aspectj\SimpleGenerator.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\templateMethod\java\DecoratedStringGenerator.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\templateMethod\java\FancyGenerator.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\templateMethod\java\Main.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\templateMethod\java\SimpleGenerator.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\visitor\aspectj\BinaryTreeLeaf.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\visitor\aspectj\BinaryTreeNode.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\visitor\aspectj\Main.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\visitor\aspectj\SummationVisitor.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\visitor\aspectj\TraversalVisitor.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\visitor\aspectj\Visitable.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\visitor\aspectj\Visiting.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\visitor\java\BinaryTreeLeaf.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\visitor\java\BinaryTreeNode.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\visitor\java\BinaryTreeVisitor.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\visitor\java\Main.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\visitor\java\SummationVisitor.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\visitor\java\TraversalVisitor.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\examples\visitor\java\Visitable.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\patternLibrary\ChainOfResponsibilityException.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\patternLibrary\ChainOfResponsibilityProtocol.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\patternLibrary\Command.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\patternLibrary\CommandInvoker.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\patternLibrary\CommandProtocol.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\patternLibrary\CommandReceiver.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\patternLibrary\CompositeProtocol.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\patternLibrary\FlyweightProtocol.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\patternLibrary\MediatorProtocol.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\patternLibrary\Memento.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\patternLibrary\MementoException.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\patternLibrary\MementoProtocol.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\patternLibrary\ObserverProtocol.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\patternLibrary\PrototypeProtocol.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\patternLibrary\ProxyProtocol.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\patternLibrary\SingletonProtocol.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\patternLibrary\StrategyProtocol.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\patternLibrary\VisitorProtocol.java

+c:\home\ws\main\os-aj-hanneman-2004\src\ca\ubc\cs\spl\aspectPatterns\testCenter\TestCenter.java

diff --git a/ajdoc/testdata/patterns/tut-source.lst b/ajdoc/testdata/patterns/tut-source.lst
new file mode 100644
index 000000000..f731cde25
--- /dev/null
+++ b/ajdoc/testdata/patterns/tut-source.lst
@@ -0,0 +1,5 @@
+-sourceroots

+.

+-aspectpath

+../../../patternLibrary/lib.jar

+

diff --git a/ajdoc/testdata/simple/fluffy/Fluffy.java b/ajdoc/testdata/simple/fluffy/Fluffy.java
deleted file mode 100644
index 53bd7b97a..000000000
--- a/ajdoc/testdata/simple/fluffy/Fluffy.java
+++ /dev/null
@@ -1,9 +0,0 @@
-
-package fluffy;
- 
-public class Fluffy {
-
-	void doIt() { }
-	
-}
- 
\ No newline at end of file
diff --git a/ajdoc/testdata/simple/fluffy/bunny/Bunny.java b/ajdoc/testdata/simple/fluffy/bunny/Bunny.java
deleted file mode 100644
index d4d44c9b5..000000000
--- a/ajdoc/testdata/simple/fluffy/bunny/Bunny.java
+++ /dev/null
@@ -1,9 +0,0 @@
-
-package fluffy.bunny;
- 
-public class Bunny {
-
-	void doIt() { }
-	
-}
- 
\ No newline at end of file
diff --git a/ajdoc/testdata/simple/fluffy/bunny/rocks/Rocks.java b/ajdoc/testdata/simple/fluffy/bunny/rocks/Rocks.java
deleted file mode 100644
index 28d24e611..000000000
--- a/ajdoc/testdata/simple/fluffy/bunny/rocks/Rocks.java
+++ /dev/null
@@ -1,9 +0,0 @@
-
-package fluffy.bunny.rocks;
- 
-public class Rocks {
-
-	void doIt() { }
-	
-}
- 
\ No newline at end of file
diff --git a/ajdoc/testdata/simple/fluffy/bunny/rocks/UseThisAspectForLinkCheckToo.java b/ajdoc/testdata/simple/fluffy/bunny/rocks/UseThisAspectForLinkCheckToo.java
deleted file mode 100644
index 4936cc18c..000000000
--- a/ajdoc/testdata/simple/fluffy/bunny/rocks/UseThisAspectForLinkCheckToo.java
+++ /dev/null
@@ -1,13 +0,0 @@
-
-package fluffy.bunny.rocks;
-
-import foo.*;
-import fluffy.*;
-import fluffy.bunny.*;
-
-public aspect UseThisAspectForLinkCheckToo {
-	
-	before(): execution(* *..*(..)) {
-		System.err.println("yo");
-	}
-} 
\ No newline at end of file
diff --git a/ajdoc/testdata/simple/foo/ClassA.java b/ajdoc/testdata/simple/foo/ClassA.java
deleted file mode 100644
index 097f4a281..000000000
--- a/ajdoc/testdata/simple/foo/ClassA.java
+++ /dev/null
@@ -1,42 +0,0 @@
-
-package foo;
-
-import java.io.IOException;
-
-/**
- * Test class.  This is a comment.
- */  
-public abstract class ClassA implements InterfaceI {
-	
-	/**
-	 * Mumble field.
-	 */
-	public String mumble = "xxx";
-	public int pubfield;
-	private String privfield = "mumble";
-	 
-	public IOException exception = new IOException() {
-		
-	    public String getMumble() { return "mumble"; }
-	};
-	 
-	/**
-	 * Mumbo. Jumbo. 
-	 * 
-	 * @param arg1  integer parameter
-	 */ 
-	void method1(int arg1) throws IOException { 
-		pubfield = arg1;
-	}
-	
-	public void foo() { }
-	
-	static aspect InnerAspect {
-		String s;
-	}
-}
- 
-class SubClass extends ClassA { 
-	 
-	public void foo() { }
-}
\ No newline at end of file
diff --git a/ajdoc/testdata/simple/foo/InterfaceI.java b/ajdoc/testdata/simple/foo/InterfaceI.java
deleted file mode 100644
index 55b018146..000000000
--- a/ajdoc/testdata/simple/foo/InterfaceI.java
+++ /dev/null
@@ -1,6 +0,0 @@
-
-package foo;
-
-public interface InterfaceI { 
-	void foo();
-} 
\ No newline at end of file
diff --git a/ajdoc/testdata/simple/foo/ModelCoverage.java b/ajdoc/testdata/simple/foo/ModelCoverage.java
deleted file mode 100644
index 5c14055c6..000000000
--- a/ajdoc/testdata/simple/foo/ModelCoverage.java
+++ /dev/null
@@ -1,150 +0,0 @@
-
-package foo;
-
-import java.io.*;
-import java.util.List;
- 
-interface I { } 
-
-class Point { 
-	int x;
-	static int sx;
-
-	{ 
-		System.out.println(""); 
-	} 
-
-	{ x = 0; }
-	static { sx = 1; }
-	
-	public Point() { }
-	
-	public int getX() { 
-		return x;	
-	}
-	
-	public void setX(int x) { 
-		this.x = x; 
-	}
-	 
-	public int changeX(int x) { 
-		this.x = x;
-		return x;
-	}
-	
-	void doIt() { 
-		try {
-			File f = new File(".");
-			f.getCanonicalPath();
-		} catch (IOException ioe) {
-			System.err.println("!");	
-		}	
-//		setX(10);
-		new Point();
-	}
-} 
-
-class SubPoint extends Point { }
-
-class Line { }
-
-aspect AdvisesRelationshipCoverage {
-	pointcut methodExecutionP(): execution(void Point.setX(int));
-	before(): methodExecutionP() { }
-  
-	pointcut constructorExecutionP(): execution(Point.new());
-	before(): constructorExecutionP() { }
-
-	pointcut callMethodP(): call(* Point.setX(int));
-	before(): callMethodP() { }
-
-	pointcut callConstructorP(): call(Point.new());
-	before(): callConstructorP() { }
-
-	pointcut getP(): get(int *.*);
-	before(): getP() { }
-
-	pointcut setP(): set(int *.*) && !set(int *.xxx);
-	before(): setP() { }
-
-	pointcut initializationP(): initialization(Point.new(..));
-	before(): initializationP() { }
-
-	pointcut staticinitializationP(): staticinitialization(Point);
-	before(): staticinitializationP() { }
-
-	pointcut handlerP(): handler(IOException);
-	before(): handlerP() { }
-
-//    before(): within(*) && execution(* Point.setX(..)) { }
-//    before(): within(*) && execution(Point.new()) { }
-}
-
-aspect AdviceNamingCoverage {
-	pointcut named(): call(* *.mumble());
-	pointcut namedWithOneArg(int i): call(int Point.changeX(int)) && args(i);
-	pointcut namedWithArgs(int i, int j): set(int Point.x) && args(i, j);
-
-	after(): named() { }	
-	after(int i, int j) returning: namedWithArgs(i, j) { }
-	after() throwing: named() { }
-	after(): named() { } 
-	
-	before(): named() { }
-	
-	int around(int i): namedWithOneArg(i) { return i;}
-	int around(int i) throws SizeException: namedWithOneArg(i) { return proceed(i); }
-	
-	before(): named() { }	
-	before(int i): call(* *.mumble()) && named() && namedWithOneArg(i) { }	
-	before(int i): named() && call(* *.mumble()) && namedWithOneArg(i) { }	
-	
-	before(): call(* *.mumble()) { }
-}
-  
-abstract aspect AbstractAspect {
-	abstract pointcut abPtct();	
-}
-  
-aspect InterTypeDecCoverage {
-    public int Point.xxx = 0;
-    public int Point.check(int i, Line l) { return 1 + i; }
-}
-
-aspect DeclareCoverage {
-
-    pointcut illegalNewFigElt(): call(Point.new(..)) && !withincode(* *.doIt(..));
-
-    declare error: illegalNewFigElt(): "Illegal constructor call.";
-    declare warning: call(* Point.setX(..)): "Illegal call.";
-
-    declare parents: Point extends java.io.Serializable;
-    declare parents: Point+ implements java.util.Observable;
-	declare parents: Point && Line implements java.util.Observable;
-    declare soft: SizeException : call(* Point.getX());
-	declare precedence: AdviceCoverage, InterTypeDecCoverage, *;
-//	public Line.new(String s) {  }
-}
-
-class SizeException extends Exception { } 
-
-aspect AdviceCoverage {
-
-}
-
-abstract class ModifiersCoverage {
-	private int a;
-	protected int b;
-	public int c;
-	int d;
-
-	static int staticA;
-	final int finalA = 0;
-	
-	abstract void abstractM();
-}
-
-
-
-
-
diff --git a/ajdoc/testdata/simple/foo/PlainJava.java b/ajdoc/testdata/simple/foo/PlainJava.java
deleted file mode 100644
index ed1408b01..000000000
--- a/ajdoc/testdata/simple/foo/PlainJava.java
+++ /dev/null
@@ -1,21 +0,0 @@
-
-package foo;
-
-import java.io.*;
-
-public class PlainJava {
-	public int i;
-	 
-	public int getI() { 
-		assert true;
-		
-		new FileFilter() {
-			public boolean accept(File f) {
-				boolean accept = !(f.isDirectory() || f.getName().endsWith(".class")) ;
-				return accept;
-			}  
-		};
-		
-		return i; 
-	}
-} 
\ No newline at end of file
diff --git a/ajdoc/testdata/simple/foo/UseThisAspectForLinkCheck.java b/ajdoc/testdata/simple/foo/UseThisAspectForLinkCheck.java
deleted file mode 100644
index fa24af093..000000000
--- a/ajdoc/testdata/simple/foo/UseThisAspectForLinkCheck.java
+++ /dev/null
@@ -1,21 +0,0 @@
-
-package foo;
-
-import fluffy.*;
-import fluffy.bunny.*;
-import fluffy.bunny.rocks.*;
-
-public aspect UseThisAspectForLinkCheck {
-	
-	int foo;
-	
-	pointcut allExecutions(): execution(* *..*(..));
-	
-	before(): allExecutions() {
-		System.err.println("yo");
-	}
-
-	after(): allExecutions() {
-		System.err.println("go");
-	}
-} 
\ No newline at end of file
diff --git a/ajdoc/testsrc/org/aspectj/tools/ajdoc/CoverageTestCase.java b/ajdoc/testsrc/org/aspectj/tools/ajdoc/CoverageTestCase.java
index 744f930d6..451f72969 100644
--- a/ajdoc/testsrc/org/aspectj/tools/ajdoc/CoverageTestCase.java
+++ b/ajdoc/testsrc/org/aspectj/tools/ajdoc/CoverageTestCase.java
@@ -22,24 +22,25 @@ import junit.framework.TestCase;
  */
 public class CoverageTestCase extends TestCase {
 	
-	public void testSimpleExample() {
+	public void testCoverage() {
 		  
 //		System.err.println(new File("testdata/figures-demo").exists());
-		File file1 = new File("testdata/simple/foo/ClassA.java");
-		File aspect1 = new File("testdata/simple/foo/UseThisAspectForLinkCheck.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 file5 = new File("testdata/simple/fluffy/Fluffy.java");
-		File file6 = new File("testdata/simple/fluffy/bunny/Bunny.java");
-		File file7 = new File("testdata/simple/fluffy/bunny/rocks/Rocks.java");
-		File file8 = new File("testdata/simple/fluffy/bunny/rocks/UseThisAspectForLinkCheckToo.java");
-		File outdir = new File("testdata/simple/doc");
+		File file1 = new File("testdata/coverage/foo/ClassA.java");
+		File aspect1 = new File("testdata/coverage/foo/UseThisAspectForLinkCheck.java");
+		File file2 = new File("testdata/coverage/foo/InterfaceI.java");
+		File file3 = new File("testdata/coverage/foo/PlainJava.java");
+		File file4 = new File("testdata/coverage/foo/ModelCoverage.java");
+		File file5 = new File("testdata/coverage/fluffy/Fluffy.java");
+		File file6 = new File("testdata/coverage/fluffy/bunny/Bunny.java");
+		File file7 = new File("testdata/coverage/fluffy/bunny/rocks/Rocks.java");
+		File file8 = new File("testdata/coverage/fluffy/bunny/rocks/UseThisAspectForLinkCheckToo.java");
+		File outdir = new File("testdata/coverage/doc");
 		
 		String[] args = { 
 //			"-XajdocDebug",
-			"-source",
+			"-source", 
 			"1.4",
+			"-private",
 			"-d", 
 			outdir.getAbsolutePath(),
 			aspect1.getAbsolutePath(),
@@ -57,8 +58,8 @@ public class CoverageTestCase extends TestCase {
 	}
 
 //	public void testPlainJava() {
-//		File file1 = new File("testdata/simple/foo/PlainJava.java");
-//		File outdir = new File("testdata/simple/doc");
+//		File file1 = new File("testdata/coverage/foo/PlainJava.java");
+//		File outdir = new File("testdata/coverage/doc");
 //		
 //		String[] args = { "-d", 
 //				outdir.getAbsolutePath(),
diff --git a/ajdoc/testsrc/org/aspectj/tools/ajdoc/PatternsTestCase.java b/ajdoc/testsrc/org/aspectj/tools/ajdoc/PatternsTestCase.java
new file mode 100644
index 000000000..d82d5c871
--- /dev/null
+++ b/ajdoc/testsrc/org/aspectj/tools/ajdoc/PatternsTestCase.java
@@ -0,0 +1,98 @@
+/* *******************************************************************
+ * Copyright (c) 2003 Contributors.
+ * All rights reserved. 
+ * This program and the accompanying materials are made available 
+ * under the terms of the Common Public License v1.0 
+ * which accompanies this distribution and is available at 
+ * http://www.eclipse.org/legal/cpl-v10.html 
+ *  
+ * Contributors: 
+ *     Mik Kersten     initial implementation 
+ * ******************************************************************/
+
+package org.aspectj.tools.ajdoc;
+
+import java.io.File;
+
+import junit.framework.TestCase;
+
+/**
+ * A long way to go until full coverage, but this is the place to add more.
+ * 
+ * @author Mik Kersten
+ */
+public class PatternsTestCase extends TestCase {
+	
+	public void testSimpleExample() {
+		  
+//		System.err.println(new File("testdata.figures-demo").exists());
+//		File file1 = new File("testdata/patterns/allPatterns.lst");
+		File outdir = new File("testdata/patterns/doc");
+		File srcdir = new File("../docs/sandbox/ubc-design-patterns/src");
+		
+		String[] args = { 
+//			"-XajdocDebug", 
+			"-d", 
+			outdir.getAbsolutePath(),
+			"-sourcepath", 
+			srcdir.getAbsolutePath(),
+			"ca.ubc.cs.spl.aspectPatterns.patternLibrary",
+			"ca.ubc.cs.spl.aspectPatterns.examples.abstractFactory.java",
+			"ca.ubc.cs.spl.aspectPatterns.examples.abstractFactory.aspectj",
+			"ca.ubc.cs.spl.aspectPatterns.examples.builder.java",
+			"ca.ubc.cs.spl.aspectPatterns.examples.builder.aspectj",
+			"ca.ubc.cs.spl.aspectPatterns.examples.factoryMethod.java",
+			"ca.ubc.cs.spl.aspectPatterns.examples.factoryMethod.aspectj",
+			"ca.ubc.cs.spl.aspectPatterns.examples.prototype.java",
+			"ca.ubc.cs.spl.aspectPatterns.examples.prototype.aspectj",
+			"ca.ubc.cs.spl.aspectPatterns.examples.singleton.java",
+			"ca.ubc.cs.spl.aspectPatterns.examples.singleton.aspectj",
+			"ca.ubc.cs.spl.aspectPatterns.examples.adapter.java",
+			"ca.ubc.cs.spl.aspectPatterns.examples.adapter.aspectj",
+			"ca.ubc.cs.spl.aspectPatterns.examples.bridge.java",
+			"ca.ubc.cs.spl.aspectPatterns.examples.bridge.aspectj",
+			"ca.ubc.cs.spl.aspectPatterns.examples.composite.java",
+			"ca.ubc.cs.spl.aspectPatterns.examples.composite.aspectj",
+			"ca.ubc.cs.spl.aspectPatterns.examples.decorator.java",
+			"ca.ubc.cs.spl.aspectPatterns.examples.decorator.aspectj",
+			"ca.ubc.cs.spl.aspectPatterns.examples.facade.java",
+			"ca.ubc.cs.spl.aspectPatterns.examples.facade.aspectj",
+			"ca.ubc.cs.spl.aspectPatterns.examples.flyweight.java",
+			"ca.ubc.cs.spl.aspectPatterns.examples.flyweight.aspectj",
+			"ca.ubc.cs.spl.aspectPatterns.examples.proxy.java",
+			"ca.ubc.cs.spl.aspectPatterns.examples.proxy.aspectj",
+			"ca.ubc.cs.spl.aspectPatterns.examples.chainOfResponsibility.java",
+			"ca.ubc.cs.spl.aspectPatterns.examples.chainOfResponsibility.aspectj",
+			"ca.ubc.cs.spl.aspectPatterns.examples.command.java",
+			"ca.ubc.cs.spl.aspectPatterns.examples.command.aspectj",
+			"ca.ubc.cs.spl.aspectPatterns.examples.interpreter.java",
+			"ca.ubc.cs.spl.aspectPatterns.examples.interpreter.aspectj",
+			"ca.ubc.cs.spl.aspectPatterns.examples.iterator.java",
+			"ca.ubc.cs.spl.aspectPatterns.examples.iterator.aspectj",
+			"ca.ubc.cs.spl.aspectPatterns.examples.mediator.java",
+			"ca.ubc.cs.spl.aspectPatterns.examples.mediator.aspectj",
+			"ca.ubc.cs.spl.aspectPatterns.examples.memento.java",
+			"ca.ubc.cs.spl.aspectPatterns.examples.memento.aspectj",
+			"ca.ubc.cs.spl.aspectPatterns.examples.observer.java",
+			"ca.ubc.cs.spl.aspectPatterns.examples.observer.aspectj",
+			"ca.ubc.cs.spl.aspectPatterns.examples.state.java",
+			"ca.ubc.cs.spl.aspectPatterns.examples.state.aspectj",
+			"ca.ubc.cs.spl.aspectPatterns.examples.strategy.java",
+			"ca.ubc.cs.spl.aspectPatterns.examples.strategy.aspectj",
+			"ca.ubc.cs.spl.aspectPatterns.examples.templateMethod.java",
+			"ca.ubc.cs.spl.aspectPatterns.examples.templateMethod.aspectj",
+			"ca.ubc.cs.spl.aspectPatterns.examples.visitor.java",
+			"ca.ubc.cs.spl.aspectPatterns.examples.visitor.aspectj"
+		};
+		
+		org.aspectj.tools.ajdoc.Main.main(args);
+	}
+	
+	protected void setUp() throws Exception {
+		super.setUp();
+	}
+	
+	protected void tearDown() throws Exception {
+		super.tearDown();
+	}
+}