diff --git a/Makefile b/Makefile index 3226bdc..3fdccf6 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ VERSION:=$(shell git describe --abbrev=6 HEAD | sed 's/R//;s/_/./;s/-/./;s/-.*$$ BALL_TAR_GZ=UMLGraph-$(VERSION).tar.gz ZIPBALL=UMLGraph-$(VERSION).zip DISTDIR=UMLGraph-$(VERSION) -WEBDIR=$(UH)/dds/pubs/web/home/sw/umlgraph-mirror +WEBDIR=$(UH)/dds/pubs/web/home/umlgraph DOCLETSRCPATH=src/main/java/org/umlgraph/doclet DOCLETSRC= \ $(DOCLETSRCPATH)/ClassGraph.java \ diff --git a/README.mediawiki b/README.mediawiki index ecd836b..a26cb1f 100644 --- a/README.mediawiki +++ b/README.mediawiki @@ -3,8 +3,8 @@ ''UMLGraph'' allows the declarative specification and drawing of UML diagrams. You can browse the system's documentation -through [http://umlgraph.org/doc/index.html this link], -or print it through [http://umlgraph.org/doc/indexw.html this link]. +through [http://spinellis.gr/umlgraph/doc/index.html this link], +or print it through [http://spinellis.gr/umlgraph/doc/indexw.html this link]. To install the elements required to run ''UMLGraph'', simply copy the contents of the ''lib'' directory to a location consistent with @@ -16,8 +16,8 @@ To compile the Java doclet from the source code run ''ant'' on the If you change the source code, you can run regression tests by executing ''ant test''. -Visit the project's [http://www.umlgraph.org home page] for more information. +Visit the project's [http://www.spinellis.gr/umlgraph home page] for more information. ---- -Diomidis Spinellis - November 2005, August 2008, April 2012 +Diomidis Spinellis - November 2005, August 2008, April 2012, September 2016 diff --git a/README.txt b/README.txt index f675266..ad3b91a 100644 --- a/README.txt +++ b/README.txt @@ -15,7 +15,7 @@ build.xml file. If you change the source code, you can run regression tests by executing "ant test". -Project home page: http://www.umlgraph.org +Project home page: http://www.spinellis.gr/umlgraph GitHub page: git@github.com:dspinellis/UMLGraph.git -Diomidis Spinellis - November 2005, August 2008, April 2012 +Diomidis Spinellis - November 2005, August 2008, April 2012, September 2016 diff --git a/doc/Makefile b/doc/Makefile index 9dd11d0..2611a20 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -4,7 +4,7 @@ ROOT=/cygdrive/c PIC2PLOT=pic2plot GS=gs -DESTDIR=/dds/pubs/web/home/sw/umlgraph-mirror +DESTDIR=/dds/pubs/web/home/umlgraph NOTETOOLS=/dds/pubs/Courses/tools GIF := $(shell sed -n 's/.*UMLGraph ${version} Declarative Drawing of UML Diagrams - http://www.umlgraph.org + http://www.spinellis.gr/umlgraph diff --git a/pom.xml b/pom.xml index 1e0e4d0..bbb7c9e 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ UMLGraph 5.7.3-SNAPSHOT Declarative Drawing of UML Diagrams - http://www.umlgraph.org + http://www.spinellis.gr/umlgraph diff --git a/src/main/java/org/umlgraph/doclet/ClassGraph.java b/src/main/java/org/umlgraph/doclet/ClassGraph.java index f8a038c..aa5b02a 100644 --- a/src/main/java/org/umlgraph/doclet/ClassGraph.java +++ b/src/main/java/org/umlgraph/doclet/ClassGraph.java @@ -1143,7 +1143,7 @@ class ClassGraph { "#\n" + "# Class diagram \n" + "# Generated by UMLGraph version " + - Version.VERSION + " (http://www.umlgraph.org/)\n" + + Version.VERSION + " (http://www.spinellis.gr/umlgraph/)\n" + "#\n\n" + "digraph G {\n" + "\tedge [fontname=\"" + opt.edgeFontName + diff --git a/src/main/java/org/umlgraph/doclet/UmlGraphDoc.java b/src/main/java/org/umlgraph/doclet/UmlGraphDoc.java index 5cef476..0f9a00f 100644 --- a/src/main/java/org/umlgraph/doclet/UmlGraphDoc.java +++ b/src/main/java/org/umlgraph/doclet/UmlGraphDoc.java @@ -222,7 +222,7 @@ public class UmlGraphDoc { tag = String.format(EXPANDABLE_UML, tag, "Show UML class diagram", "Hide UML class diagram"); writer.write(""); + " (http://www.spinellis.gr/umlgraph/) -->"); writer.newLine(); writer.write(tag); writer.newLine(); diff --git a/src/main/java/org/umlgraph/doclet/Version.java b/src/main/java/org/umlgraph/doclet/Version.java index 6759301..626e9f8 100644 --- a/src/main/java/org/umlgraph/doclet/Version.java +++ b/src/main/java/org/umlgraph/doclet/Version.java @@ -1,4 +1,4 @@ /* Automatically generated file */ package org.umlgraph.doclet; -class Version { public static String VERSION = "R5_7_2-11-g86574a";} +class Version { public static String VERSION = "R5_7_2-22-g58087c";} \ No newline at end of file diff --git a/testdata/dot-ref/ViewInterfaces.dot b/testdata/dot-ref/ViewInterfaces.dot index c6f8f17..f7d2b69 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 R5_7_0-10-g786d98 (http://www.umlgraph.org/) +# Generated by UMLGraph version R5_7_2-20-g09fab1 (http://www.umlgraph.org/) # digraph G { @@ -10,22 +10,22 @@ digraph G { nodesep=0.25; ranksep=0.5; // gr.spinellis.iface.classes.FarImplementor - c533 [label=<
FarImplementor
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c534 [label=<
FarImplementor
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.iface.classes.DirectImplementor - c534 [label=<
DirectImplementor
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c535 [label=<
DirectImplementor
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.iface.classes.SubSubFace - c536 [label=<
«interface»
SubSubFace
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c537 [label=<
«interface»
SubSubFace
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.iface.classes.SubFace - c537 [label=<
«interface»
SubFace
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c538 [label=<
«interface»
SubFace
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.iface.classes.Face - c538 [label=<
«interface»
Face
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c539 [label=<
«interface»
Face
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0]; //gr.spinellis.iface.classes.FarImplementor implements gr.spinellis.iface.classes.SubSubFace - c536:p -> c533:p [dir=back,arrowtail=empty,style=dashed]; + c537:p -> c534:p [dir=back,arrowtail=empty,style=dashed]; //gr.spinellis.iface.classes.DirectImplementor implements gr.spinellis.iface.classes.Face - c538:p -> c534:p [dir=back,arrowtail=empty,style=dashed]; + c539:p -> c535:p [dir=back,arrowtail=empty,style=dashed]; //gr.spinellis.iface.classes.SubSubFace implements gr.spinellis.iface.classes.SubFace - c537:p -> c536:p [dir=back,arrowtail=empty,style=dashed]; - //gr.spinellis.iface.classes.SubFace implements gr.spinellis.iface.classes.Face c538:p -> c537:p [dir=back,arrowtail=empty,style=dashed]; + //gr.spinellis.iface.classes.SubFace implements gr.spinellis.iface.classes.Face + c539:p -> c538:p [dir=back,arrowtail=empty,style=dashed]; } diff --git a/testdata/dot-ref/ViewSubclasses.dot b/testdata/dot-ref/ViewSubclasses.dot index 965eaad..a4034a4 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 R5_7_0-10-g786d98 (http://www.umlgraph.org/) +# Generated by UMLGraph version R5_7_2-20-g09fab1 (http://www.umlgraph.org/) # digraph G { @@ -10,22 +10,22 @@ digraph G { nodesep=0.25; ranksep=0.5; // gr.spinellis.subclass.classes.SubOneTwo - c579 [label=<
SubOneTwo
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c580 [label=<
SubOneTwo
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.subclass.classes.SubOneOne - c580 [label=<
SubOneOne
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c581 [label=<
SubOneOne
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.subclass.classes.SubTwo - c581 [label=<
SubTwo
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c582 [label=<
SubTwo
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.subclass.classes.SubOne - c582 [label=<
SubOne
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c583 [label=<
SubOne
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.subclass.classes.Super - c583 [label=<
Super
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c584 [label=<
Super
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0]; //gr.spinellis.subclass.classes.SubOneTwo extends gr.spinellis.subclass.classes.SubOne - c582:p -> c579:p [dir=back,arrowtail=empty]; + c583:p -> c580:p [dir=back,arrowtail=empty]; //gr.spinellis.subclass.classes.SubOneOne extends gr.spinellis.subclass.classes.SubOne - c582:p -> c580:p [dir=back,arrowtail=empty]; - //gr.spinellis.subclass.classes.SubTwo extends gr.spinellis.subclass.classes.Super c583:p -> c581:p [dir=back,arrowtail=empty]; + //gr.spinellis.subclass.classes.SubTwo extends gr.spinellis.subclass.classes.Super + c584:p -> c582:p [dir=back,arrowtail=empty]; //gr.spinellis.subclass.classes.SubOne extends gr.spinellis.subclass.classes.Super - c583:p -> c582:p [dir=back,arrowtail=empty]; + c584:p -> c583:p [dir=back,arrowtail=empty]; } diff --git a/testdata/umldoc-ref/allclasses-frame.html b/testdata/umldoc-ref/allclasses-frame.html index 9846d5f..28f5e4c 100644 --- a/testdata/umldoc-ref/allclasses-frame.html +++ b/testdata/umldoc-ref/allclasses-frame.html @@ -2,9 +2,9 @@ - + All Classes - + diff --git a/testdata/umldoc-ref/allclasses-noframe.html b/testdata/umldoc-ref/allclasses-noframe.html index e0eaff6..146049b 100644 --- a/testdata/umldoc-ref/allclasses-noframe.html +++ b/testdata/umldoc-ref/allclasses-noframe.html @@ -2,9 +2,9 @@ - + All Classes - + diff --git a/testdata/umldoc-ref/constant-values.html b/testdata/umldoc-ref/constant-values.html index a014f71..8420a09 100644 --- a/testdata/umldoc-ref/constant-values.html +++ b/testdata/umldoc-ref/constant-values.html @@ -2,9 +2,9 @@ - + Constant Field Values - + diff --git a/testdata/umldoc-ref/deprecated-list.html b/testdata/umldoc-ref/deprecated-list.html index 83cd591..b0a26cb 100644 --- a/testdata/umldoc-ref/deprecated-list.html +++ b/testdata/umldoc-ref/deprecated-list.html @@ -2,9 +2,9 @@ - + Deprecated List - + diff --git a/testdata/umldoc-ref/gr/spinellis/invoice/Customer.html b/testdata/umldoc-ref/gr/spinellis/invoice/Customer.html index 2617014..ba23451 100644 --- a/testdata/umldoc-ref/gr/spinellis/invoice/Customer.html +++ b/testdata/umldoc-ref/gr/spinellis/invoice/Customer.html @@ -2,9 +2,9 @@ - + Customer - + @@ -87,7 +87,7 @@
gr.spinellis.invoice

Class Customer

- +
diff --git a/testdata/umldoc-ref/gr/spinellis/invoice/Invoice.html b/testdata/umldoc-ref/gr/spinellis/invoice/Invoice.html index c40f240..5f61204 100644 --- a/testdata/umldoc-ref/gr/spinellis/invoice/Invoice.html +++ b/testdata/umldoc-ref/gr/spinellis/invoice/Invoice.html @@ -2,9 +2,9 @@ - + Invoice - + @@ -93,7 +93,7 @@ var activeTableTab = "activeTableTab";
gr.spinellis.invoice

Class Invoice

- +
diff --git a/testdata/umldoc-ref/gr/spinellis/invoice/InvoiceItem.html b/testdata/umldoc-ref/gr/spinellis/invoice/InvoiceItem.html index f85a4a0..17c264f 100644 --- a/testdata/umldoc-ref/gr/spinellis/invoice/InvoiceItem.html +++ b/testdata/umldoc-ref/gr/spinellis/invoice/InvoiceItem.html @@ -2,9 +2,9 @@ - + InvoiceItem - + @@ -87,7 +87,7 @@
gr.spinellis.invoice

Class InvoiceItem

- +
diff --git a/testdata/umldoc-ref/gr/spinellis/invoice/package-frame.html b/testdata/umldoc-ref/gr/spinellis/invoice/package-frame.html index 11cb12b..411921d 100644 --- a/testdata/umldoc-ref/gr/spinellis/invoice/package-frame.html +++ b/testdata/umldoc-ref/gr/spinellis/invoice/package-frame.html @@ -2,9 +2,9 @@ - + gr.spinellis.invoice - + diff --git a/testdata/umldoc-ref/gr/spinellis/invoice/package-summary.html b/testdata/umldoc-ref/gr/spinellis/invoice/package-summary.html index a6e6f41..d483dd8 100644 --- a/testdata/umldoc-ref/gr/spinellis/invoice/package-summary.html +++ b/testdata/umldoc-ref/gr/spinellis/invoice/package-summary.html @@ -2,9 +2,9 @@ - + gr.spinellis.invoice - + @@ -70,7 +70,7 @@

Package gr.spinellis.invoice

- +
diff --git a/testdata/umldoc-ref/gr/spinellis/invoice/package-tree.html b/testdata/umldoc-ref/gr/spinellis/invoice/package-tree.html index d1baca1..6962278 100644 --- a/testdata/umldoc-ref/gr/spinellis/invoice/package-tree.html +++ b/testdata/umldoc-ref/gr/spinellis/invoice/package-tree.html @@ -2,9 +2,9 @@ - + gr.spinellis.invoice Class Hierarchy - + diff --git a/testdata/umldoc-ref/gr/spinellis/product/Category.html b/testdata/umldoc-ref/gr/spinellis/product/Category.html index 69da1b9..6aa7fdc 100644 --- a/testdata/umldoc-ref/gr/spinellis/product/Category.html +++ b/testdata/umldoc-ref/gr/spinellis/product/Category.html @@ -2,9 +2,9 @@ - + Category - + @@ -87,7 +87,7 @@
gr.spinellis.product

Class Category

- +
diff --git a/testdata/umldoc-ref/gr/spinellis/product/Product.html b/testdata/umldoc-ref/gr/spinellis/product/Product.html index 5319c4b..10898ea 100644 --- a/testdata/umldoc-ref/gr/spinellis/product/Product.html +++ b/testdata/umldoc-ref/gr/spinellis/product/Product.html @@ -2,9 +2,9 @@ - + Product - + @@ -87,7 +87,7 @@
gr.spinellis.product

Class Product

- +
diff --git a/testdata/umldoc-ref/gr/spinellis/product/package-frame.html b/testdata/umldoc-ref/gr/spinellis/product/package-frame.html index 7c2f904..662a0b7 100644 --- a/testdata/umldoc-ref/gr/spinellis/product/package-frame.html +++ b/testdata/umldoc-ref/gr/spinellis/product/package-frame.html @@ -2,9 +2,9 @@ - + gr.spinellis.product - + diff --git a/testdata/umldoc-ref/gr/spinellis/product/package-summary.html b/testdata/umldoc-ref/gr/spinellis/product/package-summary.html index 06156cb..35ba92b 100644 --- a/testdata/umldoc-ref/gr/spinellis/product/package-summary.html +++ b/testdata/umldoc-ref/gr/spinellis/product/package-summary.html @@ -2,9 +2,9 @@ - + gr.spinellis.product - + @@ -70,7 +70,7 @@

Package gr.spinellis.product

- +
diff --git a/testdata/umldoc-ref/gr/spinellis/product/package-tree.html b/testdata/umldoc-ref/gr/spinellis/product/package-tree.html index ba79b80..274f24f 100644 --- a/testdata/umldoc-ref/gr/spinellis/product/package-tree.html +++ b/testdata/umldoc-ref/gr/spinellis/product/package-tree.html @@ -2,9 +2,9 @@ - + gr.spinellis.product Class Hierarchy - + diff --git a/testdata/umldoc-ref/help-doc.html b/testdata/umldoc-ref/help-doc.html index c56e4a1..1c49f83 100644 --- a/testdata/umldoc-ref/help-doc.html +++ b/testdata/umldoc-ref/help-doc.html @@ -2,9 +2,9 @@ - + API Help - + diff --git a/testdata/umldoc-ref/index-all.html b/testdata/umldoc-ref/index-all.html index ab1cb74..1363a3d 100644 --- a/testdata/umldoc-ref/index-all.html +++ b/testdata/umldoc-ref/index-all.html @@ -2,9 +2,9 @@ - + Index - + diff --git a/testdata/umldoc-ref/overview-frame.html b/testdata/umldoc-ref/overview-frame.html index f5135cf..2c1f324 100644 --- a/testdata/umldoc-ref/overview-frame.html +++ b/testdata/umldoc-ref/overview-frame.html @@ -2,9 +2,9 @@ - + Overview List - + diff --git a/testdata/umldoc-ref/overview-summary.html b/testdata/umldoc-ref/overview-summary.html index 442672b..dc7ece5 100644 --- a/testdata/umldoc-ref/overview-summary.html +++ b/testdata/umldoc-ref/overview-summary.html @@ -2,9 +2,9 @@ - + Overview - + diff --git a/testdata/umldoc-ref/overview-tree.html b/testdata/umldoc-ref/overview-tree.html index f40f7bc..1ed9cff 100644 --- a/testdata/umldoc-ref/overview-tree.html +++ b/testdata/umldoc-ref/overview-tree.html @@ -2,9 +2,9 @@ - + Class Hierarchy - +