From a96f72189763533645ff0f5d57a38005cab41f2b Mon Sep 17 00:00:00 2001 From: Andrea Aime Date: Sat, 28 Jan 2006 10:11:56 +0000 Subject: [PATCH] Changed view building so that a RootDoc is added to their constructor (some kind of @match need it) --- src/gr/spinellis/umlgraph/doclet/UmlGraph.java | 10 +++++----- src/org/umlgraph/doclet/UmlGraph.java | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/gr/spinellis/umlgraph/doclet/UmlGraph.java b/src/gr/spinellis/umlgraph/doclet/UmlGraph.java index e8b3b9e..8c0e0cd 100644 --- a/src/gr/spinellis/umlgraph/doclet/UmlGraph.java +++ b/src/gr/spinellis/umlgraph/doclet/UmlGraph.java @@ -114,7 +114,7 @@ public class UmlGraph { System.out.println(viewClass + " is an abstract view, no output will be generated!"); return null; } - return new View[] { buildView(viewClass, opt) }; + return new View[] { buildView(root, viewClass, opt) }; } else if (opt.findViews) { List views = new ArrayList(); ClassDoc[] classes = root.classes(); @@ -122,7 +122,7 @@ public class UmlGraph { // find view classes for (int i = 0; i < classes.length; i++) { if (classes[i].tags("view").length > 0 && !classes[i].isAbstract()) { - views.add(buildView(classes[i], opt)); + views.add(buildView(root, classes[i], opt)); } } @@ -135,12 +135,12 @@ public class UmlGraph { /** * Builds a view along with its parent views, recursively */ - private static View buildView(ClassDoc viewClass, OptionProvider provider) { + private static View buildView(RootDoc root, ClassDoc viewClass, OptionProvider provider) { ClassDoc superClass = viewClass.superclass(); if(superClass == null || superClass.tags("view").length == 0) - return new View(viewClass, provider); + return new View(root, viewClass, provider); - return new View(viewClass, buildView(superClass, provider)); + return new View(root, viewClass, buildView(root, superClass, provider)); } /** Option checking */ diff --git a/src/org/umlgraph/doclet/UmlGraph.java b/src/org/umlgraph/doclet/UmlGraph.java index e8b3b9e..8c0e0cd 100644 --- a/src/org/umlgraph/doclet/UmlGraph.java +++ b/src/org/umlgraph/doclet/UmlGraph.java @@ -114,7 +114,7 @@ public class UmlGraph { System.out.println(viewClass + " is an abstract view, no output will be generated!"); return null; } - return new View[] { buildView(viewClass, opt) }; + return new View[] { buildView(root, viewClass, opt) }; } else if (opt.findViews) { List views = new ArrayList(); ClassDoc[] classes = root.classes(); @@ -122,7 +122,7 @@ public class UmlGraph { // find view classes for (int i = 0; i < classes.length; i++) { if (classes[i].tags("view").length > 0 && !classes[i].isAbstract()) { - views.add(buildView(classes[i], opt)); + views.add(buildView(root, classes[i], opt)); } } @@ -135,12 +135,12 @@ public class UmlGraph { /** * Builds a view along with its parent views, recursively */ - private static View buildView(ClassDoc viewClass, OptionProvider provider) { + private static View buildView(RootDoc root, ClassDoc viewClass, OptionProvider provider) { ClassDoc superClass = viewClass.superclass(); if(superClass == null || superClass.tags("view").length == 0) - return new View(viewClass, provider); + return new View(root, viewClass, provider); - return new View(viewClass, buildView(superClass, provider)); + return new View(root, viewClass, buildView(root, superClass, provider)); } /** Option checking */