From ff750de2f412b387a1b62dc35b65014258922845 Mon Sep 17 00:00:00 2001 From: Diomidis Spinellis Date: Mon, 14 Nov 2005 13:05:58 +0000 Subject: [PATCH] Minor fixes to Andrea's patch. --- .../spinellis/umlgraph/doclet/ClassGraph.java | 18 +++++++++--------- .../spinellis/umlgraph/doclet/ClassInfo.java | 18 +++++++++--------- src/gr/spinellis/umlgraph/doclet/Options.java | 18 +++++++++--------- .../spinellis/umlgraph/doclet/StringUtil.java | 18 +++++++++--------- src/gr/spinellis/umlgraph/doclet/UmlGraph.java | 18 +++++++++--------- src/org/umlgraph/doclet/ClassGraph.java | 18 +++++++++--------- src/org/umlgraph/doclet/ClassInfo.java | 18 +++++++++--------- src/org/umlgraph/doclet/Options.java | 18 +++++++++--------- src/org/umlgraph/doclet/StringUtil.java | 18 +++++++++--------- src/org/umlgraph/doclet/UmlGraph.java | 18 +++++++++--------- 10 files changed, 90 insertions(+), 90 deletions(-) diff --git a/src/gr/spinellis/umlgraph/doclet/ClassGraph.java b/src/gr/spinellis/umlgraph/doclet/ClassGraph.java index ee179f0..d4c466a 100644 --- a/src/gr/spinellis/umlgraph/doclet/ClassGraph.java +++ b/src/gr/spinellis/umlgraph/doclet/ClassGraph.java @@ -218,15 +218,13 @@ class Options implements Cloneable { * and printed information */ class ClassInfo { - static int classnum = 0; + private static int classnum; /** Alias name for the class */ String name; /** True if the class class node has been printed */ boolean nodePrinted; /** True if the class class node is hidden */ boolean hidden; - /** The actual class doc, if available */ - ClassDoc classDoc; ClassInfo(boolean p, boolean h) { nodePrinted = p; @@ -234,6 +232,11 @@ class ClassInfo { name = "c" + (new Integer(classnum)).toString(); classnum++; } + + /** Start numbering from zero. */ + public static void reset() { + classnum = 0; + } } /** String utility functions */ @@ -705,7 +708,6 @@ class ClassGraph { if (!hidden(tags[i].text())) { opt.w.println("\t//" + c + " extends " + tags[i].text()); opt.w.println("\t" + name(tags[i].text()) + " -> " + cs + " [dir=back,arrowtail=empty];"); - } } // Print realizations (Java interfaces) @@ -724,8 +726,7 @@ class ClassGraph { relation("depend", c, cs, "arrowhead=open, style=dashed"); } - /** Print classes that were parts of relationships, but not parsed by javadoc - * @param root */ + /** Print classes that were parts of relationships, but not parsed by javadoc */ public void printExtraClasses(Options opt, RootDoc root) { Collection> myClassInfos = classnames.entrySet(); Iterator> iter = myClassInfos.iterator(); @@ -741,7 +742,6 @@ class ClassGraph { printClass(localOpt, c); } else { opt.w.println("\t// " + r); - opt.w.print("\t" + info.name + "[label=\"" + escapeLG(qualifiedName(r)) + "\""); opt.w.print(", fontname=\"" + opt.nodeFontName + "\""); nodeProperties(entry.getKey().toString()); @@ -824,9 +824,9 @@ class ClassGraph { public class UmlGraph { /** Entry point */ public static boolean start(RootDoc root) throws IOException { - ClassInfo.classnum = 0; Options opt = new Options(); - + ClassInfo.reset(); + opt.setOptions(root.options()); opt.openFile(); opt.setOptions(root.classNamed("UMLOptions")); diff --git a/src/gr/spinellis/umlgraph/doclet/ClassInfo.java b/src/gr/spinellis/umlgraph/doclet/ClassInfo.java index ee179f0..d4c466a 100644 --- a/src/gr/spinellis/umlgraph/doclet/ClassInfo.java +++ b/src/gr/spinellis/umlgraph/doclet/ClassInfo.java @@ -218,15 +218,13 @@ class Options implements Cloneable { * and printed information */ class ClassInfo { - static int classnum = 0; + private static int classnum; /** Alias name for the class */ String name; /** True if the class class node has been printed */ boolean nodePrinted; /** True if the class class node is hidden */ boolean hidden; - /** The actual class doc, if available */ - ClassDoc classDoc; ClassInfo(boolean p, boolean h) { nodePrinted = p; @@ -234,6 +232,11 @@ class ClassInfo { name = "c" + (new Integer(classnum)).toString(); classnum++; } + + /** Start numbering from zero. */ + public static void reset() { + classnum = 0; + } } /** String utility functions */ @@ -705,7 +708,6 @@ class ClassGraph { if (!hidden(tags[i].text())) { opt.w.println("\t//" + c + " extends " + tags[i].text()); opt.w.println("\t" + name(tags[i].text()) + " -> " + cs + " [dir=back,arrowtail=empty];"); - } } // Print realizations (Java interfaces) @@ -724,8 +726,7 @@ class ClassGraph { relation("depend", c, cs, "arrowhead=open, style=dashed"); } - /** Print classes that were parts of relationships, but not parsed by javadoc - * @param root */ + /** Print classes that were parts of relationships, but not parsed by javadoc */ public void printExtraClasses(Options opt, RootDoc root) { Collection> myClassInfos = classnames.entrySet(); Iterator> iter = myClassInfos.iterator(); @@ -741,7 +742,6 @@ class ClassGraph { printClass(localOpt, c); } else { opt.w.println("\t// " + r); - opt.w.print("\t" + info.name + "[label=\"" + escapeLG(qualifiedName(r)) + "\""); opt.w.print(", fontname=\"" + opt.nodeFontName + "\""); nodeProperties(entry.getKey().toString()); @@ -824,9 +824,9 @@ class ClassGraph { public class UmlGraph { /** Entry point */ public static boolean start(RootDoc root) throws IOException { - ClassInfo.classnum = 0; Options opt = new Options(); - + ClassInfo.reset(); + opt.setOptions(root.options()); opt.openFile(); opt.setOptions(root.classNamed("UMLOptions")); diff --git a/src/gr/spinellis/umlgraph/doclet/Options.java b/src/gr/spinellis/umlgraph/doclet/Options.java index ee179f0..d4c466a 100644 --- a/src/gr/spinellis/umlgraph/doclet/Options.java +++ b/src/gr/spinellis/umlgraph/doclet/Options.java @@ -218,15 +218,13 @@ class Options implements Cloneable { * and printed information */ class ClassInfo { - static int classnum = 0; + private static int classnum; /** Alias name for the class */ String name; /** True if the class class node has been printed */ boolean nodePrinted; /** True if the class class node is hidden */ boolean hidden; - /** The actual class doc, if available */ - ClassDoc classDoc; ClassInfo(boolean p, boolean h) { nodePrinted = p; @@ -234,6 +232,11 @@ class ClassInfo { name = "c" + (new Integer(classnum)).toString(); classnum++; } + + /** Start numbering from zero. */ + public static void reset() { + classnum = 0; + } } /** String utility functions */ @@ -705,7 +708,6 @@ class ClassGraph { if (!hidden(tags[i].text())) { opt.w.println("\t//" + c + " extends " + tags[i].text()); opt.w.println("\t" + name(tags[i].text()) + " -> " + cs + " [dir=back,arrowtail=empty];"); - } } // Print realizations (Java interfaces) @@ -724,8 +726,7 @@ class ClassGraph { relation("depend", c, cs, "arrowhead=open, style=dashed"); } - /** Print classes that were parts of relationships, but not parsed by javadoc - * @param root */ + /** Print classes that were parts of relationships, but not parsed by javadoc */ public void printExtraClasses(Options opt, RootDoc root) { Collection> myClassInfos = classnames.entrySet(); Iterator> iter = myClassInfos.iterator(); @@ -741,7 +742,6 @@ class ClassGraph { printClass(localOpt, c); } else { opt.w.println("\t// " + r); - opt.w.print("\t" + info.name + "[label=\"" + escapeLG(qualifiedName(r)) + "\""); opt.w.print(", fontname=\"" + opt.nodeFontName + "\""); nodeProperties(entry.getKey().toString()); @@ -824,9 +824,9 @@ class ClassGraph { public class UmlGraph { /** Entry point */ public static boolean start(RootDoc root) throws IOException { - ClassInfo.classnum = 0; Options opt = new Options(); - + ClassInfo.reset(); + opt.setOptions(root.options()); opt.openFile(); opt.setOptions(root.classNamed("UMLOptions")); diff --git a/src/gr/spinellis/umlgraph/doclet/StringUtil.java b/src/gr/spinellis/umlgraph/doclet/StringUtil.java index ee179f0..d4c466a 100644 --- a/src/gr/spinellis/umlgraph/doclet/StringUtil.java +++ b/src/gr/spinellis/umlgraph/doclet/StringUtil.java @@ -218,15 +218,13 @@ class Options implements Cloneable { * and printed information */ class ClassInfo { - static int classnum = 0; + private static int classnum; /** Alias name for the class */ String name; /** True if the class class node has been printed */ boolean nodePrinted; /** True if the class class node is hidden */ boolean hidden; - /** The actual class doc, if available */ - ClassDoc classDoc; ClassInfo(boolean p, boolean h) { nodePrinted = p; @@ -234,6 +232,11 @@ class ClassInfo { name = "c" + (new Integer(classnum)).toString(); classnum++; } + + /** Start numbering from zero. */ + public static void reset() { + classnum = 0; + } } /** String utility functions */ @@ -705,7 +708,6 @@ class ClassGraph { if (!hidden(tags[i].text())) { opt.w.println("\t//" + c + " extends " + tags[i].text()); opt.w.println("\t" + name(tags[i].text()) + " -> " + cs + " [dir=back,arrowtail=empty];"); - } } // Print realizations (Java interfaces) @@ -724,8 +726,7 @@ class ClassGraph { relation("depend", c, cs, "arrowhead=open, style=dashed"); } - /** Print classes that were parts of relationships, but not parsed by javadoc - * @param root */ + /** Print classes that were parts of relationships, but not parsed by javadoc */ public void printExtraClasses(Options opt, RootDoc root) { Collection> myClassInfos = classnames.entrySet(); Iterator> iter = myClassInfos.iterator(); @@ -741,7 +742,6 @@ class ClassGraph { printClass(localOpt, c); } else { opt.w.println("\t// " + r); - opt.w.print("\t" + info.name + "[label=\"" + escapeLG(qualifiedName(r)) + "\""); opt.w.print(", fontname=\"" + opt.nodeFontName + "\""); nodeProperties(entry.getKey().toString()); @@ -824,9 +824,9 @@ class ClassGraph { public class UmlGraph { /** Entry point */ public static boolean start(RootDoc root) throws IOException { - ClassInfo.classnum = 0; Options opt = new Options(); - + ClassInfo.reset(); + opt.setOptions(root.options()); opt.openFile(); opt.setOptions(root.classNamed("UMLOptions")); diff --git a/src/gr/spinellis/umlgraph/doclet/UmlGraph.java b/src/gr/spinellis/umlgraph/doclet/UmlGraph.java index ee179f0..d4c466a 100644 --- a/src/gr/spinellis/umlgraph/doclet/UmlGraph.java +++ b/src/gr/spinellis/umlgraph/doclet/UmlGraph.java @@ -218,15 +218,13 @@ class Options implements Cloneable { * and printed information */ class ClassInfo { - static int classnum = 0; + private static int classnum; /** Alias name for the class */ String name; /** True if the class class node has been printed */ boolean nodePrinted; /** True if the class class node is hidden */ boolean hidden; - /** The actual class doc, if available */ - ClassDoc classDoc; ClassInfo(boolean p, boolean h) { nodePrinted = p; @@ -234,6 +232,11 @@ class ClassInfo { name = "c" + (new Integer(classnum)).toString(); classnum++; } + + /** Start numbering from zero. */ + public static void reset() { + classnum = 0; + } } /** String utility functions */ @@ -705,7 +708,6 @@ class ClassGraph { if (!hidden(tags[i].text())) { opt.w.println("\t//" + c + " extends " + tags[i].text()); opt.w.println("\t" + name(tags[i].text()) + " -> " + cs + " [dir=back,arrowtail=empty];"); - } } // Print realizations (Java interfaces) @@ -724,8 +726,7 @@ class ClassGraph { relation("depend", c, cs, "arrowhead=open, style=dashed"); } - /** Print classes that were parts of relationships, but not parsed by javadoc - * @param root */ + /** Print classes that were parts of relationships, but not parsed by javadoc */ public void printExtraClasses(Options opt, RootDoc root) { Collection> myClassInfos = classnames.entrySet(); Iterator> iter = myClassInfos.iterator(); @@ -741,7 +742,6 @@ class ClassGraph { printClass(localOpt, c); } else { opt.w.println("\t// " + r); - opt.w.print("\t" + info.name + "[label=\"" + escapeLG(qualifiedName(r)) + "\""); opt.w.print(", fontname=\"" + opt.nodeFontName + "\""); nodeProperties(entry.getKey().toString()); @@ -824,9 +824,9 @@ class ClassGraph { public class UmlGraph { /** Entry point */ public static boolean start(RootDoc root) throws IOException { - ClassInfo.classnum = 0; Options opt = new Options(); - + ClassInfo.reset(); + opt.setOptions(root.options()); opt.openFile(); opt.setOptions(root.classNamed("UMLOptions")); diff --git a/src/org/umlgraph/doclet/ClassGraph.java b/src/org/umlgraph/doclet/ClassGraph.java index ee179f0..d4c466a 100644 --- a/src/org/umlgraph/doclet/ClassGraph.java +++ b/src/org/umlgraph/doclet/ClassGraph.java @@ -218,15 +218,13 @@ class Options implements Cloneable { * and printed information */ class ClassInfo { - static int classnum = 0; + private static int classnum; /** Alias name for the class */ String name; /** True if the class class node has been printed */ boolean nodePrinted; /** True if the class class node is hidden */ boolean hidden; - /** The actual class doc, if available */ - ClassDoc classDoc; ClassInfo(boolean p, boolean h) { nodePrinted = p; @@ -234,6 +232,11 @@ class ClassInfo { name = "c" + (new Integer(classnum)).toString(); classnum++; } + + /** Start numbering from zero. */ + public static void reset() { + classnum = 0; + } } /** String utility functions */ @@ -705,7 +708,6 @@ class ClassGraph { if (!hidden(tags[i].text())) { opt.w.println("\t//" + c + " extends " + tags[i].text()); opt.w.println("\t" + name(tags[i].text()) + " -> " + cs + " [dir=back,arrowtail=empty];"); - } } // Print realizations (Java interfaces) @@ -724,8 +726,7 @@ class ClassGraph { relation("depend", c, cs, "arrowhead=open, style=dashed"); } - /** Print classes that were parts of relationships, but not parsed by javadoc - * @param root */ + /** Print classes that were parts of relationships, but not parsed by javadoc */ public void printExtraClasses(Options opt, RootDoc root) { Collection> myClassInfos = classnames.entrySet(); Iterator> iter = myClassInfos.iterator(); @@ -741,7 +742,6 @@ class ClassGraph { printClass(localOpt, c); } else { opt.w.println("\t// " + r); - opt.w.print("\t" + info.name + "[label=\"" + escapeLG(qualifiedName(r)) + "\""); opt.w.print(", fontname=\"" + opt.nodeFontName + "\""); nodeProperties(entry.getKey().toString()); @@ -824,9 +824,9 @@ class ClassGraph { public class UmlGraph { /** Entry point */ public static boolean start(RootDoc root) throws IOException { - ClassInfo.classnum = 0; Options opt = new Options(); - + ClassInfo.reset(); + opt.setOptions(root.options()); opt.openFile(); opt.setOptions(root.classNamed("UMLOptions")); diff --git a/src/org/umlgraph/doclet/ClassInfo.java b/src/org/umlgraph/doclet/ClassInfo.java index ee179f0..d4c466a 100644 --- a/src/org/umlgraph/doclet/ClassInfo.java +++ b/src/org/umlgraph/doclet/ClassInfo.java @@ -218,15 +218,13 @@ class Options implements Cloneable { * and printed information */ class ClassInfo { - static int classnum = 0; + private static int classnum; /** Alias name for the class */ String name; /** True if the class class node has been printed */ boolean nodePrinted; /** True if the class class node is hidden */ boolean hidden; - /** The actual class doc, if available */ - ClassDoc classDoc; ClassInfo(boolean p, boolean h) { nodePrinted = p; @@ -234,6 +232,11 @@ class ClassInfo { name = "c" + (new Integer(classnum)).toString(); classnum++; } + + /** Start numbering from zero. */ + public static void reset() { + classnum = 0; + } } /** String utility functions */ @@ -705,7 +708,6 @@ class ClassGraph { if (!hidden(tags[i].text())) { opt.w.println("\t//" + c + " extends " + tags[i].text()); opt.w.println("\t" + name(tags[i].text()) + " -> " + cs + " [dir=back,arrowtail=empty];"); - } } // Print realizations (Java interfaces) @@ -724,8 +726,7 @@ class ClassGraph { relation("depend", c, cs, "arrowhead=open, style=dashed"); } - /** Print classes that were parts of relationships, but not parsed by javadoc - * @param root */ + /** Print classes that were parts of relationships, but not parsed by javadoc */ public void printExtraClasses(Options opt, RootDoc root) { Collection> myClassInfos = classnames.entrySet(); Iterator> iter = myClassInfos.iterator(); @@ -741,7 +742,6 @@ class ClassGraph { printClass(localOpt, c); } else { opt.w.println("\t// " + r); - opt.w.print("\t" + info.name + "[label=\"" + escapeLG(qualifiedName(r)) + "\""); opt.w.print(", fontname=\"" + opt.nodeFontName + "\""); nodeProperties(entry.getKey().toString()); @@ -824,9 +824,9 @@ class ClassGraph { public class UmlGraph { /** Entry point */ public static boolean start(RootDoc root) throws IOException { - ClassInfo.classnum = 0; Options opt = new Options(); - + ClassInfo.reset(); + opt.setOptions(root.options()); opt.openFile(); opt.setOptions(root.classNamed("UMLOptions")); diff --git a/src/org/umlgraph/doclet/Options.java b/src/org/umlgraph/doclet/Options.java index ee179f0..d4c466a 100644 --- a/src/org/umlgraph/doclet/Options.java +++ b/src/org/umlgraph/doclet/Options.java @@ -218,15 +218,13 @@ class Options implements Cloneable { * and printed information */ class ClassInfo { - static int classnum = 0; + private static int classnum; /** Alias name for the class */ String name; /** True if the class class node has been printed */ boolean nodePrinted; /** True if the class class node is hidden */ boolean hidden; - /** The actual class doc, if available */ - ClassDoc classDoc; ClassInfo(boolean p, boolean h) { nodePrinted = p; @@ -234,6 +232,11 @@ class ClassInfo { name = "c" + (new Integer(classnum)).toString(); classnum++; } + + /** Start numbering from zero. */ + public static void reset() { + classnum = 0; + } } /** String utility functions */ @@ -705,7 +708,6 @@ class ClassGraph { if (!hidden(tags[i].text())) { opt.w.println("\t//" + c + " extends " + tags[i].text()); opt.w.println("\t" + name(tags[i].text()) + " -> " + cs + " [dir=back,arrowtail=empty];"); - } } // Print realizations (Java interfaces) @@ -724,8 +726,7 @@ class ClassGraph { relation("depend", c, cs, "arrowhead=open, style=dashed"); } - /** Print classes that were parts of relationships, but not parsed by javadoc - * @param root */ + /** Print classes that were parts of relationships, but not parsed by javadoc */ public void printExtraClasses(Options opt, RootDoc root) { Collection> myClassInfos = classnames.entrySet(); Iterator> iter = myClassInfos.iterator(); @@ -741,7 +742,6 @@ class ClassGraph { printClass(localOpt, c); } else { opt.w.println("\t// " + r); - opt.w.print("\t" + info.name + "[label=\"" + escapeLG(qualifiedName(r)) + "\""); opt.w.print(", fontname=\"" + opt.nodeFontName + "\""); nodeProperties(entry.getKey().toString()); @@ -824,9 +824,9 @@ class ClassGraph { public class UmlGraph { /** Entry point */ public static boolean start(RootDoc root) throws IOException { - ClassInfo.classnum = 0; Options opt = new Options(); - + ClassInfo.reset(); + opt.setOptions(root.options()); opt.openFile(); opt.setOptions(root.classNamed("UMLOptions")); diff --git a/src/org/umlgraph/doclet/StringUtil.java b/src/org/umlgraph/doclet/StringUtil.java index ee179f0..d4c466a 100644 --- a/src/org/umlgraph/doclet/StringUtil.java +++ b/src/org/umlgraph/doclet/StringUtil.java @@ -218,15 +218,13 @@ class Options implements Cloneable { * and printed information */ class ClassInfo { - static int classnum = 0; + private static int classnum; /** Alias name for the class */ String name; /** True if the class class node has been printed */ boolean nodePrinted; /** True if the class class node is hidden */ boolean hidden; - /** The actual class doc, if available */ - ClassDoc classDoc; ClassInfo(boolean p, boolean h) { nodePrinted = p; @@ -234,6 +232,11 @@ class ClassInfo { name = "c" + (new Integer(classnum)).toString(); classnum++; } + + /** Start numbering from zero. */ + public static void reset() { + classnum = 0; + } } /** String utility functions */ @@ -705,7 +708,6 @@ class ClassGraph { if (!hidden(tags[i].text())) { opt.w.println("\t//" + c + " extends " + tags[i].text()); opt.w.println("\t" + name(tags[i].text()) + " -> " + cs + " [dir=back,arrowtail=empty];"); - } } // Print realizations (Java interfaces) @@ -724,8 +726,7 @@ class ClassGraph { relation("depend", c, cs, "arrowhead=open, style=dashed"); } - /** Print classes that were parts of relationships, but not parsed by javadoc - * @param root */ + /** Print classes that were parts of relationships, but not parsed by javadoc */ public void printExtraClasses(Options opt, RootDoc root) { Collection> myClassInfos = classnames.entrySet(); Iterator> iter = myClassInfos.iterator(); @@ -741,7 +742,6 @@ class ClassGraph { printClass(localOpt, c); } else { opt.w.println("\t// " + r); - opt.w.print("\t" + info.name + "[label=\"" + escapeLG(qualifiedName(r)) + "\""); opt.w.print(", fontname=\"" + opt.nodeFontName + "\""); nodeProperties(entry.getKey().toString()); @@ -824,9 +824,9 @@ class ClassGraph { public class UmlGraph { /** Entry point */ public static boolean start(RootDoc root) throws IOException { - ClassInfo.classnum = 0; Options opt = new Options(); - + ClassInfo.reset(); + opt.setOptions(root.options()); opt.openFile(); opt.setOptions(root.classNamed("UMLOptions")); diff --git a/src/org/umlgraph/doclet/UmlGraph.java b/src/org/umlgraph/doclet/UmlGraph.java index ee179f0..d4c466a 100644 --- a/src/org/umlgraph/doclet/UmlGraph.java +++ b/src/org/umlgraph/doclet/UmlGraph.java @@ -218,15 +218,13 @@ class Options implements Cloneable { * and printed information */ class ClassInfo { - static int classnum = 0; + private static int classnum; /** Alias name for the class */ String name; /** True if the class class node has been printed */ boolean nodePrinted; /** True if the class class node is hidden */ boolean hidden; - /** The actual class doc, if available */ - ClassDoc classDoc; ClassInfo(boolean p, boolean h) { nodePrinted = p; @@ -234,6 +232,11 @@ class ClassInfo { name = "c" + (new Integer(classnum)).toString(); classnum++; } + + /** Start numbering from zero. */ + public static void reset() { + classnum = 0; + } } /** String utility functions */ @@ -705,7 +708,6 @@ class ClassGraph { if (!hidden(tags[i].text())) { opt.w.println("\t//" + c + " extends " + tags[i].text()); opt.w.println("\t" + name(tags[i].text()) + " -> " + cs + " [dir=back,arrowtail=empty];"); - } } // Print realizations (Java interfaces) @@ -724,8 +726,7 @@ class ClassGraph { relation("depend", c, cs, "arrowhead=open, style=dashed"); } - /** Print classes that were parts of relationships, but not parsed by javadoc - * @param root */ + /** Print classes that were parts of relationships, but not parsed by javadoc */ public void printExtraClasses(Options opt, RootDoc root) { Collection> myClassInfos = classnames.entrySet(); Iterator> iter = myClassInfos.iterator(); @@ -741,7 +742,6 @@ class ClassGraph { printClass(localOpt, c); } else { opt.w.println("\t// " + r); - opt.w.print("\t" + info.name + "[label=\"" + escapeLG(qualifiedName(r)) + "\""); opt.w.print(", fontname=\"" + opt.nodeFontName + "\""); nodeProperties(entry.getKey().toString()); @@ -824,9 +824,9 @@ class ClassGraph { public class UmlGraph { /** Entry point */ public static boolean start(RootDoc root) throws IOException { - ClassInfo.classnum = 0; Options opt = new Options(); - + ClassInfo.reset(); + opt.setOptions(root.options()); opt.openFile(); opt.setOptions(root.classNamed("UMLOptions"));