From 94557ac9fca2f8b1ed4ae1674d89293d1d3b4376 Mon Sep 17 00:00:00 2001 From: Diomidis Spinellis Date: Wed, 27 Aug 2008 11:33:58 +0000 Subject: [PATCH] Improve UMLGraph references in the generated files. --- src/org/umlgraph/doclet/ClassGraph.java | 6 +++--- src/org/umlgraph/doclet/UmlGraphDoc.java | 4 ++++ testdata/dot-ref/Abstr.dot | 2 +- testdata/dot-ref/Inference.dot | 2 +- testdata/dot-ref/Irp.dot | 2 +- testdata/dot-ref/MultiAssoc.dot | 2 +- testdata/dot-ref/MyVector.dot | 2 +- testdata/dot-ref/Root.dot | 2 +- testdata/dot-ref/RunnableRef.dot | 2 +- testdata/dot-ref/Style.dot | 2 +- testdata/dot-ref/TestHideOp.dot | 2 +- testdata/dot-ref/ViewAll.dot | 2 +- testdata/dot-ref/ViewAllDetailed.dot | 2 +- testdata/dot-ref/ViewAtt.dot | 2 +- testdata/dot-ref/ViewChildEmpty.dot | 2 +- testdata/dot-ref/ViewChildOverride.dot | 2 +- testdata/dot-ref/ViewColors.dot | 2 +- testdata/dot-ref/ViewContext.dot | 2 +- testdata/dot-ref/ViewInterfaces.dot | 2 +- testdata/dot-ref/ViewProduct.dot | 2 +- testdata/dot-ref/ViewSubclasses.dot | 2 +- testdata/dot-ref/advrel.dot | 2 +- testdata/dot-ref/assoc.dot | 2 +- testdata/dot-ref/car.dot | 2 +- testdata/dot-ref/catalina.dot | 2 +- testdata/dot-ref/class-eg.dot | 2 +- testdata/dot-ref/classadd.dot | 2 +- 27 files changed, 32 insertions(+), 28 deletions(-) diff --git a/src/org/umlgraph/doclet/ClassGraph.java b/src/org/umlgraph/doclet/ClassGraph.java index 184f071..2c08881 100644 --- a/src/org/umlgraph/doclet/ClassGraph.java +++ b/src/org/umlgraph/doclet/ClassGraph.java @@ -1112,14 +1112,14 @@ class ClassGraph { os = new FileOutputStream(file); } - // print plologue + // print prologue w = new PrintWriter(new OutputStreamWriter(new BufferedOutputStream(os), opt.outputEncoding)); w.println( "#!/usr/local/bin/dot\n" + "#\n" + "# Class diagram \n" + - "# Generated by UmlGraph version " + - Version.VERSION + " (http://www.spinellis.gr/sw/umlgraph)\n" + + "# Generated by UMLGraph version " + + Version.VERSION + " (http://www.umlgraph.org/)\n" + "#\n\n" + "digraph G {\n" + "\tedge [fontname=\"" + opt.edgeFontName + diff --git a/src/org/umlgraph/doclet/UmlGraphDoc.java b/src/org/umlgraph/doclet/UmlGraphDoc.java index 9527d2f..b7283bf 100644 --- a/src/org/umlgraph/doclet/UmlGraphDoc.java +++ b/src/org/umlgraph/doclet/UmlGraphDoc.java @@ -214,6 +214,10 @@ public class UmlGraphDoc { String tag = String.format(UML_DIV_TAG, className); if (opt.collapsibleDiagrams) tag = String.format(EXPANDABLE_UML, tag, "Show UML class diagram", "Hide UML class diagram"); + writer.write(""); + writer.newLine(); writer.write(tag); writer.newLine(); } diff --git a/testdata/dot-ref/Abstr.dot b/testdata/dot-ref/Abstr.dot index cccbb63..bc43023 100644 --- a/testdata/dot-ref/Abstr.dot +++ b/testdata/dot-ref/Abstr.dot @@ -1,7 +1,7 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UMLGraph version 5.1 (http://www.umlgraph.org/) # digraph G { diff --git a/testdata/dot-ref/Inference.dot b/testdata/dot-ref/Inference.dot index 97a8451..e629c9d 100644 --- a/testdata/dot-ref/Inference.dot +++ b/testdata/dot-ref/Inference.dot @@ -1,7 +1,7 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UMLGraph version 5.1 (http://www.umlgraph.org/) # digraph G { diff --git a/testdata/dot-ref/Irp.dot b/testdata/dot-ref/Irp.dot index e2f4c62..ca9c108 100644 --- a/testdata/dot-ref/Irp.dot +++ b/testdata/dot-ref/Irp.dot @@ -1,7 +1,7 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UMLGraph version 5.1 (http://www.umlgraph.org/) # digraph G { diff --git a/testdata/dot-ref/MultiAssoc.dot b/testdata/dot-ref/MultiAssoc.dot index 7e3ae6c..5575b15 100644 --- a/testdata/dot-ref/MultiAssoc.dot +++ b/testdata/dot-ref/MultiAssoc.dot @@ -1,7 +1,7 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UMLGraph version 5.1 (http://www.umlgraph.org/) # digraph G { diff --git a/testdata/dot-ref/MyVector.dot b/testdata/dot-ref/MyVector.dot index 18bbd20..ae0b82d 100644 --- a/testdata/dot-ref/MyVector.dot +++ b/testdata/dot-ref/MyVector.dot @@ -1,7 +1,7 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UMLGraph version 5.1 (http://www.umlgraph.org/) # digraph G { diff --git a/testdata/dot-ref/Root.dot b/testdata/dot-ref/Root.dot index 444c7f9..fe7e661 100644 --- a/testdata/dot-ref/Root.dot +++ b/testdata/dot-ref/Root.dot @@ -1,7 +1,7 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UMLGraph version 5.1 (http://www.umlgraph.org/) # digraph G { diff --git a/testdata/dot-ref/RunnableRef.dot b/testdata/dot-ref/RunnableRef.dot index 111628f..9ab80f5 100644 --- a/testdata/dot-ref/RunnableRef.dot +++ b/testdata/dot-ref/RunnableRef.dot @@ -1,7 +1,7 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UMLGraph version 5.1 (http://www.umlgraph.org/) # digraph G { diff --git a/testdata/dot-ref/Style.dot b/testdata/dot-ref/Style.dot index 355c803..f416ea5 100644 --- a/testdata/dot-ref/Style.dot +++ b/testdata/dot-ref/Style.dot @@ -1,7 +1,7 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UMLGraph version 5.1 (http://www.umlgraph.org/) # digraph G { diff --git a/testdata/dot-ref/TestHideOp.dot b/testdata/dot-ref/TestHideOp.dot index 0abcbc4..1c4b30f 100644 --- a/testdata/dot-ref/TestHideOp.dot +++ b/testdata/dot-ref/TestHideOp.dot @@ -1,7 +1,7 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UMLGraph version 5.1 (http://www.umlgraph.org/) # digraph G { diff --git a/testdata/dot-ref/ViewAll.dot b/testdata/dot-ref/ViewAll.dot index fa8e401..889e79b 100644 --- a/testdata/dot-ref/ViewAll.dot +++ b/testdata/dot-ref/ViewAll.dot @@ -1,7 +1,7 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UMLGraph version 5.1 (http://www.umlgraph.org/) # digraph G { diff --git a/testdata/dot-ref/ViewAllDetailed.dot b/testdata/dot-ref/ViewAllDetailed.dot index c616fd1..256e988 100644 --- a/testdata/dot-ref/ViewAllDetailed.dot +++ b/testdata/dot-ref/ViewAllDetailed.dot @@ -1,7 +1,7 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UMLGraph version 5.1 (http://www.umlgraph.org/) # digraph G { diff --git a/testdata/dot-ref/ViewAtt.dot b/testdata/dot-ref/ViewAtt.dot index 89ff32b..b388c2f 100644 --- a/testdata/dot-ref/ViewAtt.dot +++ b/testdata/dot-ref/ViewAtt.dot @@ -1,7 +1,7 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UMLGraph version 5.1 (http://www.umlgraph.org/) # digraph G { diff --git a/testdata/dot-ref/ViewChildEmpty.dot b/testdata/dot-ref/ViewChildEmpty.dot index f6ec59d..18e7c1b 100644 --- a/testdata/dot-ref/ViewChildEmpty.dot +++ b/testdata/dot-ref/ViewChildEmpty.dot @@ -1,7 +1,7 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UMLGraph version 5.1 (http://www.umlgraph.org/) # digraph G { diff --git a/testdata/dot-ref/ViewChildOverride.dot b/testdata/dot-ref/ViewChildOverride.dot index 35ba881..f23f546 100644 --- a/testdata/dot-ref/ViewChildOverride.dot +++ b/testdata/dot-ref/ViewChildOverride.dot @@ -1,7 +1,7 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UMLGraph version 5.1 (http://www.umlgraph.org/) # digraph G { diff --git a/testdata/dot-ref/ViewColors.dot b/testdata/dot-ref/ViewColors.dot index a2f9334..f8a2ab1 100644 --- a/testdata/dot-ref/ViewColors.dot +++ b/testdata/dot-ref/ViewColors.dot @@ -1,7 +1,7 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UMLGraph version 5.1 (http://www.umlgraph.org/) # digraph G { diff --git a/testdata/dot-ref/ViewContext.dot b/testdata/dot-ref/ViewContext.dot index 8163af1..3da6292 100644 --- a/testdata/dot-ref/ViewContext.dot +++ b/testdata/dot-ref/ViewContext.dot @@ -1,7 +1,7 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UMLGraph version 5.1 (http://www.umlgraph.org/) # digraph G { diff --git a/testdata/dot-ref/ViewInterfaces.dot b/testdata/dot-ref/ViewInterfaces.dot index c2eaba8..639b0e7 100644 --- a/testdata/dot-ref/ViewInterfaces.dot +++ b/testdata/dot-ref/ViewInterfaces.dot @@ -1,7 +1,7 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UMLGraph version 5.1 (http://www.umlgraph.org/) # digraph G { diff --git a/testdata/dot-ref/ViewProduct.dot b/testdata/dot-ref/ViewProduct.dot index 2ee8e44..3949020 100644 --- a/testdata/dot-ref/ViewProduct.dot +++ b/testdata/dot-ref/ViewProduct.dot @@ -1,7 +1,7 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UMLGraph version 5.1 (http://www.umlgraph.org/) # digraph G { diff --git a/testdata/dot-ref/ViewSubclasses.dot b/testdata/dot-ref/ViewSubclasses.dot index c537cb4..86c0a8e 100644 --- a/testdata/dot-ref/ViewSubclasses.dot +++ b/testdata/dot-ref/ViewSubclasses.dot @@ -1,7 +1,7 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UMLGraph version 5.1 (http://www.umlgraph.org/) # digraph G { diff --git a/testdata/dot-ref/advrel.dot b/testdata/dot-ref/advrel.dot index 0b53f4b..fcdf09e 100644 --- a/testdata/dot-ref/advrel.dot +++ b/testdata/dot-ref/advrel.dot @@ -1,7 +1,7 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UMLGraph version 5.1 (http://www.umlgraph.org/) # digraph G { diff --git a/testdata/dot-ref/assoc.dot b/testdata/dot-ref/assoc.dot index 25a5116..7c411ef 100644 --- a/testdata/dot-ref/assoc.dot +++ b/testdata/dot-ref/assoc.dot @@ -1,7 +1,7 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UMLGraph version 5.1 (http://www.umlgraph.org/) # digraph G { diff --git a/testdata/dot-ref/car.dot b/testdata/dot-ref/car.dot index b728077..2e582c1 100644 --- a/testdata/dot-ref/car.dot +++ b/testdata/dot-ref/car.dot @@ -1,7 +1,7 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UMLGraph version 5.1 (http://www.umlgraph.org/) # digraph G { diff --git a/testdata/dot-ref/catalina.dot b/testdata/dot-ref/catalina.dot index 92ab096..ce085c7 100644 --- a/testdata/dot-ref/catalina.dot +++ b/testdata/dot-ref/catalina.dot @@ -1,7 +1,7 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UMLGraph version 5.1 (http://www.umlgraph.org/) # digraph G { diff --git a/testdata/dot-ref/class-eg.dot b/testdata/dot-ref/class-eg.dot index 352349e..377a132 100644 --- a/testdata/dot-ref/class-eg.dot +++ b/testdata/dot-ref/class-eg.dot @@ -1,7 +1,7 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UMLGraph version 5.1 (http://www.umlgraph.org/) # digraph G { diff --git a/testdata/dot-ref/classadd.dot b/testdata/dot-ref/classadd.dot index 6ae2422..899bc57 100644 --- a/testdata/dot-ref/classadd.dot +++ b/testdata/dot-ref/classadd.dot @@ -1,7 +1,7 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UMLGraph version 5.1 (http://www.umlgraph.org/) # digraph G {