natas_hw
/
UMLGraph
mirror of https://github.com/dspinellis/UMLGraph
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Style fixes. 

Added missing close quote in a URL.
This commit is contained in:
Diomidis Spinellis 2004-05-29 10:07:33 +00:00
parent 16142d9ff5
commit fdf2b8c041
10 changed files with 50 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/gr/spinellis/umlgraph/doclet/ClassGraph.java
View File

@ -449,9 +449,7 @@ class ClassGraph {
opt.w.print(", style=filled, fillcolor=\"" + opt.nodeFillColor + "\""); opt.w.print(", style=filled, fillcolor=\"" + opt.nodeFillColor + "\"");
opt.w.print(", fontcolor=\"" + opt.nodeFontColor + "\""); opt.w.print(", fontcolor=\"" + opt.nodeFontColor + "\"");
opt.w.print(", fontsize=" + opt.nodeFontSize); opt.w.print(", fontsize=" + opt.nodeFontSize);
String url = classToUrl(c.qualifiedName()); opt.w.print(", URL=\"" + classToUrl(c.qualifiedName())+ "\"");
if (url != null)
opt.w.print(", URL=\"" + url + "\"");
opt.w.println("];"); opt.w.println("];");
ci.nodePrinted = true; ci.nodePrinted = true;
} }
@ -552,7 +550,7 @@ class ClassGraph {
opt.w.print(", style=filled, fillcolor=\"" + opt.nodeFillColor + "\""); opt.w.print(", style=filled, fillcolor=\"" + opt.nodeFillColor + "\"");
opt.w.print(", fontcolor=\"" + opt.nodeFontColor + "\""); opt.w.print(", fontcolor=\"" + opt.nodeFontColor + "\"");
opt.w.print(", fontsize=" + opt.nodeFontSize); opt.w.print(", fontsize=" + opt.nodeFontSize);
opt.w.print(", URL=\"" + classToUrl(entry.getKey().toString())); opt.w.print(", URL=\"" + classToUrl(entry.getKey().toString()) + "\"");
opt.w.println("]"); opt.w.println("]");
} }
} }
@ -615,8 +613,7 @@ public class UmlGraph {
private static Options opt = new Options(); private static Options opt = new Options();
/** Entry point */ /** Entry point */
public static boolean start(RootDoc root) public static boolean start(RootDoc root) throws IOException {
throws IOException {
opt.setOptions(root.options()); opt.setOptions(root.options());
opt.openFile(); opt.openFile();
opt.setOptions(root.classNamed("UMLOptions")); opt.setOptions(root.classNamed("UMLOptions"));
@ -624,16 +621,13 @@ public class UmlGraph {
ClassDoc[] classes = root.classes(); ClassDoc[] classes = root.classes();
ClassGraph c = new ClassGraph(root.specifiedPackages()); ClassGraph c = new ClassGraph(root.specifiedPackages());
for (int i = 0; i < classes.length; i++) { for (int i = 0; i < classes.length; i++)
c.print(opt, classes[i]); c.print(opt, classes[i]);
} c.printExtraClasses();
c.printExtraClasses();
epilogue(); epilogue();
return true; return true;
} }
/** Option checking */ /** Option checking */
public static int optionLength(String option) { public static int optionLength(String option) {
if(option.equals("-qualify") || if(option.equals("-qualify") ||

16
src/gr/spinellis/umlgraph/doclet/ClassInfo.java
View File

@ -449,9 +449,7 @@ class ClassGraph {
opt.w.print(", style=filled, fillcolor=\"" + opt.nodeFillColor + "\""); opt.w.print(", style=filled, fillcolor=\"" + opt.nodeFillColor + "\"");
opt.w.print(", fontcolor=\"" + opt.nodeFontColor + "\""); opt.w.print(", fontcolor=\"" + opt.nodeFontColor + "\"");
opt.w.print(", fontsize=" + opt.nodeFontSize); opt.w.print(", fontsize=" + opt.nodeFontSize);
String url = classToUrl(c.qualifiedName()); opt.w.print(", URL=\"" + classToUrl(c.qualifiedName())+ "\"");
if (url != null)
opt.w.print(", URL=\"" + url + "\"");
opt.w.println("];"); opt.w.println("];");
ci.nodePrinted = true; ci.nodePrinted = true;
} }
@ -552,7 +550,7 @@ class ClassGraph {
opt.w.print(", style=filled, fillcolor=\"" + opt.nodeFillColor + "\""); opt.w.print(", style=filled, fillcolor=\"" + opt.nodeFillColor + "\"");
opt.w.print(", fontcolor=\"" + opt.nodeFontColor + "\""); opt.w.print(", fontcolor=\"" + opt.nodeFontColor + "\"");
opt.w.print(", fontsize=" + opt.nodeFontSize); opt.w.print(", fontsize=" + opt.nodeFontSize);
opt.w.print(", URL=\"" + classToUrl(entry.getKey().toString())); opt.w.print(", URL=\"" + classToUrl(entry.getKey().toString()) + "\"");
opt.w.println("]"); opt.w.println("]");
} }
} }
@ -615,8 +613,7 @@ public class UmlGraph {
private static Options opt = new Options(); private static Options opt = new Options();
/** Entry point */ /** Entry point */
public static boolean start(RootDoc root) public static boolean start(RootDoc root) throws IOException {
throws IOException {
opt.setOptions(root.options()); opt.setOptions(root.options());
opt.openFile(); opt.openFile();
opt.setOptions(root.classNamed("UMLOptions")); opt.setOptions(root.classNamed("UMLOptions"));
@ -624,16 +621,13 @@ public class UmlGraph {
ClassDoc[] classes = root.classes(); ClassDoc[] classes = root.classes();
ClassGraph c = new ClassGraph(root.specifiedPackages()); ClassGraph c = new ClassGraph(root.specifiedPackages());
for (int i = 0; i < classes.length; i++) { for (int i = 0; i < classes.length; i++)
c.print(opt, classes[i]); c.print(opt, classes[i]);
} c.printExtraClasses();
c.printExtraClasses();
epilogue(); epilogue();
return true; return true;
} }
/** Option checking */ /** Option checking */
public static int optionLength(String option) { public static int optionLength(String option) {
if(option.equals("-qualify") || if(option.equals("-qualify") ||

16
src/gr/spinellis/umlgraph/doclet/Options.java
View File

@ -449,9 +449,7 @@ class ClassGraph {
opt.w.print(", style=filled, fillcolor=\"" + opt.nodeFillColor + "\""); opt.w.print(", style=filled, fillcolor=\"" + opt.nodeFillColor + "\"");
opt.w.print(", fontcolor=\"" + opt.nodeFontColor + "\""); opt.w.print(", fontcolor=\"" + opt.nodeFontColor + "\"");
opt.w.print(", fontsize=" + opt.nodeFontSize); opt.w.print(", fontsize=" + opt.nodeFontSize);
String url = classToUrl(c.qualifiedName()); opt.w.print(", URL=\"" + classToUrl(c.qualifiedName())+ "\"");
if (url != null)
opt.w.print(", URL=\"" + url + "\"");
opt.w.println("];"); opt.w.println("];");
ci.nodePrinted = true; ci.nodePrinted = true;
} }
@ -552,7 +550,7 @@ class ClassGraph {
opt.w.print(", style=filled, fillcolor=\"" + opt.nodeFillColor + "\""); opt.w.print(", style=filled, fillcolor=\"" + opt.nodeFillColor + "\"");
opt.w.print(", fontcolor=\"" + opt.nodeFontColor + "\""); opt.w.print(", fontcolor=\"" + opt.nodeFontColor + "\"");
opt.w.print(", fontsize=" + opt.nodeFontSize); opt.w.print(", fontsize=" + opt.nodeFontSize);
opt.w.print(", URL=\"" + classToUrl(entry.getKey().toString())); opt.w.print(", URL=\"" + classToUrl(entry.getKey().toString()) + "\"");
opt.w.println("]"); opt.w.println("]");
} }
} }
@ -615,8 +613,7 @@ public class UmlGraph {
private static Options opt = new Options(); private static Options opt = new Options();
/** Entry point */ /** Entry point */
public static boolean start(RootDoc root) public static boolean start(RootDoc root) throws IOException {
throws IOException {
opt.setOptions(root.options()); opt.setOptions(root.options());
opt.openFile(); opt.openFile();
opt.setOptions(root.classNamed("UMLOptions")); opt.setOptions(root.classNamed("UMLOptions"));
@ -624,16 +621,13 @@ public class UmlGraph {
ClassDoc[] classes = root.classes(); ClassDoc[] classes = root.classes();
ClassGraph c = new ClassGraph(root.specifiedPackages()); ClassGraph c = new ClassGraph(root.specifiedPackages());
for (int i = 0; i < classes.length; i++) { for (int i = 0; i < classes.length; i++)
c.print(opt, classes[i]); c.print(opt, classes[i]);
} c.printExtraClasses();
c.printExtraClasses();
epilogue(); epilogue();
return true; return true;
} }
/** Option checking */ /** Option checking */
public static int optionLength(String option) { public static int optionLength(String option) {
if(option.equals("-qualify") || if(option.equals("-qualify") ||

16
src/gr/spinellis/umlgraph/doclet/StringUtil.java
View File

@ -449,9 +449,7 @@ class ClassGraph {
opt.w.print(", style=filled, fillcolor=\"" + opt.nodeFillColor + "\""); opt.w.print(", style=filled, fillcolor=\"" + opt.nodeFillColor + "\"");
opt.w.print(", fontcolor=\"" + opt.nodeFontColor + "\""); opt.w.print(", fontcolor=\"" + opt.nodeFontColor + "\"");
opt.w.print(", fontsize=" + opt.nodeFontSize); opt.w.print(", fontsize=" + opt.nodeFontSize);
String url = classToUrl(c.qualifiedName()); opt.w.print(", URL=\"" + classToUrl(c.qualifiedName())+ "\"");
if (url != null)
opt.w.print(", URL=\"" + url + "\"");
opt.w.println("];"); opt.w.println("];");
ci.nodePrinted = true; ci.nodePrinted = true;
} }
@ -552,7 +550,7 @@ class ClassGraph {
opt.w.print(", style=filled, fillcolor=\"" + opt.nodeFillColor + "\""); opt.w.print(", style=filled, fillcolor=\"" + opt.nodeFillColor + "\"");
opt.w.print(", fontcolor=\"" + opt.nodeFontColor + "\""); opt.w.print(", fontcolor=\"" + opt.nodeFontColor + "\"");
opt.w.print(", fontsize=" + opt.nodeFontSize); opt.w.print(", fontsize=" + opt.nodeFontSize);
opt.w.print(", URL=\"" + classToUrl(entry.getKey().toString())); opt.w.print(", URL=\"" + classToUrl(entry.getKey().toString()) + "\"");
opt.w.println("]"); opt.w.println("]");
} }
} }
@ -615,8 +613,7 @@ public class UmlGraph {
private static Options opt = new Options(); private static Options opt = new Options();
/** Entry point */ /** Entry point */
public static boolean start(RootDoc root) public static boolean start(RootDoc root) throws IOException {
throws IOException {
opt.setOptions(root.options()); opt.setOptions(root.options());
opt.openFile(); opt.openFile();
opt.setOptions(root.classNamed("UMLOptions")); opt.setOptions(root.classNamed("UMLOptions"));
@ -624,16 +621,13 @@ public class UmlGraph {
ClassDoc[] classes = root.classes(); ClassDoc[] classes = root.classes();
ClassGraph c = new ClassGraph(root.specifiedPackages()); ClassGraph c = new ClassGraph(root.specifiedPackages());
for (int i = 0; i < classes.length; i++) { for (int i = 0; i < classes.length; i++)
c.print(opt, classes[i]); c.print(opt, classes[i]);
} c.printExtraClasses();
c.printExtraClasses();
epilogue(); epilogue();
return true; return true;
} }
/** Option checking */ /** Option checking */
public static int optionLength(String option) { public static int optionLength(String option) {
if(option.equals("-qualify") || if(option.equals("-qualify") ||

16
src/gr/spinellis/umlgraph/doclet/UmlGraph.java
View File

@ -449,9 +449,7 @@ class ClassGraph {
opt.w.print(", style=filled, fillcolor=\"" + opt.nodeFillColor + "\""); opt.w.print(", style=filled, fillcolor=\"" + opt.nodeFillColor + "\"");
opt.w.print(", fontcolor=\"" + opt.nodeFontColor + "\""); opt.w.print(", fontcolor=\"" + opt.nodeFontColor + "\"");
opt.w.print(", fontsize=" + opt.nodeFontSize); opt.w.print(", fontsize=" + opt.nodeFontSize);
String url = classToUrl(c.qualifiedName()); opt.w.print(", URL=\"" + classToUrl(c.qualifiedName())+ "\"");
if (url != null)
opt.w.print(", URL=\"" + url + "\"");
opt.w.println("];"); opt.w.println("];");
ci.nodePrinted = true; ci.nodePrinted = true;
} }
@ -552,7 +550,7 @@ class ClassGraph {
opt.w.print(", style=filled, fillcolor=\"" + opt.nodeFillColor + "\""); opt.w.print(", style=filled, fillcolor=\"" + opt.nodeFillColor + "\"");
opt.w.print(", fontcolor=\"" + opt.nodeFontColor + "\""); opt.w.print(", fontcolor=\"" + opt.nodeFontColor + "\"");
opt.w.print(", fontsize=" + opt.nodeFontSize); opt.w.print(", fontsize=" + opt.nodeFontSize);
opt.w.print(", URL=\"" + classToUrl(entry.getKey().toString())); opt.w.print(", URL=\"" + classToUrl(entry.getKey().toString()) + "\"");
opt.w.println("]"); opt.w.println("]");
} }
} }
@ -615,8 +613,7 @@ public class UmlGraph {
private static Options opt = new Options(); private static Options opt = new Options();
/** Entry point */ /** Entry point */
public static boolean start(RootDoc root) public static boolean start(RootDoc root) throws IOException {
throws IOException {
opt.setOptions(root.options()); opt.setOptions(root.options());
opt.openFile(); opt.openFile();
opt.setOptions(root.classNamed("UMLOptions")); opt.setOptions(root.classNamed("UMLOptions"));
@ -624,16 +621,13 @@ public class UmlGraph {
ClassDoc[] classes = root.classes(); ClassDoc[] classes = root.classes();
ClassGraph c = new ClassGraph(root.specifiedPackages()); ClassGraph c = new ClassGraph(root.specifiedPackages());
for (int i = 0; i < classes.length; i++) { for (int i = 0; i < classes.length; i++)
c.print(opt, classes[i]); c.print(opt, classes[i]);
} c.printExtraClasses();
c.printExtraClasses();
epilogue(); epilogue();
return true; return true;
} }
/** Option checking */ /** Option checking */
public static int optionLength(String option) { public static int optionLength(String option) {
if(option.equals("-qualify") || if(option.equals("-qualify") ||

16
src/org/umlgraph/doclet/ClassGraph.java
View File

@ -449,9 +449,7 @@ class ClassGraph {
opt.w.print(", style=filled, fillcolor=\"" + opt.nodeFillColor + "\""); opt.w.print(", style=filled, fillcolor=\"" + opt.nodeFillColor + "\"");
opt.w.print(", fontcolor=\"" + opt.nodeFontColor + "\""); opt.w.print(", fontcolor=\"" + opt.nodeFontColor + "\"");
opt.w.print(", fontsize=" + opt.nodeFontSize); opt.w.print(", fontsize=" + opt.nodeFontSize);
String url = classToUrl(c.qualifiedName()); opt.w.print(", URL=\"" + classToUrl(c.qualifiedName())+ "\"");
if (url != null)
opt.w.print(", URL=\"" + url + "\"");
opt.w.println("];"); opt.w.println("];");
ci.nodePrinted = true; ci.nodePrinted = true;
} }
@ -552,7 +550,7 @@ class ClassGraph {
opt.w.print(", style=filled, fillcolor=\"" + opt.nodeFillColor + "\""); opt.w.print(", style=filled, fillcolor=\"" + opt.nodeFillColor + "\"");
opt.w.print(", fontcolor=\"" + opt.nodeFontColor + "\""); opt.w.print(", fontcolor=\"" + opt.nodeFontColor + "\"");
opt.w.print(", fontsize=" + opt.nodeFontSize); opt.w.print(", fontsize=" + opt.nodeFontSize);
opt.w.print(", URL=\"" + classToUrl(entry.getKey().toString())); opt.w.print(", URL=\"" + classToUrl(entry.getKey().toString()) + "\"");
opt.w.println("]"); opt.w.println("]");
} }
} }
@ -615,8 +613,7 @@ public class UmlGraph {
private static Options opt = new Options(); private static Options opt = new Options();
/** Entry point */ /** Entry point */
public static boolean start(RootDoc root) public static boolean start(RootDoc root) throws IOException {
throws IOException {
opt.setOptions(root.options()); opt.setOptions(root.options());
opt.openFile(); opt.openFile();
opt.setOptions(root.classNamed("UMLOptions")); opt.setOptions(root.classNamed("UMLOptions"));
@ -624,16 +621,13 @@ public class UmlGraph {
ClassDoc[] classes = root.classes(); ClassDoc[] classes = root.classes();
ClassGraph c = new ClassGraph(root.specifiedPackages()); ClassGraph c = new ClassGraph(root.specifiedPackages());
for (int i = 0; i < classes.length; i++) { for (int i = 0; i < classes.length; i++)
c.print(opt, classes[i]); c.print(opt, classes[i]);
} c.printExtraClasses();
c.printExtraClasses();
epilogue(); epilogue();
return true; return true;
} }
/** Option checking */ /** Option checking */
public static int optionLength(String option) { public static int optionLength(String option) {
if(option.equals("-qualify") || if(option.equals("-qualify") ||

16
src/org/umlgraph/doclet/ClassInfo.java
View File

@ -449,9 +449,7 @@ class ClassGraph {
opt.w.print(", style=filled, fillcolor=\"" + opt.nodeFillColor + "\""); opt.w.print(", style=filled, fillcolor=\"" + opt.nodeFillColor + "\"");
opt.w.print(", fontcolor=\"" + opt.nodeFontColor + "\""); opt.w.print(", fontcolor=\"" + opt.nodeFontColor + "\"");
opt.w.print(", fontsize=" + opt.nodeFontSize); opt.w.print(", fontsize=" + opt.nodeFontSize);
String url = classToUrl(c.qualifiedName()); opt.w.print(", URL=\"" + classToUrl(c.qualifiedName())+ "\"");
if (url != null)
opt.w.print(", URL=\"" + url + "\"");
opt.w.println("];"); opt.w.println("];");
ci.nodePrinted = true; ci.nodePrinted = true;
} }
@ -552,7 +550,7 @@ class ClassGraph {
opt.w.print(", style=filled, fillcolor=\"" + opt.nodeFillColor + "\""); opt.w.print(", style=filled, fillcolor=\"" + opt.nodeFillColor + "\"");
opt.w.print(", fontcolor=\"" + opt.nodeFontColor + "\""); opt.w.print(", fontcolor=\"" + opt.nodeFontColor + "\"");
opt.w.print(", fontsize=" + opt.nodeFontSize); opt.w.print(", fontsize=" + opt.nodeFontSize);
opt.w.print(", URL=\"" + classToUrl(entry.getKey().toString())); opt.w.print(", URL=\"" + classToUrl(entry.getKey().toString()) + "\"");
opt.w.println("]"); opt.w.println("]");
} }
} }
@ -615,8 +613,7 @@ public class UmlGraph {
private static Options opt = new Options(); private static Options opt = new Options();
/** Entry point */ /** Entry point */
public static boolean start(RootDoc root) public static boolean start(RootDoc root) throws IOException {
throws IOException {
opt.setOptions(root.options()); opt.setOptions(root.options());
opt.openFile(); opt.openFile();
opt.setOptions(root.classNamed("UMLOptions")); opt.setOptions(root.classNamed("UMLOptions"));
@ -624,16 +621,13 @@ public class UmlGraph {
ClassDoc[] classes = root.classes(); ClassDoc[] classes = root.classes();
ClassGraph c = new ClassGraph(root.specifiedPackages()); ClassGraph c = new ClassGraph(root.specifiedPackages());
for (int i = 0; i < classes.length; i++) { for (int i = 0; i < classes.length; i++)
c.print(opt, classes[i]); c.print(opt, classes[i]);
} c.printExtraClasses();
c.printExtraClasses();
epilogue(); epilogue();
return true; return true;
} }
/** Option checking */ /** Option checking */
public static int optionLength(String option) { public static int optionLength(String option) {
if(option.equals("-qualify") || if(option.equals("-qualify") ||

16
src/org/umlgraph/doclet/Options.java
View File

@ -449,9 +449,7 @@ class ClassGraph {
opt.w.print(", style=filled, fillcolor=\"" + opt.nodeFillColor + "\""); opt.w.print(", style=filled, fillcolor=\"" + opt.nodeFillColor + "\"");
opt.w.print(", fontcolor=\"" + opt.nodeFontColor + "\""); opt.w.print(", fontcolor=\"" + opt.nodeFontColor + "\"");
opt.w.print(", fontsize=" + opt.nodeFontSize); opt.w.print(", fontsize=" + opt.nodeFontSize);
String url = classToUrl(c.qualifiedName()); opt.w.print(", URL=\"" + classToUrl(c.qualifiedName())+ "\"");
if (url != null)
opt.w.print(", URL=\"" + url + "\"");
opt.w.println("];"); opt.w.println("];");
ci.nodePrinted = true; ci.nodePrinted = true;
} }
@ -552,7 +550,7 @@ class ClassGraph {
opt.w.print(", style=filled, fillcolor=\"" + opt.nodeFillColor + "\""); opt.w.print(", style=filled, fillcolor=\"" + opt.nodeFillColor + "\"");
opt.w.print(", fontcolor=\"" + opt.nodeFontColor + "\""); opt.w.print(", fontcolor=\"" + opt.nodeFontColor + "\"");
opt.w.print(", fontsize=" + opt.nodeFontSize); opt.w.print(", fontsize=" + opt.nodeFontSize);
opt.w.print(", URL=\"" + classToUrl(entry.getKey().toString())); opt.w.print(", URL=\"" + classToUrl(entry.getKey().toString()) + "\"");
opt.w.println("]"); opt.w.println("]");
} }
} }
@ -615,8 +613,7 @@ public class UmlGraph {
private static Options opt = new Options(); private static Options opt = new Options();
/** Entry point */ /** Entry point */
public static boolean start(RootDoc root) public static boolean start(RootDoc root) throws IOException {
throws IOException {
opt.setOptions(root.options()); opt.setOptions(root.options());
opt.openFile(); opt.openFile();
opt.setOptions(root.classNamed("UMLOptions")); opt.setOptions(root.classNamed("UMLOptions"));
@ -624,16 +621,13 @@ public class UmlGraph {
ClassDoc[] classes = root.classes(); ClassDoc[] classes = root.classes();
ClassGraph c = new ClassGraph(root.specifiedPackages()); ClassGraph c = new ClassGraph(root.specifiedPackages());
for (int i = 0; i < classes.length; i++) { for (int i = 0; i < classes.length; i++)
c.print(opt, classes[i]); c.print(opt, classes[i]);
} c.printExtraClasses();
c.printExtraClasses();
epilogue(); epilogue();
return true; return true;
} }
/** Option checking */ /** Option checking */
public static int optionLength(String option) { public static int optionLength(String option) {
if(option.equals("-qualify") || if(option.equals("-qualify") ||

16
src/org/umlgraph/doclet/StringUtil.java
View File

@ -449,9 +449,7 @@ class ClassGraph {
opt.w.print(", style=filled, fillcolor=\"" + opt.nodeFillColor + "\""); opt.w.print(", style=filled, fillcolor=\"" + opt.nodeFillColor + "\"");
opt.w.print(", fontcolor=\"" + opt.nodeFontColor + "\""); opt.w.print(", fontcolor=\"" + opt.nodeFontColor + "\"");
opt.w.print(", fontsize=" + opt.nodeFontSize); opt.w.print(", fontsize=" + opt.nodeFontSize);
String url = classToUrl(c.qualifiedName()); opt.w.print(", URL=\"" + classToUrl(c.qualifiedName())+ "\"");
if (url != null)
opt.w.print(", URL=\"" + url + "\"");
opt.w.println("];"); opt.w.println("];");
ci.nodePrinted = true; ci.nodePrinted = true;
} }
@ -552,7 +550,7 @@ class ClassGraph {
opt.w.print(", style=filled, fillcolor=\"" + opt.nodeFillColor + "\""); opt.w.print(", style=filled, fillcolor=\"" + opt.nodeFillColor + "\"");
opt.w.print(", fontcolor=\"" + opt.nodeFontColor + "\""); opt.w.print(", fontcolor=\"" + opt.nodeFontColor + "\"");
opt.w.print(", fontsize=" + opt.nodeFontSize); opt.w.print(", fontsize=" + opt.nodeFontSize);
opt.w.print(", URL=\"" + classToUrl(entry.getKey().toString())); opt.w.print(", URL=\"" + classToUrl(entry.getKey().toString()) + "\"");
opt.w.println("]"); opt.w.println("]");
} }
} }
@ -615,8 +613,7 @@ public class UmlGraph {
private static Options opt = new Options(); private static Options opt = new Options();
/** Entry point */ /** Entry point */
public static boolean start(RootDoc root) public static boolean start(RootDoc root) throws IOException {
throws IOException {
opt.setOptions(root.options()); opt.setOptions(root.options());
opt.openFile(); opt.openFile();
opt.setOptions(root.classNamed("UMLOptions")); opt.setOptions(root.classNamed("UMLOptions"));
@ -624,16 +621,13 @@ public class UmlGraph {
ClassDoc[] classes = root.classes(); ClassDoc[] classes = root.classes();
ClassGraph c = new ClassGraph(root.specifiedPackages()); ClassGraph c = new ClassGraph(root.specifiedPackages());
for (int i = 0; i < classes.length; i++) { for (int i = 0; i < classes.length; i++)
c.print(opt, classes[i]); c.print(opt, classes[i]);
} c.printExtraClasses();
c.printExtraClasses();
epilogue(); epilogue();
return true; return true;
} }
/** Option checking */ /** Option checking */
public static int optionLength(String option) { public static int optionLength(String option) {
if(option.equals("-qualify") || if(option.equals("-qualify") ||

16
src/org/umlgraph/doclet/UmlGraph.java
View File

@ -449,9 +449,7 @@ class ClassGraph {
opt.w.print(", style=filled, fillcolor=\"" + opt.nodeFillColor + "\""); opt.w.print(", style=filled, fillcolor=\"" + opt.nodeFillColor + "\"");
opt.w.print(", fontcolor=\"" + opt.nodeFontColor + "\""); opt.w.print(", fontcolor=\"" + opt.nodeFontColor + "\"");
opt.w.print(", fontsize=" + opt.nodeFontSize); opt.w.print(", fontsize=" + opt.nodeFontSize);
String url = classToUrl(c.qualifiedName()); opt.w.print(", URL=\"" + classToUrl(c.qualifiedName())+ "\"");
if (url != null)
opt.w.print(", URL=\"" + url + "\"");
opt.w.println("];"); opt.w.println("];");
ci.nodePrinted = true; ci.nodePrinted = true;
} }
@ -552,7 +550,7 @@ class ClassGraph {
opt.w.print(", style=filled, fillcolor=\"" + opt.nodeFillColor + "\""); opt.w.print(", style=filled, fillcolor=\"" + opt.nodeFillColor + "\"");
opt.w.print(", fontcolor=\"" + opt.nodeFontColor + "\""); opt.w.print(", fontcolor=\"" + opt.nodeFontColor + "\"");
opt.w.print(", fontsize=" + opt.nodeFontSize); opt.w.print(", fontsize=" + opt.nodeFontSize);
opt.w.print(", URL=\"" + classToUrl(entry.getKey().toString())); opt.w.print(", URL=\"" + classToUrl(entry.getKey().toString()) + "\"");
opt.w.println("]"); opt.w.println("]");
} }
} }
@ -615,8 +613,7 @@ public class UmlGraph {
private static Options opt = new Options(); private static Options opt = new Options();
/** Entry point */ /** Entry point */
public static boolean start(RootDoc root) public static boolean start(RootDoc root) throws IOException {
throws IOException {
opt.setOptions(root.options()); opt.setOptions(root.options());
opt.openFile(); opt.openFile();
opt.setOptions(root.classNamed("UMLOptions")); opt.setOptions(root.classNamed("UMLOptions"));
@ -624,16 +621,13 @@ public class UmlGraph {
ClassDoc[] classes = root.classes(); ClassDoc[] classes = root.classes();
ClassGraph c = new ClassGraph(root.specifiedPackages()); ClassGraph c = new ClassGraph(root.specifiedPackages());
for (int i = 0; i < classes.length; i++) { for (int i = 0; i < classes.length; i++)
c.print(opt, classes[i]); c.print(opt, classes[i]);
} c.printExtraClasses();
c.printExtraClasses();
epilogue(); epilogue();
return true; return true;
} }
/** Option checking */ /** Option checking */
public static int optionLength(String option) { public static int optionLength(String option) {
if(option.equals("-qualify") || if(option.equals("-qualify") ||