+ c202 [label=<>, URL="http://java.sun.com/j2se/1.4.2/docs/api/java/util/List.html", fontname="Helvetica", fontcolor="black", fontsize=10.0];
}
-
+
diff --git a/testdata/dot-ref/ViewContext.dot b/testdata/dot-ref/ViewContext.dot
index f2fbe73..00bff8e 100644
--- a/testdata/dot-ref/ViewContext.dot
+++ b/testdata/dot-ref/ViewContext.dot
@@ -1,43 +1,43 @@
#!/usr/local/bin/dot
#
# Class diagram
-# Generated by UMLGraph version 5.3 (http://www.umlgraph.org/)
+# Generated by UMLGraph version R5_6-9-g37cd34 (http://www.umlgraph.org/)
#
digraph G {
edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10];
- node [fontname="Helvetica",fontsize=10,shape=plaintext];
- nodesep=0.25;
- ranksep=0.5;
- // gr.spinellis.context.classes.AClient
- c424 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // gr.spinellis.context.classes.ASubclass
- c426 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // gr.spinellis.context.classes.E
- c427 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // gr.spinellis.context.classes.D
- c429 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // gr.spinellis.context.classes.B
- c432 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // gr.spinellis.context.classes.ABaseClass
- c433 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // gr.spinellis.context.classes.A
- c434 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ node [fontname="Helvetica",fontsize=10,shape=plaintext];
+ nodesep=0.25;
+ ranksep=0.5;
+ // gr.spinellis.context.classes.AClient
+ c424 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // gr.spinellis.context.classes.ASubclass
+ c426 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // gr.spinellis.context.classes.E
+ c427 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // gr.spinellis.context.classes.D
+ c429 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // gr.spinellis.context.classes.B
+ c432 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // gr.spinellis.context.classes.ABaseClass
+ c433 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // gr.spinellis.context.classes.A
+ c434 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
//gr.spinellis.context.classes.ASubclass extends gr.spinellis.context.classes.A
- c434:p -> c426:p [dir=back,arrowtail=empty];
+ c434:p -> c426:p [dir=back,arrowtail=empty];
//gr.spinellis.context.classes.A extends gr.spinellis.context.classes.ABaseClass
- c433:p -> c434:p [dir=back,arrowtail=empty];
- // gr.spinellis.context.classes.D NAVASSOC gr.spinellis.context.classes.A
- c429:p -> c434:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open];
- // gr.spinellis.context.classes.A NAVASSOC gr.spinellis.context.classes.B
- c434:p -> c432:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open];
- // gr.spinellis.context.classes.A NAVASSOC javax.swing.JComponent
- c434:p -> c509:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open];
- // gr.spinellis.context.classes.AClient DEPEND gr.spinellis.context.classes.A
- c424:p -> c434:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open, style=dashed];
- // gr.spinellis.context.classes.A DEPEND gr.spinellis.context.classes.E
- c434:p -> c427:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open, style=dashed];
- // javax.swing.JComponent
- c509 [label=<>, URL="http://java.sun.com/j2se/1.4.2/docs/api/javax/swing/JComponent.html", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ c433:p -> c434:p [dir=back,arrowtail=empty];
+ // gr.spinellis.context.classes.D NAVASSOC gr.spinellis.context.classes.A
+ c429:p -> c434:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open];
+ // gr.spinellis.context.classes.A NAVASSOC gr.spinellis.context.classes.B
+ c434:p -> c432:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open];
+ // gr.spinellis.context.classes.A NAVASSOC javax.swing.JComponent
+ c434:p -> c509:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open];
+ // gr.spinellis.context.classes.AClient DEPEND gr.spinellis.context.classes.A
+ c424:p -> c434:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open, style=dashed];
+ // gr.spinellis.context.classes.A DEPEND gr.spinellis.context.classes.E
+ c434:p -> c427:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open, style=dashed];
+ // javax.swing.JComponent
+ c509 [label=<>, URL="http://java.sun.com/j2se/1.4.2/docs/api/javax/swing/JComponent.html", fontname="Helvetica", fontcolor="black", fontsize=10.0];
}
-
+
diff --git a/testdata/dot-ref/ViewInterfaces.dot b/testdata/dot-ref/ViewInterfaces.dot
index aaec796..4f64c77 100644
--- a/testdata/dot-ref/ViewInterfaces.dot
+++ b/testdata/dot-ref/ViewInterfaces.dot
@@ -1,31 +1,31 @@
#!/usr/local/bin/dot
#
# Class diagram
-# Generated by UMLGraph version 5.3 (http://www.umlgraph.org/)
+# Generated by UMLGraph version R5_6-9-g37cd34 (http://www.umlgraph.org/)
#
digraph G {
edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10];
- node [fontname="Helvetica",fontsize=10,shape=plaintext];
- nodesep=0.25;
- ranksep=0.5;
- // gr.spinellis.iface.classes.FarImplementor
- c534 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // gr.spinellis.iface.classes.DirectImplementor
- c535 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // gr.spinellis.iface.classes.SubSubFace
- c537 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // gr.spinellis.iface.classes.SubFace
- c538 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // gr.spinellis.iface.classes.Face
- c539 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ node [fontname="Helvetica",fontsize=10,shape=plaintext];
+ nodesep=0.25;
+ ranksep=0.5;
+ // gr.spinellis.iface.classes.FarImplementor
+ c534 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // gr.spinellis.iface.classes.DirectImplementor
+ c535 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // gr.spinellis.iface.classes.SubSubFace
+ c537 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // gr.spinellis.iface.classes.SubFace
+ c538 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // gr.spinellis.iface.classes.Face
+ c539 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
//gr.spinellis.iface.classes.FarImplementor implements gr.spinellis.iface.classes.SubSubFace
- c537:p -> c534: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
- c539:p -> c535: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
- c538:p -> c537:p [dir=back,arrowtail=empty,style=dashed];
+ 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];
+ c539:p -> c538:p [dir=back,arrowtail=empty,style=dashed];
}
-
+
diff --git a/testdata/dot-ref/ViewProduct.dot b/testdata/dot-ref/ViewProduct.dot
index d568743..1c3c1ca 100644
--- a/testdata/dot-ref/ViewProduct.dot
+++ b/testdata/dot-ref/ViewProduct.dot
@@ -1,19 +1,19 @@
#!/usr/local/bin/dot
#
# Class diagram
-# Generated by UMLGraph version 5.3 (http://www.umlgraph.org/)
+# Generated by UMLGraph version R5_6-9-g37cd34 (http://www.umlgraph.org/)
#
digraph G {
edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10];
- node [fontname="Helvetica",fontsize=10,shape=plaintext];
- nodesep=0.25;
- ranksep=0.5;
- // gr.spinellis.basic.product.Product
- c129 [label=< name stock price category
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // gr.spinellis.basic.product.Category
- c130 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // gr.spinellis.basic.product.Product ASSOC gr.spinellis.basic.product.Category
- c129:p -> c130:p [taillabel="*", label="", headlabel="1", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none];
+ node [fontname="Helvetica",fontsize=10,shape=plaintext];
+ nodesep=0.25;
+ ranksep=0.5;
+ // gr.spinellis.basic.product.Product
+ c129 [label=< name stock price category
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // gr.spinellis.basic.product.Category
+ c130 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // gr.spinellis.basic.product.Product ASSOC gr.spinellis.basic.product.Category
+ c129:p -> c130:p [taillabel="*", label="", headlabel="1", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none];
}
-
+
diff --git a/testdata/dot-ref/ViewSubclasses.dot b/testdata/dot-ref/ViewSubclasses.dot
index 43250fb..2df0707 100644
--- a/testdata/dot-ref/ViewSubclasses.dot
+++ b/testdata/dot-ref/ViewSubclasses.dot
@@ -1,31 +1,31 @@
#!/usr/local/bin/dot
#
# Class diagram
-# Generated by UMLGraph version 5.3 (http://www.umlgraph.org/)
+# Generated by UMLGraph version R5_6-9-g37cd34 (http://www.umlgraph.org/)
#
digraph G {
edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10];
- node [fontname="Helvetica",fontsize=10,shape=plaintext];
- nodesep=0.25;
- ranksep=0.5;
- // gr.spinellis.subclass.classes.SubOneTwo
- c580 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // gr.spinellis.subclass.classes.SubOneOne
- c581 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // gr.spinellis.subclass.classes.SubTwo
- c582 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // gr.spinellis.subclass.classes.SubOne
- c583 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // gr.spinellis.subclass.classes.Super
- c584 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ node [fontname="Helvetica",fontsize=10,shape=plaintext];
+ nodesep=0.25;
+ ranksep=0.5;
+ // gr.spinellis.subclass.classes.SubOneTwo
+ c580 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // gr.spinellis.subclass.classes.SubOneOne
+ c581 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // gr.spinellis.subclass.classes.SubTwo
+ c582 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // gr.spinellis.subclass.classes.SubOne
+ c583 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // gr.spinellis.subclass.classes.Super
+ c584 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
//gr.spinellis.subclass.classes.SubOneTwo extends gr.spinellis.subclass.classes.SubOne
- c583:p -> c580:p [dir=back,arrowtail=empty];
+ c583:p -> c580:p [dir=back,arrowtail=empty];
//gr.spinellis.subclass.classes.SubOneOne extends gr.spinellis.subclass.classes.SubOne
- c583:p -> c581:p [dir=back,arrowtail=empty];
+ 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];
+ c584:p -> c582:p [dir=back,arrowtail=empty];
//gr.spinellis.subclass.classes.SubOne extends gr.spinellis.subclass.classes.Super
- c584:p -> c583:p [dir=back,arrowtail=empty];
+ c584:p -> c583:p [dir=back,arrowtail=empty];
}
-
+
diff --git a/testdata/dot-ref/advrel.dot b/testdata/dot-ref/advrel.dot
index 0bd37f2..0be46a3 100644
--- a/testdata/dot-ref/advrel.dot
+++ b/testdata/dot-ref/advrel.dot
@@ -1,35 +1,35 @@
#!/usr/local/bin/dot
#
# Class diagram
-# Generated by UMLGraph version 5.3 (http://www.umlgraph.org/)
+# Generated by UMLGraph version R5_6-9-g37cd34 (http://www.umlgraph.org/)
#
digraph G {
edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10];
- node [fontname="Helvetica",fontsize=10,shape=plaintext];
- nodesep=0.25;
- ranksep=0.5;
- // Controller
- c5 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // EmbeddedAgent
- c6 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // PowerManager
- c7 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // SetTopController
- c8 [label=< startUp() shutDown() connect()
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // ChannelIterator
- c9 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // URLStreamHandler
- c10 [label=< «interface» URLStreamHandler
OpenConnection() parseURL() setURL() toExternalForm()
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ node [fontname="Helvetica",fontsize=10,shape=plaintext];
+ nodesep=0.25;
+ ranksep=0.5;
+ // Controller
+ c5 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // EmbeddedAgent
+ c6 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // PowerManager
+ c7 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // SetTopController
+ c8 [label=< startUp() shutDown() connect()
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // ChannelIterator
+ c9 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // URLStreamHandler
+ c10 [label=< «interface» URLStreamHandler
OpenConnection() parseURL() setURL() toExternalForm()
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
//SetTopController extends Controller
- c5:p -> c8:p [dir=back,arrowtail=empty];
+ c5:p -> c8:p [dir=back,arrowtail=empty];
//SetTopController extends EmbeddedAgent
- c6:p -> c8:p [dir=back,arrowtail=empty];
+ c6:p -> c8:p [dir=back,arrowtail=empty];
//SetTopController implements URLStreamHandler
- c10:p -> c8:p [dir=back,arrowtail=empty,style=dashed];
- // SetTopController NAVASSOC PowerManager
- c8:p -> c7:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open];
- // ChannelIterator DEPEND SetTopController
- c9:p -> c8:p [taillabel="", label="«friend»", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open, style=dashed];
+ c10:p -> c8:p [dir=back,arrowtail=empty,style=dashed];
+ // SetTopController NAVASSOC PowerManager
+ c8:p -> c7:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open];
+ // ChannelIterator DEPEND SetTopController
+ c9:p -> c8:p [taillabel="", label="«friend»", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open, style=dashed];
}
-
+
diff --git a/testdata/dot-ref/assoc.dot b/testdata/dot-ref/assoc.dot
index 089b6cf..df9b3a1 100644
--- a/testdata/dot-ref/assoc.dot
+++ b/testdata/dot-ref/assoc.dot
@@ -1,24 +1,24 @@
#!/usr/local/bin/dot
#
# Class diagram
-# Generated by UMLGraph version 5.3 (http://www.umlgraph.org/)
+# Generated by UMLGraph version R5_6-9-g37cd34 (http://www.umlgraph.org/)
#
digraph G {
edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10];
- node [fontname="Helvetica",fontsize=10,shape=plaintext];
- nodesep=0.25;
- ranksep=0.5;
- rankdir=LR;
- // UserGroup
- c12 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // User
- c13 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // Password
- c14 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // UserGroup ASSOC User
- c12:p -> c13:p [taillabel="*", label="", headlabel="*\n\n+user ", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none];
- // User NAVASSOC Password
- c13:p -> c14:p [taillabel="1\n\n+owner\r", label="", headlabel="*\n\n+key", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open];
+ node [fontname="Helvetica",fontsize=10,shape=plaintext];
+ nodesep=0.25;
+ ranksep=0.5;
+ rankdir=LR;
+ // UserGroup
+ c12 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // User
+ c13 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // Password
+ c14 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // UserGroup ASSOC User
+ c12:p -> c13:p [taillabel="*", label="", headlabel="*\n\n+user ", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none];
+ // User NAVASSOC Password
+ c13:p -> c14:p [taillabel="1\n\n+owner\r", label="", headlabel="*\n\n+key", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open];
}
-
+
diff --git a/testdata/dot-ref/car.dot b/testdata/dot-ref/car.dot
index 77bcc00..8429912 100644
--- a/testdata/dot-ref/car.dot
+++ b/testdata/dot-ref/car.dot
@@ -1,27 +1,27 @@
#!/usr/local/bin/dot
#
# Class diagram
-# Generated by UMLGraph version 5.3 (http://www.umlgraph.org/)
+# Generated by UMLGraph version R5_6-9-g37cd34 (http://www.umlgraph.org/)
#
digraph G {
edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10];
- node [fontname="Helvetica",fontsize=10,shape=plaintext];
- nodesep=0.25;
- ranksep=0.5;
- // Tyre
- c15 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // Engine
- c16 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // Body
- c17 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // Car
- c18 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // Car COMPOSED Tyre
- c18:p -> c15:p [taillabel="1", label="", headlabel="4", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none, arrowtail=diamond, dir=both];
- // Car COMPOSED Engine
- c18:p -> c16:p [taillabel="1", label="", headlabel="1", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none, arrowtail=diamond, dir=both];
- // Car COMPOSED Body
- c18:p -> c17:p [taillabel="1", label="", headlabel="1", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none, arrowtail=diamond, dir=both];
+ node [fontname="Helvetica",fontsize=10,shape=plaintext];
+ nodesep=0.25;
+ ranksep=0.5;
+ // Tyre
+ c15 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // Engine
+ c16 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // Body
+ c17 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // Car
+ c18 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // Car COMPOSED Tyre
+ c18:p -> c15:p [taillabel="1", label="", headlabel="4", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none, arrowtail=diamond, dir=both];
+ // Car COMPOSED Engine
+ c18:p -> c16:p [taillabel="1", label="", headlabel="1", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none, arrowtail=diamond, dir=both];
+ // Car COMPOSED Body
+ c18:p -> c17:p [taillabel="1", label="", headlabel="1", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none, arrowtail=diamond, dir=both];
}
-
+
diff --git a/testdata/dot-ref/catalina.dot b/testdata/dot-ref/catalina.dot
index 726e968..8fea9a5 100644
--- a/testdata/dot-ref/catalina.dot
+++ b/testdata/dot-ref/catalina.dot
@@ -1,57 +1,57 @@
#!/usr/local/bin/dot
#
# Class diagram
-# Generated by UMLGraph version 5.3 (http://www.umlgraph.org/)
+# Generated by UMLGraph version R5_6-9-g37cd34 (http://www.umlgraph.org/)
#
digraph G {
edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10];
- node [fontname="Helvetica",fontsize=10,shape=plaintext];
- nodesep=0.25;
- ranksep=0.5;
- // HttpResponseBase
- c19 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // HttpResponseWrapper
- c20 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // HttpResponseFacade
- c21 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // ResponseWrapper
- c22 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // HttpResponse
- c23 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // ResponseBase
- c24 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // HttpServletResponse
- c25 [label=< «interface» HttpServletResponse
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // ResponseFacade
- c26 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // ServletResponse
- c27 [label=< «interface» ServletResponse
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // Response
- c28 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ node [fontname="Helvetica",fontsize=10,shape=plaintext];
+ nodesep=0.25;
+ ranksep=0.5;
+ // HttpResponseBase
+ c19 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // HttpResponseWrapper
+ c20 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // HttpResponseFacade
+ c21 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // ResponseWrapper
+ c22 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // HttpResponse
+ c23 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // ResponseBase
+ c24 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // HttpServletResponse
+ c25 [label=< «interface» HttpServletResponse
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // ResponseFacade
+ c26 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // ServletResponse
+ c27 [label=< «interface» ServletResponse
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // Response
+ c28 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
//HttpResponseBase extends ResponseBase
- c24:p -> c19:p [dir=back,arrowtail=empty];
+ c24:p -> c19:p [dir=back,arrowtail=empty];
//HttpResponseBase implements HttpResponse
- c23:p -> c19:p [dir=back,arrowtail=empty,style=dashed];
+ c23:p -> c19:p [dir=back,arrowtail=empty,style=dashed];
//HttpResponseBase implements HttpServletResponse
- c25:p -> c19:p [dir=back,arrowtail=empty,style=dashed];
+ c25:p -> c19:p [dir=back,arrowtail=empty,style=dashed];
//HttpResponseWrapper extends ResponseWrapper
- c22:p -> c20:p [dir=back,arrowtail=empty];
+ c22:p -> c20:p [dir=back,arrowtail=empty];
//HttpResponseWrapper implements HttpResponse
- c23:p -> c20:p [dir=back,arrowtail=empty,style=dashed];
+ c23:p -> c20:p [dir=back,arrowtail=empty,style=dashed];
//HttpResponseFacade extends ResponseFacade
- c26:p -> c21:p [dir=back,arrowtail=empty];
+ c26:p -> c21:p [dir=back,arrowtail=empty];
//HttpResponseFacade implements HttpServletResponse
- c25:p -> c21:p [dir=back,arrowtail=empty,style=dashed];
+ c25:p -> c21:p [dir=back,arrowtail=empty,style=dashed];
//ResponseWrapper implements Response
- c28:p -> c22:p [dir=back,arrowtail=empty,style=dashed];
+ c28:p -> c22:p [dir=back,arrowtail=empty,style=dashed];
//HttpResponse implements Response
- c28:p -> c23:p [dir=back,arrowtail=empty,style=dashed];
+ c28:p -> c23:p [dir=back,arrowtail=empty,style=dashed];
//ResponseBase implements Response
- c28:p -> c24:p [dir=back,arrowtail=empty,style=dashed];
+ c28:p -> c24:p [dir=back,arrowtail=empty,style=dashed];
//ResponseBase implements ServletResponse
- c27:p -> c24:p [dir=back,arrowtail=empty,style=dashed];
+ c27:p -> c24:p [dir=back,arrowtail=empty,style=dashed];
//ResponseFacade implements ServletResponse
- c27:p -> c26:p [dir=back,arrowtail=empty,style=dashed];
+ c27:p -> c26:p [dir=back,arrowtail=empty,style=dashed];
}
-
+
diff --git a/testdata/dot-ref/class-eg.dot b/testdata/dot-ref/class-eg.dot
index 314285a..28f9188 100644
--- a/testdata/dot-ref/class-eg.dot
+++ b/testdata/dot-ref/class-eg.dot
@@ -1,23 +1,23 @@
#!/usr/local/bin/dot
#
# Class diagram
-# Generated by UMLGraph version 5.3 (http://www.umlgraph.org/)
+# Generated by UMLGraph version R5_6-9-g37cd34 (http://www.umlgraph.org/)
#
digraph G {
edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10];
- node [fontname="Helvetica",fontsize=10,shape=plaintext];
- nodesep=0.25;
- ranksep=0.5;
- // Person
- c33 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // Employee
- c34 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // Client
- c35 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ node [fontname="Helvetica",fontsize=10,shape=plaintext];
+ nodesep=0.25;
+ ranksep=0.5;
+ // Person
+ c30 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // Employee
+ c31 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // Client
+ c32 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
//Employee extends Person
- c33:p -> c34:p [dir=back,arrowtail=empty];
+ c30:p -> c31:p [dir=back,arrowtail=empty];
//Client extends Person
- c33:p -> c35:p [dir=back,arrowtail=empty];
+ c30:p -> c32:p [dir=back,arrowtail=empty];
}
-
+
diff --git a/testdata/dot-ref/classadd.dot b/testdata/dot-ref/classadd.dot
index 7051efe..966a36c 100644
--- a/testdata/dot-ref/classadd.dot
+++ b/testdata/dot-ref/classadd.dot
@@ -1,15 +1,15 @@
#!/usr/local/bin/dot
#
# Class diagram
-# Generated by UMLGraph version 5.3 (http://www.umlgraph.org/)
+# Generated by UMLGraph version R5_6-9-g37cd34 (http://www.umlgraph.org/)
#
digraph G {
edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10];
- node [fontname="Helvetica",fontsize=10,shape=plaintext];
- nodesep=0.25;
- ranksep=0.5;
- // ActionQueue
- c31 [label=< «container» ActionQueue {version = 3.2}
add(a : Action) add(a : Action, n : int) {version = 1.0} remove(n : int) «query» length() : int «helper functions» reorder()
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ node [fontname="Helvetica",fontsize=10,shape=plaintext];
+ nodesep=0.25;
+ ranksep=0.5;
+ // ActionQueue
+ c35 [label=< «container» ActionQueue {version = 3.2}
add(a : Action) add(a : Action, n : int) {version = 1.0} remove(n : int) «query» length() : int «helper functions» reorder()
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
}
-
+
diff --git a/testdata/dot-ref/color.dot b/testdata/dot-ref/color.dot
index 4c93da6..77937b2 100644
--- a/testdata/dot-ref/color.dot
+++ b/testdata/dot-ref/color.dot
@@ -1,29 +1,29 @@
#!/usr/local/bin/dot
#
# Class diagram
-# Generated by UMLGraph version 5.3 (http://www.umlgraph.org/)
+# Generated by UMLGraph version R5_6-9-g37cd34 (http://www.umlgraph.org/)
#
digraph G {
edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10];
- node [fontname="Serif",fontsize=10,shape=plaintext];
- nodesep=0.25;
- ranksep=0.5;
+ node [fontname="Serif",fontsize=10,shape=plaintext];
+ nodesep=0.25;
+ ranksep=0.5;
bgcolor=".7 .9 1";
-
- // Pixel
- c116 [label=<>, URL="null", fontname="arial", fontcolor="white", fontsize=14.0];
- // Red
- c117 [label=<>, URL="null", fontname="Serif", fontcolor="black", fontsize=14.0];
- // Green
- c118 [label=<>, URL="null", fontname="Serif", fontcolor="black", fontsize=14.0];
- // Blue
- c119 [label=<>, URL="null", fontname="Serif", fontcolor="black", fontsize=14.0];
- // Pixel COMPOSED Red
- c116:p -> c117:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="yellow", arrowhead=none, arrowtail=diamond, dir=both];
- // Pixel COMPOSED Green
- c116:p -> c118:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="yellow", arrowhead=none, arrowtail=diamond, dir=both];
- // Pixel COMPOSED Blue
- c116:p -> c119:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="yellow", arrowhead=none, arrowtail=diamond, dir=both];
+
+ // Pixel
+ c37 [label=<>, URL="null", fontname="arial", fontcolor="white", fontsize=14.0];
+ // Red
+ c38 [label=<>, URL="null", fontname="Serif", fontcolor="black", fontsize=14.0];
+ // Green
+ c39 [label=<>, URL="null", fontname="Serif", fontcolor="black", fontsize=14.0];
+ // Blue
+ c40 [label=<>, URL="null", fontname="Serif", fontcolor="black", fontsize=14.0];
+ // Pixel COMPOSED Red
+ c37:p -> c38:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="yellow", arrowhead=none, arrowtail=diamond, dir=both];
+ // Pixel COMPOSED Green
+ c37:p -> c39:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="yellow", arrowhead=none, arrowtail=diamond, dir=both];
+ // Pixel COMPOSED Blue
+ c37:p -> c40:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="yellow", arrowhead=none, arrowtail=diamond, dir=both];
}
-
+
diff --git a/testdata/dot-ref/ctor.dot b/testdata/dot-ref/ctor.dot
index e218d4a..0826c73 100644
--- a/testdata/dot-ref/ctor.dot
+++ b/testdata/dot-ref/ctor.dot
@@ -1,15 +1,15 @@
#!/usr/local/bin/dot
#
# Class diagram
-# Generated by UMLGraph version 5.3 (http://www.umlgraph.org/)
+# Generated by UMLGraph version R5_6-9-g37cd34 (http://www.umlgraph.org/)
#
digraph G {
edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10];
- node [fontname="Helvetica",fontsize=10,shape=plaintext];
- nodesep=0.25;
- ranksep=0.5;
- // Junk
- c37 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ node [fontname="Helvetica",fontsize=10,shape=plaintext];
+ nodesep=0.25;
+ ranksep=0.5;
+ // Junk
+ c43 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
}
-
+
diff --git a/testdata/dot-ref/disable.dot b/testdata/dot-ref/disable.dot
index 1c7a497..3759817 100644
--- a/testdata/dot-ref/disable.dot
+++ b/testdata/dot-ref/disable.dot
@@ -1,19 +1,19 @@
#!/usr/local/bin/dot
#
# Class diagram
-# Generated by UMLGraph version 5.3 (http://www.umlgraph.org/)
+# Generated by UMLGraph version R5_6-9-g37cd34 (http://www.umlgraph.org/)
#
digraph G {
edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10];
- node [fontname="Helvetica",fontsize=10,shape=plaintext];
- nodesep=0.25;
- ranksep=0.5;
- // Person1
- c39 [label=< ~ address : String ~ name : String
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // Person2
- c40 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // Person3
- c41 [label=< address : Address name : String
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ node [fontname="Helvetica",fontsize=10,shape=plaintext];
+ nodesep=0.25;
+ ranksep=0.5;
+ // Person1
+ c45 [label=< ~ address : String ~ name : String
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // Person2
+ c46 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // Person3
+ c47 [label=< address : Address name : String
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
}
-
+
diff --git a/testdata/dot-ref/extends.dot b/testdata/dot-ref/extends.dot
index 84619c3..2829ebb 100644
--- a/testdata/dot-ref/extends.dot
+++ b/testdata/dot-ref/extends.dot
@@ -1,17 +1,17 @@
#!/usr/local/bin/dot
#
# Class diagram
-# Generated by UMLGraph version 5.3 (http://www.umlgraph.org/)
+# Generated by UMLGraph version R5_6-9-g37cd34 (http://www.umlgraph.org/)
#
digraph G {
edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10];
- node [fontname="Helvetica",fontsize=10,shape=plaintext];
- nodesep=0.25;
- ranksep=0.5;
- // Base
- c42 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // Test2
- c43 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ node [fontname="Helvetica",fontsize=10,shape=plaintext];
+ nodesep=0.25;
+ ranksep=0.5;
+ // Base
+ c48 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // Test2
+ c49 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
}
-
+
diff --git a/testdata/dot-ref/foo.dot b/testdata/dot-ref/foo.dot
index 2e531a4..7c4e2a2 100644
--- a/testdata/dot-ref/foo.dot
+++ b/testdata/dot-ref/foo.dot
@@ -1,25 +1,25 @@
#!/usr/local/bin/dot
#
# Class diagram
-# Generated by UMLGraph version 5.3 (http://www.umlgraph.org/)
+# Generated by UMLGraph version R5_6-9-g37cd34 (http://www.umlgraph.org/)
#
digraph G {
edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10];
- node [fontname="Helvetica",fontsize=10,shape=plaintext];
- nodesep=0.25;
- ranksep=0.5;
- // a.b.c.UMLOptions
- c44 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // a.b.c.UserGroup
- c45 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // a.b.c.User
- c46 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // a.b.c.Password
- c47 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // a.b.c.UserGroup ASSOC a.b.c.User
- c45:p -> c46:p [taillabel="*", label="", headlabel="*\n\n+user ", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none];
- // a.b.c.User NAVASSOC a.b.c.Password
- c46:p -> c47:p [taillabel="1\n\n+owner\r", label="", headlabel="*\n\n+key", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open];
+ node [fontname="Helvetica",fontsize=10,shape=plaintext];
+ nodesep=0.25;
+ ranksep=0.5;
+ // a.b.c.UMLOptions
+ c50 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // a.b.c.UserGroup
+ c51 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // a.b.c.User
+ c52 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // a.b.c.Password
+ c53 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // a.b.c.UserGroup ASSOC a.b.c.User
+ c51:p -> c52:p [taillabel="*", label="", headlabel="*\n\n+user ", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none];
+ // a.b.c.User NAVASSOC a.b.c.Password
+ c52:p -> c53:p [taillabel="1\n\n+owner\r", label="", headlabel="*\n\n+key", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open];
}
-
+
diff --git a/testdata/dot-ref/general.dot b/testdata/dot-ref/general.dot
index 24f55e2..75cdc3f 100644
--- a/testdata/dot-ref/general.dot
+++ b/testdata/dot-ref/general.dot
@@ -1,53 +1,53 @@
#!/usr/local/bin/dot
#
# Class diagram
-# Generated by UMLGraph version 5.3 (http://www.umlgraph.org/)
+# Generated by UMLGraph version R5_6-9-g37cd34 (http://www.umlgraph.org/)
#
digraph G {
edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10];
- node [fontname="Helvetica",fontsize=10,shape=plaintext];
- nodesep=0.25;
- ranksep=0.5;
- // Asset
- c49 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // InterestBearingItem
- c50 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // InsurableItem
- c51 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // BankAccount
- c52 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // RealEstate
- c53 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // Security
- c54 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // Stock
- c55 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // Bond
- c56 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // CheckingAccount
- c57 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // SavingsAccount
- c58 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ node [fontname="Helvetica",fontsize=10,shape=plaintext];
+ nodesep=0.25;
+ ranksep=0.5;
+ // Asset
+ c55 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // InterestBearingItem
+ c56 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // InsurableItem
+ c57 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // BankAccount
+ c58 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // RealEstate
+ c59 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // Security
+ c60 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // Stock
+ c61 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // Bond
+ c62 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // CheckingAccount
+ c63 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // SavingsAccount
+ c64 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
//BankAccount extends Asset
- c49:p -> c52:p [dir=back,arrowtail=empty];
+ c55:p -> c58:p [dir=back,arrowtail=empty];
//BankAccount extends InsurableItem
- c51:p -> c52:p [dir=back,arrowtail=empty];
+ c57:p -> c58:p [dir=back,arrowtail=empty];
//BankAccount extends InterestBearingItem
- c50:p -> c52:p [dir=back,arrowtail=empty];
+ c56:p -> c58:p [dir=back,arrowtail=empty];
//RealEstate extends Asset
- c49:p -> c53:p [dir=back,arrowtail=empty];
+ c55:p -> c59:p [dir=back,arrowtail=empty];
//RealEstate extends InsurableItem
- c51:p -> c53:p [dir=back,arrowtail=empty];
+ c57:p -> c59:p [dir=back,arrowtail=empty];
//Security extends Asset
- c49:p -> c54:p [dir=back,arrowtail=empty];
+ c55:p -> c60:p [dir=back,arrowtail=empty];
//Stock extends Security
- c54:p -> c55:p [dir=back,arrowtail=empty];
+ c60:p -> c61:p [dir=back,arrowtail=empty];
//Bond extends Security
- c54:p -> c56:p [dir=back,arrowtail=empty];
+ c60:p -> c62:p [dir=back,arrowtail=empty];
//CheckingAccount extends BankAccount
- c52:p -> c57:p [dir=back,arrowtail=empty];
+ c58:p -> c63:p [dir=back,arrowtail=empty];
//SavingsAccount extends BankAccount
- c52:p -> c58:p [dir=back,arrowtail=empty];
+ c58:p -> c64:p [dir=back,arrowtail=empty];
}
-
+
diff --git a/testdata/dot-ref/java5.dot b/testdata/dot-ref/java5.dot
index 700c4cb..3364bc4 100644
--- a/testdata/dot-ref/java5.dot
+++ b/testdata/dot-ref/java5.dot
@@ -1,17 +1,17 @@
#!/usr/local/bin/dot
#
# Class diagram
-# Generated by UMLGraph version 5.3 (http://www.umlgraph.org/)
+# Generated by UMLGraph version R5_6-9-g37cd34 (http://www.umlgraph.org/)
#
digraph G {
edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10];
- node [fontname="Helvetica",fontsize=10,shape=plaintext];
- nodesep=0.25;
- ranksep=0.5;
- // Java5
- c72 [label=< ~ state : Java5.States - specifiedPackages : Set<String>
+ printAll(args : String[])
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // Java5.States
- c73 [label=< start dash colon space open w close
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ node [fontname="Helvetica",fontsize=10,shape=plaintext];
+ nodesep=0.25;
+ ranksep=0.5;
+ // Java5
+ c78 [label=< ~ state : Java5.States - specifiedPackages : Set<String>
+ printAll(args : String[])
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // Java5.States
+ c79 [label=< start dash colon space open w close
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
}
-
+
diff --git a/testdata/dot-ref/schema.dot b/testdata/dot-ref/schema.dot
index 9736ccd..a723eab 100644
--- a/testdata/dot-ref/schema.dot
+++ b/testdata/dot-ref/schema.dot
@@ -1,37 +1,37 @@
#!/usr/local/bin/dot
#
# Class diagram
-# Generated by UMLGraph version 5.3 (http://www.umlgraph.org/)
+# Generated by UMLGraph version R5_6-9-g37cd34 (http://www.umlgraph.org/)
#
digraph G {
edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10];
- node [fontname="Helvetica",fontsize=10,shape=plaintext];
- nodesep=0.25;
- ranksep=0.5;
- // School
- c97 [label=< name : Name address : String phone : Number
addStudent() removeStudent() getStudent() getAllStudents() addDepartment() removeDepartment() getDepartment() getAllDepartments()
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // Department
- c98 [label=< addInstructor() removeInstructor() getInstructor() getAllInstructors()
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // Student
- c99 [label=< name : Name studentID : Number
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // Course
- c100 [label=< name : Name courseID : Number
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // Instructor
- c101 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // School HAS Student
- c97:p -> c99:p [taillabel="1..*", label="Member", headlabel="*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none, arrowtail=ediamond, dir=both];
- // School COMPOSED Department
- c97:p -> c98:p [taillabel="1..*", label="Has", headlabel="1..*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none, arrowtail=diamond, dir=both];
- // Department ASSOC Course
- c98:p -> c100:p [taillabel="1..*", label="", headlabel="1..*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none];
- // Department ASSOC Instructor
- c98:p -> c101:p [taillabel="0..*", label="", headlabel="0..1 chairperson", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none];
- // Department HAS Instructor
- c98:p -> c101:p [taillabel="1..*", label="AssignedTo", headlabel="1..*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none, arrowtail=ediamond, dir=both];
- // Student ASSOC Course
- c99:p -> c100:p [taillabel="*", label="Attends", headlabel="*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none];
- // Instructor ASSOC Course
- c101:p -> c100:p [taillabel="1..*", label="Teaches", headlabel="*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none];
+ node [fontname="Helvetica",fontsize=10,shape=plaintext];
+ nodesep=0.25;
+ ranksep=0.5;
+ // School
+ c103 [label=< name : Name address : String phone : Number
addStudent() removeStudent() getStudent() getAllStudents() addDepartment() removeDepartment() getDepartment() getAllDepartments()
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // Department
+ c104 [label=< addInstructor() removeInstructor() getInstructor() getAllInstructors()
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // Student
+ c105 [label=< name : Name studentID : Number
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // Course
+ c106 [label=< name : Name courseID : Number
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // Instructor
+ c107 [label=<>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // School HAS Student
+ c103:p -> c105:p [taillabel="1..*", label="Member", headlabel="*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none, arrowtail=ediamond, dir=both];
+ // School COMPOSED Department
+ c103:p -> c104:p [taillabel="1..*", label="Has", headlabel="1..*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none, arrowtail=diamond, dir=both];
+ // Department ASSOC Course
+ c104:p -> c106:p [taillabel="1..*", label="", headlabel="1..*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none];
+ // Department ASSOC Instructor
+ c104:p -> c107:p [taillabel="0..*", label="", headlabel="0..1 chairperson", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none];
+ // Department HAS Instructor
+ c104:p -> c107:p [taillabel="1..*", label="AssignedTo", headlabel="1..*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none, arrowtail=ediamond, dir=both];
+ // Student ASSOC Course
+ c105:p -> c106:p [taillabel="*", label="Attends", headlabel="*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none];
+ // Instructor ASSOC Course
+ c107:p -> c106:p [taillabel="1..*", label="Teaches", headlabel="*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none];
}
-
+
diff --git a/testdata/dot-ref/strip.dot b/testdata/dot-ref/strip.dot
index 2f4f0cb..6c7ca58 100644
--- a/testdata/dot-ref/strip.dot
+++ b/testdata/dot-ref/strip.dot
@@ -1,17 +1,17 @@
#!/usr/local/bin/dot
#
# Class diagram
-# Generated by UMLGraph version 5.3 (http://www.umlgraph.org/)
+# Generated by UMLGraph version R5_6-9-g37cd34 (http://www.umlgraph.org/)
#
digraph G {
edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10];
- node [fontname="Helvetica",fontsize=10,shape=plaintext];
- nodesep=0.25;
- ranksep=0.5;
- // Java5
- c103 [label=< ~ state : Java5.States + specifiedPackages : Set<String>
+ printAll(args : String[])
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
- // Java5.States
- c104 [label=< start dash colon space open w close
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ node [fontname="Helvetica",fontsize=10,shape=plaintext];
+ nodesep=0.25;
+ ranksep=0.5;
+ // Java5
+ c109 [label=< ~ state : Java5.States + specifiedPackages : Set<String>
+ printAll(args : String[])
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ // Java5.States
+ c110 [label=< start dash colon space open w close
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
}
-
+
diff --git a/testdata/dot-ref/vis.dot b/testdata/dot-ref/vis.dot
index 59a75ef..b44fd58 100644
--- a/testdata/dot-ref/vis.dot
+++ b/testdata/dot-ref/vis.dot
@@ -1,15 +1,15 @@
#!/usr/local/bin/dot
#
# Class diagram
-# Generated by UMLGraph version 5.3 (http://www.umlgraph.org/)
+# Generated by UMLGraph version R5_6-9-g37cd34 (http://www.umlgraph.org/)
#
digraph G {
edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10];
- node [fontname="Helvetica",fontsize=10,shape=plaintext];
- nodesep=0.25;
- ranksep=0.5;
- // Toolbar
- c109 [label=< # currentSelection : Tool # toolCount : Integer
+ pickItem(i : Integer) + addTool(t : Tool) + removeTool(i : Integer) + getTool() : Tool # checkOrphans() - compact()
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
+ node [fontname="Helvetica",fontsize=10,shape=plaintext];
+ nodesep=0.25;
+ ranksep=0.5;
+ // Toolbar
+ c120 [label=< # currentSelection : Tool # toolCount : Integer
+ pickItem(i : Integer) + addTool(t : Tool) + removeTool(i : Integer) + getTool() : Tool # checkOrphans() - compact()
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0];
}
-
+
diff --git a/testdata/umldoc-ref/allclasses-frame.html b/testdata/umldoc-ref/allclasses-frame.html
index f441213..3207362 100644
--- a/testdata/umldoc-ref/allclasses-frame.html
+++ b/testdata/umldoc-ref/allclasses-frame.html
@@ -1,39 +1,22 @@
-
-
-
-
-
-
-All Classes
-
-
-
-All Classes
-All Classes
+All Classes
+
+
+
diff --git a/testdata/umldoc-ref/allclasses-noframe.html b/testdata/umldoc-ref/allclasses-noframe.html
index 3f9cf7e..d535719 100644
--- a/testdata/umldoc-ref/allclasses-noframe.html
+++ b/testdata/umldoc-ref/allclasses-noframe.html
@@ -1,39 +1,22 @@
-
-
-
-
-
-
-All Classes
-
-
-
-All Classes
-All Classes
+All Classes
+
+
+
diff --git a/testdata/umldoc-ref/constant-values.html b/testdata/umldoc-ref/constant-values.html
index 752cfac..e286709 100644
--- a/testdata/umldoc-ref/constant-values.html
+++ b/testdata/umldoc-ref/constant-values.html
@@ -1,144 +1,113 @@
-
-
-
-
-
-
-Constant Field Values
-
-
-
-
-
-
-
-
-
-
-Constant Field Values
-
-Contents
-
-Constant Field Values
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/testdata/umldoc-ref/deprecated-list.html b/testdata/umldoc-ref/deprecated-list.html
index 5f3cd60..011283f 100644
--- a/testdata/umldoc-ref/deprecated-list.html
+++ b/testdata/umldoc-ref/deprecated-list.html
@@ -1,144 +1,113 @@
-
-
-
-
-
-
-Deprecated List
-
-
-
-
-
-
-
-
-
-
-Deprecated API
-
-Contents
-
-Deprecated List
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/testdata/umldoc-ref/gr/spinellis/invoice/Customer.html b/testdata/umldoc-ref/gr/spinellis/invoice/Customer.html
index 99aab1a..3f6e8a3 100644
--- a/testdata/umldoc-ref/gr/spinellis/invoice/Customer.html
+++ b/testdata/umldoc-ref/gr/spinellis/invoice/Customer.html
@@ -1,268 +1,272 @@
-
-
-
-
-
-
-Customer
-
-
-
-
-
-
-
-
-
-
-gr.spinellis.invoice
-
-
-
-
-
-
-java.lang.Object
- gr.spinellis.invoice.Customer
-
-
-public class Customer extends java.lang.Object
-
-
-
-
-
-
-
-
-
-Field Summary
-
-
-(package private) java.lang.String name
-
-
-
-
-
-
-
-Constructor Summary
-
-Customer
-
-
-
-
-
-
-Methods inherited from class java.lang.Object
-
-clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
-
-
-
-
-
-
-
-
-
-name
-
-java.lang.String name
-
-
-
-
-
-
-
-
-
-
-Constructor Detail
-
-
-
-Customer
-
-public Customer ()
-
-
-
-Customer
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+java.lang.Object
+
+
+gr.spinellis.invoice.Customer
+
+
+
+
+
+
+
+
+
+
+
+
+Field Summary
+
+Fields
+Modifier and Type
+Field and Description
+
+
+(package private) java.lang.Stringname
+
+
+
+
+
+
+
+Constructor Summary
+
+Constructors
+Constructor and Description
+
+
+Customer
+
+
+
+
+
+
+
+Method Summary
+
+
+
+
+Methods inherited from class java.lang.Object
+clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
+
+
+
+
+
+
+
+
+
+
+
+
+Field Detail
+
+
+
+
+
+name
+java.lang.String name
+
+
+
+
+
+
+
+
+Constructor Detail
+
+
+
+
+
+Customer
+public Customer()
+
+
+
+
+
+
+
-Invoice
-
-
-
-
-
-
-
-
-
-
-gr.spinellis.invoice
-
-
-
-
-
-
-java.lang.Object
- gr.spinellis.invoice.Invoice
-
-
-public class Invoice extends java.lang.Object
-
-
-
-
-
-
-
-
-
-
-
-
-
-Constructor Summary
-
-Invoice
-
-
-
-
-
-
-
-Method Summary
-
-
- void addItem Product p,
- int quantity)
-
-
-
-Methods inherited from class java.lang.Object
-
-clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
-
-
-
-
-
-
-
-
-
-total
-
-public double total
-
-
-
-
-
-items
-
-public InvoiceItem [] items
-
-
-
-
-
-customer
-
-public Customer customer
-
-
-
-
-
-invoiceDate
-
-public java.util.Date invoiceDate
-
-
-
-
-
-
-
-
-
-
-Constructor Detail
-
-
-
-Invoice
-
-public Invoice ()
-
-
-
-
-
-
-addItem
-
-public void addItem (Product p,
- int quantity)
-
-
-
-
-
-Invoice
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+java.lang.Object
+
+
+gr.spinellis.invoice.Invoice
+
+
+
+
+
+
+
+
+
+
+
+
+Field Summary
+
+
+
+
+
+
+
+Constructor Summary
+
+Constructors
+Constructor and Description
+
+
+Invoice
+
+
+
+
+
+
+
+Method Summary
+
+Methods
+Modifier and Type
+Method and Description
+
+
+voidaddItem Product p,
+ int quantity)
+
+
+
+
+
+Methods inherited from class java.lang.Object
+clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
+
+
+
+
+
+
+
+
+
+
+
+
+Field Detail
+
+
+
+
+
+total
+public double total
+
+
+
+
+
+
+
+
+
+
+
+customer
+public Customer customer
+
+
+
+
+
+
+
+
+
+
+
+
+Constructor Detail
+
+
+
+
+
+Invoice
+public Invoice()
+
+
+
+
+
+
+
+
+Method Detail
+
+
+
+
+
+
+
+
+
-InvoiceItem
-
-
-
-
-
-
-
-
-
-
-gr.spinellis.invoice
-
-
-
-
-
-
-java.lang.Object
- gr.spinellis.invoice.InvoiceItem
-
-
-public class InvoiceItem extends java.lang.Object
-
-
-
-
-
-
-
-
-
-
-
-
-Methods inherited from class java.lang.Object
-
-clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
-
-
-
-
-
-
-
-
-
-product
-
-public Product product
-
-
-
-
-
-quantity
-
-public int quantity
-
-
-
-
-
-
-
-
-
-
-Constructor Detail
-
-
-
-InvoiceItem
-
-public InvoiceItem ()
-
-
-
-InvoiceItem
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+java.lang.Object
+
+
+gr.spinellis.invoice.InvoiceItem
+
+
+
+
+
+
+
+
+
+
+
+
+Field Summary
+
+
+
+
+
+
+
+Constructor Summary
+
+Constructors
+Constructor and Description
+
+
+InvoiceItem
+
+
+
+
+
+
+
+Method Summary
+
+
+
+
+Methods inherited from class java.lang.Object
+clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
+
+
+
+
+
+
+
+
+
+
+
+
+Field Detail
+
+
+
+
+
+product
+public Product product
+
+
+
+
+
+
+
+quantity
+public int quantity
+
+
+
+
+
+
+
+
+Constructor Detail
+
+
+
+
+
+InvoiceItem
+public InvoiceItem()
+
+
+
+
+
+
+
-gr.spinellis.invoice
-
-
-
-gr.spinellis.invoice
-
-
-
-
-
+
+
+
+
+
+gr.spinellis.invoice
+
-gr.spinellis.invoice
-
-
-
-
-
-
-
-
-
-Package gr.spinellis.invoice
-
-
-
-
-
-
-
-
-
-
-
-
-gr.spinellis.invoice
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/testdata/umldoc-ref/gr/spinellis/invoice/package-tree.html b/testdata/umldoc-ref/gr/spinellis/invoice/package-tree.html
index 174e378..779966f 100644
--- a/testdata/umldoc-ref/gr/spinellis/invoice/package-tree.html
+++ b/testdata/umldoc-ref/gr/spinellis/invoice/package-tree.html
@@ -1,151 +1,128 @@
-
-
-
-
-
-
-gr.spinellis.invoice Class Hierarchy
-
-
-
-
-
-
-
-
-
-
-Hierarchy For Package gr.spinellis.invoice
-
-
-
-Package Hierarchies: All Packages
-
-Class Hierarchy
-
-
-gr.spinellis.invoice Class Hierarchy
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/testdata/umldoc-ref/gr/spinellis/product/Category.html b/testdata/umldoc-ref/gr/spinellis/product/Category.html
index da4aad8..509aa2d 100644
--- a/testdata/umldoc-ref/gr/spinellis/product/Category.html
+++ b/testdata/umldoc-ref/gr/spinellis/product/Category.html
@@ -1,286 +1,285 @@
-
-
-
-
-
-
-Category
-
-
-
-
-
-
-
-
-
-
-gr.spinellis.product
-
-
-
-
-
-
-java.lang.Object
- gr.spinellis.product.Category
-
-
-public class Category extends java.lang.Object
-
-
-
-
-
-
-
-
-
-Field Summary
-
-
- java.lang.String name
-
-
-(package private) java.util.List<Product > products
-
-
-
-
-
-
-
-Constructor Summary
-
-Category
-
-
-
-
-
-
-Methods inherited from class java.lang.Object
-
-clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
-
-
-
-
-
-
-
-
-
-name
-
-public java.lang.String name
-
-
-
-
-
-products
-
-java.util.List<Product > products
-
-
-
-
-
-
-
-
-
-
-Constructor Detail
-
-
-
-Category
-
-public Category ()
-
-
-
-Category
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+java.lang.Object
+
+
+gr.spinellis.product.Category
+
+
+
+
+
+
+
+
+
+
+
+
+Field Summary
+
+Fields
+Modifier and Type
+Field and Description
+
+
+java.lang.Stringname
+
+(package private) java.util.List<Product >products
+
+
+
+
+
+
+
+Constructor Summary
+
+Constructors
+Constructor and Description
+
+
+Category
+
+
+
+
+
+
+
+Method Summary
+
+
+
+
+Methods inherited from class java.lang.Object
+clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Constructor Detail
+
+
+
+
+
+Category
+public Category()
+
+
+
+
+
+
+
-Product
-
-
-
-
-
-
-
-
-
-
-gr.spinellis.product
-
-
-
-
-
-
-java.lang.Object
- gr.spinellis.product.Product
-
-
-public class Product extends java.lang.Object
-
-
-
-
-
-
-
-
-
-
-
-
-
-Constructor Summary
-
-Product
-
-
-
-
-
-
-Methods inherited from class java.lang.Object
-
-clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
-
-
-
-
-
-
-
-
-
-name
-
-public java.lang.String name
-
-
-
-
-
-stock
-
-public int stock
-
-
-
-
-
-price
-
-public double price
-
-
-
-
-
-category
-
-public Category category
-
-
-
-
-
-
-
-
-
-
-Constructor Detail
-
-
-
-Product
-
-public Product ()
-
-
-
-Product
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+java.lang.Object
+
+
+gr.spinellis.product.Product
+
+
+
+
+
+
+
+
+
+
+
+
+Field Summary
+
+
+
+
+
+
+
+Constructor Summary
+
+Constructors
+Constructor and Description
+
+
+Product
+
+
+
+
+
+
+
+Method Summary
+
+
+
+
+Methods inherited from class java.lang.Object
+clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
+
+
+
+
+
+
+
+
+
+
+
+
+Field Detail
+
+
+
+
+
+
+
+
+
+stock
+public int stock
+
+
+
+
+
+
+
+price
+public double price
+
+
+
+
+
+
+
+category
+public Category category
+
+
+
+
+
+
+
+
+Constructor Detail
+
+
+
+
+
+Product
+public Product()
+
+
+
+
+
+
+
-gr.spinellis.product
-
-
-
-gr.spinellis.product
-
-
-
-
-
+
+
+
+
+
+gr.spinellis.product
+
-gr.spinellis.product
-
-
-
-
-
-
-
-
-
-Package gr.spinellis.product
-
-
-
-
-
-
-
-
-
-
-
-
-gr.spinellis.product
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+
+Class Summary
+Class
+Description
+
+
+
+Category
+
+
+Product
+
+
+
+
+
+
-gr.spinellis.product Class Hierarchy
-
-
-
-
-
-
-
-
-
-
-Hierarchy For Package gr.spinellis.product
-
-
-
-Package Hierarchies: All Packages
-
-Class Hierarchy
-
-
-gr.spinellis.product Class Hierarchy
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/testdata/umldoc-ref/help-doc.html b/testdata/umldoc-ref/help-doc.html
index 095e4fa..71d8a21 100644
--- a/testdata/umldoc-ref/help-doc.html
+++ b/testdata/umldoc-ref/help-doc.html
@@ -1,217 +1,214 @@
-
-
-
-
-
-
-API Help
-
-
-
-
-
-
-
-
-
-
-How This API Document Is Organized
-
-This API (Application Programming Interface) document has pages corresponding to the items in the navigation bar, described as follows.
-Overview
-
-
-
-The Overview page is the front page of this API document and provides a list of all packages with a summary for each. This page can also contain an overall description of the set of packages.
-
-Package
-
-
-
-Each package has a page that contains a list of its classes and interfaces, with a summary for each. This page can contain four categories:
-Interfaces (italic) Classes Enums Exceptions Errors Annotation Types
-
-
-Class/Interface
-
-
-
-Each class, interface, nested class and nested interface has its own separate page. Each of these pages has three sections consisting of a class/interface description, summary tables, and detailed member descriptions:
-Class inheritance diagram Direct Subclasses All Known Subinterfaces All Known Implementing Classes Class/interface declaration Class/interface description
-
-
Nested Class Summary Field Summary Constructor Summary Method Summary
-
-
Field Detail Constructor Detail Method Detail
-Each summary entry contains the first sentence from the detailed description for that item. The summary entries are alphabetical, while the detailed descriptions are in the order they appear in the source code. This preserves the logical groupings established by the programmer.
-
-
-Annotation Type
-
-
-
-Each annotation type has its own separate page with the following sections:
-Annotation Type declaration Annotation Type description Required Element Summary Optional Element Summary Element Detail
-
-
-
-Enum
-
-
-
-Each enum has its own separate page with the following sections:
-Enum declaration Enum description Enum Constant Summary Enum Constant Detail
-
-
-Tree (Class Hierarchy)
-
-There is a Class Hierarchy page for all packages, plus a hierarchy for each package. Each hierarchy page contains a list of classes and a list of interfaces. The classes are organized by inheritance structure starting with java.lang.Object. The interfaces do not inherit from java.lang.Object.
-When viewing the Overview page, clicking on "Tree" displays the hierarchy for all packages. When viewing a particular package, class or interface page, clicking "Tree" displays the hierarchy for only that package.
-
-
-Deprecated API
-
-The Deprecated API page lists all of the API that have been deprecated. A deprecated API is not recommended for use, generally due to improvements, and a replacement API is usually given. Deprecated APIs may be removed in future implementations.
-
-Index
-
-The Index contains an alphabetic list of all classes, interfaces, constructors, methods, and fields.
-
-Prev/Next
-These links take you to the next or previous class, interface, package, or related page.
-Frames/No Frames
-These links show and hide the HTML frames. All pages are available with or without frames.
-
-
-Serialized Form
-Each serializable or externalizable class has a description of its serialization fields and methods. This information is of interest to re-implementors, not to developers using the API. While there is no link in the navigation bar, you can get to this information by going to any serialized class and clicking "Serialized Form" in the "See also" section of the class description.
-
-
-Constant Field Values
-The Constant Field Values page lists the static final fields and their values.
-
-
-
-This help file applies to API documentation generated using the standard doclet.
-
-
API Help
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+Overview
+The Overview page is the front page of this API document and provides a list of all packages with a summary for each. This page can also contain an overall description of the set of packages.
+
+
+Package
+Each package has a page that contains a list of its classes and interfaces, with a summary for each. This page can contain six categories:
+
+Interfaces (italic)
+Classes
+Enums
+Exceptions
+Errors
+Annotation Types
+
+
+
+Class/Interface
+Each class, interface, nested class and nested interface has its own separate page. Each of these pages has three sections consisting of a class/interface description, summary tables, and detailed member descriptions:
+
+Class inheritance diagram
+Direct Subclasses
+All Known Subinterfaces
+All Known Implementing Classes
+Class/interface declaration
+Class/interface description
+
+
+Nested Class Summary
+Field Summary
+Constructor Summary
+Method Summary
+
+
+Field Detail
+Constructor Detail
+Method Detail
+
+Each summary entry contains the first sentence from the detailed description for that item. The summary entries are alphabetical, while the detailed descriptions are in the order they appear in the source code. This preserves the logical groupings established by the programmer.
+
+
+Annotation Type
+Each annotation type has its own separate page with the following sections:
+
+Annotation Type declaration
+Annotation Type description
+Required Element Summary
+Optional Element Summary
+Element Detail
+
+
+
+Enum
+Each enum has its own separate page with the following sections:
+
+Enum declaration
+Enum description
+Enum Constant Summary
+Enum Constant Detail
+
+
+
+Tree (Class Hierarchy)
+There is a Class Hierarchy page for all packages, plus a hierarchy for each package. Each hierarchy page contains a list of classes and a list of interfaces. The classes are organized by inheritance structure starting with java.lang.Object. The interfaces do not inherit from java.lang.Object.
+
+When viewing the Overview page, clicking on "Tree" displays the hierarchy for all packages.
+When viewing a particular package, class or interface page, clicking "Tree" displays the hierarchy for only that package.
+
+
+
+Deprecated API
+The Deprecated API page lists all of the API that have been deprecated. A deprecated API is not recommended for use, generally due to improvements, and a replacement API is usually given. Deprecated APIs may be removed in future implementations.
+
+
+Index
+The Index contains an alphabetic list of all classes, interfaces, constructors, methods, and fields.
+
+
+Prev/Next
+These links take you to the next or previous class, interface, package, or related page.
+
+
+Frames/No Frames
+These links show and hide the HTML frames. All pages are available with or without frames.
+
+
+All Classes
+The All Classes link shows all classes and interfaces except non-static nested types.
+
+
+Serialized Form
+Each serializable or externalizable class has a description of its serialization fields and methods. This information is of interest to re-implementors, not to developers using the API. While there is no link in the navigation bar, you can get to this information by going to any serialized class and clicking "Serialized Form" in the "See also" section of the class description.
+
+
+Constant Field Values
+The Constant Field Values page lists the static final fields and their values.
+
+
+
This help file applies to API documentation generated using the standard doclet.
-Index
-
-
-
-
-
-
-
-
-A C G I N P Q S T
-A
-
-addItem(Product, int) Invoice
-
-
-
-C
-
-Category gr.spinellis.product Category() Category
-
- category Product
-
- Customer gr.spinellis.invoice Customer() Customer
-
- customer Invoice
-
-
-
-G
-
-gr.spinellis.invoice gr.spinellis.product
-
-I
-
-Invoice gr.spinellis.invoice Invoice() Invoice
-
- invoiceDate Invoice
-
- InvoiceItem gr.spinellis.invoice InvoiceItem() InvoiceItem
-
- items Invoice
-
-
-
-N
-
-name Customer
-
- name Category
-
- name Product
-
-
-
-P
-
-price Product
-
- product InvoiceItem
-
- Product gr.spinellis.product Product() Product
-
- products Category
-
-
-
-Q
-
-quantity InvoiceItem
-
-
-
-S
-
-stock Product
-
-
-
-T
-
-total Invoice
-
-
-A C G I N P Q S T
-
-
-Index
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+A C G I N P Q S T
+
+
+
A
+
+addItem(Product, int) Invoice
+
+
+
+
+
C
+
+Category gr.spinellis.product
+Category() Category
+category Product
+Customer gr.spinellis.invoice
+Customer() Customer
+customer Invoice
+
+
+
+
+
G
+
+gr.spinellis.invoice - package gr.spinellis.invoice
+gr.spinellis.product - package gr.spinellis.product
+
+
+
+
+
I
+
+Invoice gr.spinellis.invoice
+Invoice() Invoice
+invoiceDate Invoice
+InvoiceItem gr.spinellis.invoice
+InvoiceItem() InvoiceItem
+items Invoice
+
+
+
+
+
N
+
+name Customer
+name Category
+name Product
+
+
+
+
+
P
+
+price Product
+product InvoiceItem
+Product gr.spinellis.product
+Product() Product
+products Category
+
+
+
+
+
Q
+
+quantity InvoiceItem
+
+
+
+
+
S
+
+stock Product
+
+
+
+
+
T
+
+total Invoice
+
+
A C G I N P Q S T
-Generated Documentation (Untitled)
-
-
-
-
-
-
-
-
-<![CDATA[
-<H2>
-Frame Alert</H2>
-
-<P>
-This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client.
-<BR>
-Link to<A HREF="overview-summary.html">Non-frame version.</A>
-]]>
-
-
+
+
+
+
+
+Generated Documentation (Untitled)
+
+
+
+
+
+<![CDATA[
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<h2>Frame Alert</h2>
+<p>This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client. Link to <a href="overview-summary.html">Non-frame version</a>.</p>
+]]>
+
+
diff --git a/testdata/umldoc-ref/overview-frame.html b/testdata/umldoc-ref/overview-frame.html
index d07f7dd..a1ee9d8 100644
--- a/testdata/umldoc-ref/overview-frame.html
+++ b/testdata/umldoc-ref/overview-frame.html
@@ -1,44 +1,21 @@
-
-
-
-
-
-
-Overview List
-
-
-
-
-
-
+
+
+
+
+
+Overview List
+
+
+
diff --git a/testdata/umldoc-ref/overview-summary.html b/testdata/umldoc-ref/overview-summary.html
index 6054eff..a39661c 100644
--- a/testdata/umldoc-ref/overview-summary.html
+++ b/testdata/umldoc-ref/overview-summary.html
@@ -1,153 +1,128 @@
-
-
-
-
-
-
-Overview
-
-
-
-
-
-
-
-
-
-
Overview
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/testdata/umldoc-ref/overview-tree.html b/testdata/umldoc-ref/overview-tree.html
index 02447c3..63166d0 100644
--- a/testdata/umldoc-ref/overview-tree.html
+++ b/testdata/umldoc-ref/overview-tree.html
@@ -1,150 +1,131 @@
-
-
-
-
-
-
-Class Hierarchy
-
-
-
-
-
-
-
-
-
-
-Hierarchy For All Packages
-
-
-Package Hierarchies: gr.spinellis.invoice , gr.spinellis.product
-
-Class Hierarchy
-
-
-Class Hierarchy
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/testdata/umldoc-ref/package-list b/testdata/umldoc-ref/package-list
index b1373f2..d4a3575 100644
--- a/testdata/umldoc-ref/package-list
+++ b/testdata/umldoc-ref/package-list
@@ -1,2 +1,2 @@
-gr.spinellis.invoice
-gr.spinellis.product
+gr.spinellis.invoice
+gr.spinellis.product
gr.spinellis.invoice.Customer -
