From 76c7c6290c83e6e44242a1cd4f55370bdeb1b6f3 Mon Sep 17 00:00:00 2001 From: Diomidis Spinellis Date: Tue, 28 Oct 2014 20:25:18 +0200 Subject: [PATCH] Update regression test reference files Verified with: for i in `cd dot-ref ; ls *.dot`; do ../tools/viscompare.sh $i; done Some differences having to do with inference were found. It is not clear which version is correct. --- testdata/dot-ref/Inference.dot | 12 +- testdata/dot-ref/MyVector.dot | 10 +- testdata/dot-ref/ViewContext.dot | 6 +- testdata/dot-ref/ViewInterfaces.dot | 20 +-- testdata/dot-ref/ViewSubclasses.dot | 20 +-- testdata/dot-ref/advrel.dot | 4 +- testdata/umldoc-ref/allclasses-frame.html | 7 +- testdata/umldoc-ref/allclasses-noframe.html | 7 +- testdata/umldoc-ref/constant-values.html | 37 +++-- testdata/umldoc-ref/deprecated-list.html | 37 +++-- .../gr/spinellis/invoice/Customer.dot | 30 ++-- .../gr/spinellis/invoice/Customer.html | 99 ++++++------ .../gr/spinellis/invoice/Invoice.dot | 50 +++---- .../gr/spinellis/invoice/Invoice.html | 141 ++++++++++-------- .../gr/spinellis/invoice/InvoiceItem.dot | 34 ++--- .../gr/spinellis/invoice/InvoiceItem.html | 101 +++++++------ .../gr/spinellis/invoice/package-frame.html | 5 +- .../gr/spinellis/invoice/package-summary.html | 55 ++++--- .../gr/spinellis/invoice/package-tree.html | 45 +++--- .../gr/spinellis/product/Category.dot | 36 +++-- .../gr/spinellis/product/Category.html | 105 +++++++------ .../gr/spinellis/product/Product.dot | 56 ++++--- .../gr/spinellis/product/Product.html | 117 ++++++++------- .../product/gr.spinellis.product.dot | 24 ++- .../gr/spinellis/product/package-frame.html | 5 +- .../gr/spinellis/product/package-summary.html | 53 ++++--- .../gr/spinellis/product/package-tree.html | 43 +++--- testdata/umldoc-ref/help-doc.html | 39 +++-- testdata/umldoc-ref/index-all.html | 131 ++++++++-------- testdata/umldoc-ref/index.html | 45 +++++- testdata/umldoc-ref/overview-frame.html | 7 +- testdata/umldoc-ref/overview-summary.html | 37 +++-- testdata/umldoc-ref/overview-tree.html | 49 +++--- 33 files changed, 822 insertions(+), 645 deletions(-) diff --git a/testdata/dot-ref/Inference.dot b/testdata/dot-ref/Inference.dot index 44b071f..fd0b978 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 R5_6-9-g37cd34 (http://www.umlgraph.org/) +# Generated by UMLGraph version R5_7_0-10-g786d98 (http://www.umlgraph.org/) # digraph G { @@ -27,12 +27,8 @@ digraph G { c69:p -> c70:p [dir=back,arrowtail=empty]; // A HAS B c66:p -> c67:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none, arrowtail=ediamond, dir=both]; - // A HAS B - c66:p -> c67:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none, arrowtail=ediamond, dir=both]; // A HAS C c66:p -> c68:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none, arrowtail=ediamond, dir=both]; - // C NAVASSOC A - c68:p -> c66:p [taillabel="", label="", headlabel="*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open]; // C NAVASSOC B c68:p -> c67:p [taillabel="", label="", headlabel="*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open]; // C NAVASSOC D @@ -45,9 +41,9 @@ digraph G { c71:p -> c70:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open]; // B DEPEND A c67:p -> c66:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open, style=dashed]; - // java.util.ArrayList - c72 [label=<
ArrayList<E>
serialVersionUID : long
elementData : Object[]
size : int
MAX_ARRAY_SIZE : int
trimToSize()
ensureCapacity(arg0 : int)
ensureCapacityInternal(arg0 : int)
grow(arg0 : int)
hugeCapacity(arg0 : int) : int
size() : int
isEmpty() : boolean
contains(arg0 : Object) : boolean
indexOf(arg0 : Object) : int
lastIndexOf(arg0 : Object) : int
clone() : Object
toArray() : Object[]
toArray(arg0 : T[]) : T[]
elementData(arg0 : int) : E
get(arg0 : int) : E
set(arg0 : int, arg1 : E) : E
add(arg0 : E) : boolean
add(arg0 : int, arg1 : E)
remove(arg0 : int) : E
remove(arg0 : Object) : boolean
fastRemove(arg0 : int)
clear()
addAll(arg0 : Collection<?>) : boolean
addAll(arg0 : int, arg1 : Collection<?>) : boolean
removeRange(arg0 : int, arg1 : int)
rangeCheck(arg0 : int)
rangeCheckForAdd(arg0 : int)
outOfBoundsMsg(arg0 : int) : String
removeAll(arg0 : Collection<?>) : boolean
retainAll(arg0 : Collection<?>) : boolean
batchRemove(arg0 : Collection<?>, arg1 : boolean) : boolean
writeObject(arg0 : ObjectOutputStream)
readObject(arg0 : ObjectInputStream)
listIterator(arg0 : int) : ListIterator<E>
listIterator() : ListIterator<E>
iterator() : Iterator<E>
subList(arg0 : int, arg1 : int) : List<E>
subListRangeCheck(arg0 : int, arg1 : int, arg2 : int)
>, URL="http://java.sun.com/j2se/1.4.2/docs/api/java/util/ArrayList.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; // java.util.List - c73 [label=<
«interface»
List<E>
size() : int
isEmpty() : boolean
contains(arg0 : Object) : boolean
iterator() : Iterator<E>
toArray() : Object[]
toArray(arg0 : T[]) : T[]
add(arg0 : E) : boolean
remove(arg0 : Object) : boolean
containsAll(arg0 : Collection<?>) : boolean
addAll(arg0 : Collection<?>) : boolean
addAll(arg0 : int, arg1 : Collection<?>) : boolean
removeAll(arg0 : Collection<?>) : boolean
retainAll(arg0 : Collection<?>) : boolean
clear()
equals(arg0 : Object) : boolean
hashCode() : int
get(arg0 : int) : E
set(arg0 : int, arg1 : E) : E
add(arg0 : int, arg1 : E)
remove(arg0 : int) : E
indexOf(arg0 : Object) : int
lastIndexOf(arg0 : Object) : int
listIterator() : ListIterator<E>
listIterator(arg0 : int) : ListIterator<E>
subList(arg0 : int, arg1 : int) : List<E>
>, URL="http://java.sun.com/j2se/1.4.2/docs/api/java/util/List.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c73 [label=<
«interface»
List<E>
size() : int
isEmpty() : boolean
contains(arg0 : Object) : boolean
iterator() : Iterator<E>
toArray() : Object[]
toArray(arg0 : T[]) : T[]
add(arg0 : E) : boolean
remove(arg0 : Object) : boolean
containsAll(arg0 : Collection<?>) : boolean
addAll(arg0 : Collection<?>) : boolean
addAll(arg0 : int, arg1 : Collection<?>) : boolean
removeAll(arg0 : Collection<?>) : boolean
retainAll(arg0 : Collection<?>) : boolean
replaceAll(arg0 : UnaryOperator<E>)
sort(arg0 : Comparator<?>)
clear()
equals(arg0 : Object) : boolean
hashCode() : int
get(arg0 : int) : E
set(arg0 : int, arg1 : E) : E
add(arg0 : int, arg1 : E)
remove(arg0 : int) : E
indexOf(arg0 : Object) : int
lastIndexOf(arg0 : Object) : int
listIterator() : ListIterator<E>
listIterator(arg0 : int) : ListIterator<E>
subList(arg0 : int, arg1 : int) : List<E>
spliterator() : Spliterator<E>
>, URL="http://java.sun.com/j2se/1.4.2/docs/api/java/util/List.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + // java.util.ArrayList + c72 [label=<
ArrayList<E>
serialVersionUID : long
DEFAULT_CAPACITY : int
EMPTY_ELEMENTDATA : Object[]
DEFAULTCAPACITY_EMPTY_ELEMENTDATA : Object[]
elementData : Object[]
size : int
MAX_ARRAY_SIZE : int
trimToSize()
ensureCapacity(arg0 : int)
ensureCapacityInternal(arg0 : int)
ensureExplicitCapacity(arg0 : int)
grow(arg0 : int)
hugeCapacity(arg0 : int) : int
size() : int
isEmpty() : boolean
contains(arg0 : Object) : boolean
indexOf(arg0 : Object) : int
lastIndexOf(arg0 : Object) : int
clone() : Object
toArray() : Object[]
toArray(arg0 : T[]) : T[]
elementData(arg0 : int) : E
get(arg0 : int) : E
set(arg0 : int, arg1 : E) : E
add(arg0 : E) : boolean
add(arg0 : int, arg1 : E)
remove(arg0 : int) : E
remove(arg0 : Object) : boolean
fastRemove(arg0 : int)
clear()
addAll(arg0 : Collection<?>) : boolean
addAll(arg0 : int, arg1 : Collection<?>) : boolean
removeRange(arg0 : int, arg1 : int)
rangeCheck(arg0 : int)
rangeCheckForAdd(arg0 : int)
outOfBoundsMsg(arg0 : int) : String
removeAll(arg0 : Collection<?>) : boolean
retainAll(arg0 : Collection<?>) : boolean
batchRemove(arg0 : Collection<?>, arg1 : boolean) : boolean
writeObject(arg0 : ObjectOutputStream)
readObject(arg0 : ObjectInputStream)
listIterator(arg0 : int) : ListIterator<E>
listIterator() : ListIterator<E>
iterator() : Iterator<E>
subList(arg0 : int, arg1 : int) : List<E>
subListRangeCheck(arg0 : int, arg1 : int, arg2 : int)
forEach(arg0 : Consumer<?>)
spliterator() : Spliterator<E>
removeIf(arg0 : Predicate<?>) : boolean
replaceAll(arg0 : UnaryOperator<E>)
sort(arg0 : Comparator<?>)
>, URL="http://java.sun.com/j2se/1.4.2/docs/api/java/util/ArrayList.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; } diff --git a/testdata/dot-ref/MyVector.dot b/testdata/dot-ref/MyVector.dot index 08cb063..e3aeb8a 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 R5_6-9-g37cd34 (http://www.umlgraph.org/) +# Generated by UMLGraph version R5_7_0-10-g786d98 (http://www.umlgraph.org/) # digraph G { @@ -19,13 +19,13 @@ digraph G { c88:p -> c85:p [dir=back,arrowtail=empty,style=dashed]; //MyVector implements java.lang.Cloneable c89:p -> c85:p [dir=back,arrowtail=empty,style=dashed]; - // java.util.Vector - c86 [label=<
Vector<E>
# elementData : Object[]
# elementCount : int
# capacityIncrement : int
- serialVersionUID : long
- MAX_ARRAY_SIZE : int
+ copyInto(arg0 : Object[])
+ trimToSize()
+ ensureCapacity(arg0 : int)
- ensureCapacityHelper(arg0 : int)
- grow(arg0 : int)
- hugeCapacity(arg0 : int) : int
+ setSize(arg0 : int)
+ capacity() : int
+ size() : int
+ isEmpty() : boolean
+ elements() : Enumeration<E>
+ contains(arg0 : Object) : boolean
+ indexOf(arg0 : Object) : int
+ indexOf(arg0 : Object, arg1 : int) : int
+ lastIndexOf(arg0 : Object) : int
+ lastIndexOf(arg0 : Object, arg1 : int) : int
+ elementAt(arg0 : int) : E
+ firstElement() : E
+ lastElement() : E
+ setElementAt(arg0 : E, arg1 : int)
+ removeElementAt(arg0 : int)
+ insertElementAt(arg0 : E, arg1 : int)
+ addElement(arg0 : E)
+ removeElement(arg0 : Object) : boolean
+ removeAllElements()
+ clone() : Object
+ toArray() : Object[]
+ toArray(arg0 : T[]) : T[]
~ elementData(arg0 : int) : E
+ get(arg0 : int) : E
+ set(arg0 : int, arg1 : E) : E
+ add(arg0 : E) : boolean
+ remove(arg0 : Object) : boolean
+ add(arg0 : int, arg1 : E)
+ remove(arg0 : int) : E
+ clear()
+ containsAll(arg0 : Collection<?>) : boolean
+ addAll(arg0 : Collection<?>) : boolean
+ removeAll(arg0 : Collection<?>) : boolean
+ retainAll(arg0 : Collection<?>) : boolean
+ addAll(arg0 : int, arg1 : Collection<?>) : boolean
+ equals(arg0 : Object) : boolean
+ hashCode() : int
+ toString() : String
+ subList(arg0 : int, arg1 : int) : List<E>
# removeRange(arg0 : int, arg1 : int)
- writeObject(arg0 : ObjectOutputStream)
+ listIterator(arg0 : int) : ListIterator<E>
+ listIterator() : ListIterator<E>
+ iterator() : Iterator<E>
>, URL="http://java.sun.com/j2se/1.4.2/docs/api/java/util/Vector.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; - // java.util.List - c87 [label=<
«interface»
List<E>
+ size() : int
+ isEmpty() : boolean
+ contains(arg0 : Object) : boolean
+ iterator() : Iterator<E>
+ toArray() : Object[]
+ toArray(arg0 : T[]) : T[]
+ add(arg0 : E) : boolean
+ remove(arg0 : Object) : boolean
+ containsAll(arg0 : Collection<?>) : boolean
+ addAll(arg0 : Collection<?>) : boolean
+ addAll(arg0 : int, arg1 : Collection<?>) : boolean
+ removeAll(arg0 : Collection<?>) : boolean
+ retainAll(arg0 : Collection<?>) : boolean
+ clear()
+ equals(arg0 : Object) : boolean
+ hashCode() : int
+ get(arg0 : int) : E
+ set(arg0 : int, arg1 : E) : E
+ add(arg0 : int, arg1 : E)
+ remove(arg0 : int) : E
+ indexOf(arg0 : Object) : int
+ lastIndexOf(arg0 : Object) : int
+ listIterator() : ListIterator<E>
+ listIterator(arg0 : int) : ListIterator<E>
+ subList(arg0 : int, arg1 : int) : List<E>
>, URL="http://java.sun.com/j2se/1.4.2/docs/api/java/util/List.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; // java.util.RandomAccess c88 [label=<
«interface»
RandomAccess
>, URL="http://java.sun.com/j2se/1.4.2/docs/api/java/util/RandomAccess.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + // java.util.List + c87 [label=<
«interface»
List<E>
+ size() : int
+ isEmpty() : boolean
+ contains(arg0 : Object) : boolean
+ iterator() : Iterator<E>
+ toArray() : Object[]
+ toArray(arg0 : T[]) : T[]
+ add(arg0 : E) : boolean
+ remove(arg0 : Object) : boolean
+ containsAll(arg0 : Collection<?>) : boolean
+ addAll(arg0 : Collection<?>) : boolean
+ addAll(arg0 : int, arg1 : Collection<?>) : boolean
+ removeAll(arg0 : Collection<?>) : boolean
+ retainAll(arg0 : Collection<?>) : boolean
+ replaceAll(arg0 : UnaryOperator<E>)
+ sort(arg0 : Comparator<?>)
+ clear()
+ equals(arg0 : Object) : boolean
+ hashCode() : int
+ get(arg0 : int) : E
+ set(arg0 : int, arg1 : E) : E
+ add(arg0 : int, arg1 : E)
+ remove(arg0 : int) : E
+ indexOf(arg0 : Object) : int
+ lastIndexOf(arg0 : Object) : int
+ listIterator() : ListIterator<E>
+ listIterator(arg0 : int) : ListIterator<E>
+ subList(arg0 : int, arg1 : int) : List<E>
+ spliterator() : Spliterator<E>
>, URL="http://java.sun.com/j2se/1.4.2/docs/api/java/util/List.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; // java.lang.Cloneable c89 [label=<
«interface»
Cloneable
>, URL="http://java.sun.com/j2se/1.4.2/docs/api/java/lang/Cloneable.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + // java.util.Vector + c86 [label=<
Vector<E>
# elementData : Object[]
# elementCount : int
# capacityIncrement : int
- serialVersionUID : long
- MAX_ARRAY_SIZE : int
+ copyInto(arg0 : Object[])
+ trimToSize()
+ ensureCapacity(arg0 : int)
- ensureCapacityHelper(arg0 : int)
- grow(arg0 : int)
- hugeCapacity(arg0 : int) : int
+ setSize(arg0 : int)
+ capacity() : int
+ size() : int
+ isEmpty() : boolean
+ elements() : Enumeration<E>
+ contains(arg0 : Object) : boolean
+ indexOf(arg0 : Object) : int
+ indexOf(arg0 : Object, arg1 : int) : int
+ lastIndexOf(arg0 : Object) : int
+ lastIndexOf(arg0 : Object, arg1 : int) : int
+ elementAt(arg0 : int) : E
+ firstElement() : E
+ lastElement() : E
+ setElementAt(arg0 : E, arg1 : int)
+ removeElementAt(arg0 : int)
+ insertElementAt(arg0 : E, arg1 : int)
+ addElement(arg0 : E)
+ removeElement(arg0 : Object) : boolean
+ removeAllElements()
+ clone() : Object
+ toArray() : Object[]
+ toArray(arg0 : T[]) : T[]
~ elementData(arg0 : int) : E
+ get(arg0 : int) : E
+ set(arg0 : int, arg1 : E) : E
+ add(arg0 : E) : boolean
+ remove(arg0 : Object) : boolean
+ add(arg0 : int, arg1 : E)
+ remove(arg0 : int) : E
+ clear()
+ containsAll(arg0 : Collection<?>) : boolean
+ addAll(arg0 : Collection<?>) : boolean
+ removeAll(arg0 : Collection<?>) : boolean
+ retainAll(arg0 : Collection<?>) : boolean
+ addAll(arg0 : int, arg1 : Collection<?>) : boolean
+ equals(arg0 : Object) : boolean
+ hashCode() : int
+ toString() : String
+ subList(arg0 : int, arg1 : int) : List<E>
# removeRange(arg0 : int, arg1 : int)
- writeObject(arg0 : ObjectOutputStream)
+ listIterator(arg0 : int) : ListIterator<E>
+ listIterator() : ListIterator<E>
+ iterator() : Iterator<E>
+ forEach(arg0 : Consumer<?>)
+ removeIf(arg0 : Predicate<?>) : boolean
+ replaceAll(arg0 : UnaryOperator<E>)
+ sort(arg0 : Comparator<?>)
+ spliterator() : Spliterator<E>
>, URL="http://java.sun.com/j2se/1.4.2/docs/api/java/util/Vector.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; } diff --git a/testdata/dot-ref/ViewContext.dot b/testdata/dot-ref/ViewContext.dot index 00bff8e..30f4127 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 R5_6-9-g37cd34 (http://www.umlgraph.org/) +# Generated by UMLGraph version R5_7_0-10-g786d98 (http://www.umlgraph.org/) # digraph G { @@ -32,12 +32,12 @@ digraph G { // 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]; + c434:p -> c508: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=<
JComponent
>, URL="http://java.sun.com/j2se/1.4.2/docs/api/javax/swing/JComponent.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c508 [label=<
JComponent
>, 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 4f64c77..c6f8f17 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_6-9-g37cd34 (http://www.umlgraph.org/) +# Generated by UMLGraph version R5_7_0-10-g786d98 (http://www.umlgraph.org/) # digraph G { @@ -10,22 +10,22 @@ digraph G { nodesep=0.25; ranksep=0.5; // gr.spinellis.iface.classes.FarImplementor - c534 [label=<
FarImplementor
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c533 [label=<
FarImplementor
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.iface.classes.DirectImplementor - c535 [label=<
DirectImplementor
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c534 [label=<
DirectImplementor
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.iface.classes.SubSubFace - c537 [label=<
«interface»
SubSubFace
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c536 [label=<
«interface»
SubSubFace
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.iface.classes.SubFace - c538 [label=<
«interface»
SubFace
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c537 [label=<
«interface»
SubFace
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.iface.classes.Face - c539 [label=<
«interface»
Face
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c538 [label=<
«interface»
Face
>, 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]; + c536:p -> c533: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]; + c538:p -> c534: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]; + c537:p -> c536: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]; + c538:p -> c537:p [dir=back,arrowtail=empty,style=dashed]; } diff --git a/testdata/dot-ref/ViewSubclasses.dot b/testdata/dot-ref/ViewSubclasses.dot index 2df0707..965eaad 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_6-9-g37cd34 (http://www.umlgraph.org/) +# Generated by UMLGraph version R5_7_0-10-g786d98 (http://www.umlgraph.org/) # digraph G { @@ -10,22 +10,22 @@ digraph G { nodesep=0.25; ranksep=0.5; // gr.spinellis.subclass.classes.SubOneTwo - c580 [label=<
SubOneTwo
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c579 [label=<
SubOneTwo
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.subclass.classes.SubOneOne - c581 [label=<
SubOneOne
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c580 [label=<
SubOneOne
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.subclass.classes.SubTwo - c582 [label=<
SubTwo
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c581 [label=<
SubTwo
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.subclass.classes.SubOne - c583 [label=<
SubOne
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c582 [label=<
SubOne
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.subclass.classes.Super - c584 [label=<
Super
>, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c583 [label=<
Super
>, 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]; + c582:p -> c579:p [dir=back,arrowtail=empty]; //gr.spinellis.subclass.classes.SubOneOne extends gr.spinellis.subclass.classes.SubOne - c583:p -> c581:p [dir=back,arrowtail=empty]; + c582:p -> c580:p [dir=back,arrowtail=empty]; //gr.spinellis.subclass.classes.SubTwo extends gr.spinellis.subclass.classes.Super - c584:p -> c582:p [dir=back,arrowtail=empty]; + c583:p -> c581:p [dir=back,arrowtail=empty]; //gr.spinellis.subclass.classes.SubOne extends gr.spinellis.subclass.classes.Super - c584:p -> c583:p [dir=back,arrowtail=empty]; + c583:p -> c582:p [dir=back,arrowtail=empty]; } diff --git a/testdata/dot-ref/advrel.dot b/testdata/dot-ref/advrel.dot index 0be46a3..92e9a8e 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 R5_6-9-g37cd34 (http://www.umlgraph.org/) +# Generated by UMLGraph version R5_7_0-10-g786d98 (http://www.umlgraph.org/) # digraph G { @@ -20,7 +20,7 @@ digraph G { // ChannelIterator c9 [label=<
ChannelIterator
>, 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]; + 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]; //SetTopController extends EmbeddedAgent diff --git a/testdata/umldoc-ref/allclasses-frame.html b/testdata/umldoc-ref/allclasses-frame.html index 3207362..9846d5f 100644 --- a/testdata/umldoc-ref/allclasses-frame.html +++ b/testdata/umldoc-ref/allclasses-frame.html @@ -2,13 +2,14 @@ - + All Classes - + + -

All Classes

+

All Classes

  • Category
  • diff --git a/testdata/umldoc-ref/allclasses-noframe.html b/testdata/umldoc-ref/allclasses-noframe.html index d535719..e0eaff6 100644 --- a/testdata/umldoc-ref/allclasses-noframe.html +++ b/testdata/umldoc-ref/allclasses-noframe.html @@ -2,13 +2,14 @@ - + All Classes - + + -

    All Classes

    +

    All Classes

    • Category
    • diff --git a/testdata/umldoc-ref/constant-values.html b/testdata/umldoc-ref/constant-values.html index e286709..a014f71 100644 --- a/testdata/umldoc-ref/constant-values.html +++ b/testdata/umldoc-ref/constant-values.html @@ -2,15 +2,20 @@ - + Constant Field Values - + + @@ -18,9 +23,11 @@
      JavaScript is disabled on your browser.
      -
      +
      - + + +
      - +
      @@ -66,9 +73,11 @@

      Contents

      -
      +
      - + + +
      - +
      diff --git a/testdata/umldoc-ref/deprecated-list.html b/testdata/umldoc-ref/deprecated-list.html index 011283f..83cd591 100644 --- a/testdata/umldoc-ref/deprecated-list.html +++ b/testdata/umldoc-ref/deprecated-list.html @@ -2,15 +2,20 @@ - + Deprecated List - + + @@ -18,9 +23,11 @@
      JavaScript is disabled on your browser.
      -
      +
      - + + +
      - +
      @@ -66,9 +73,11 @@

      Contents

      -
      +
      - + + +
      - +
      diff --git a/testdata/umldoc-ref/gr/spinellis/invoice/Customer.dot b/testdata/umldoc-ref/gr/spinellis/invoice/Customer.dot index 89538f9..bbe2826 100644 --- a/testdata/umldoc-ref/gr/spinellis/invoice/Customer.dot +++ b/testdata/umldoc-ref/gr/spinellis/invoice/Customer.dot @@ -1,23 +1,23 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UMLGraph version 5.4 (http://www.umlgraph.org/) +# Generated by UMLGraph version R5_7_0-10-g786d98 (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.invoice.Invoice - c32 [label=<
      Invoice
      >, URL="./Invoice.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; - // gr.spinellis.invoice.Customer - c33 [label=<
      Customer
      >, URL="./Customer.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; - // gr.spinellis.invoice.Invoice NAVASSOC gr.spinellis.invoice.Customer - c32:p -> c33:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open]; - // gr.spinellis.invoice.Customer NAVASSOC java.lang.String - c33:p -> c42:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open]; - // java.lang.String - c42 [label=<
      String
      java.lang
      >, URL="http://java.sun.com/j2se/1.4.2/docs/api/java/lang/String.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + node [fontname="Helvetica",fontsize=10,shape=plaintext]; + nodesep=0.25; + ranksep=0.5; + // gr.spinellis.invoice.Invoice + c33 [label=<
      Invoice
      >, URL="./Invoice.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + // gr.spinellis.invoice.Customer + c34 [label=<
      Customer
      >, URL="./Customer.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + // gr.spinellis.invoice.Invoice NAVASSOC gr.spinellis.invoice.Customer + c33:p -> c34:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open]; + // gr.spinellis.invoice.Customer NAVASSOC java.lang.String + c34:p -> c44:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open]; + // java.lang.String + c44 [label=<
      String
      java.lang
      >, URL="http://java.sun.com/j2se/1.4.2/docs/api/java/lang/String.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; } - + diff --git a/testdata/umldoc-ref/gr/spinellis/invoice/Customer.html b/testdata/umldoc-ref/gr/spinellis/invoice/Customer.html index 3f6e8a3..d866a92 100644 --- a/testdata/umldoc-ref/gr/spinellis/invoice/Customer.html +++ b/testdata/umldoc-ref/gr/spinellis/invoice/Customer.html @@ -2,15 +2,20 @@ - + Customer - + + @@ -18,9 +23,11 @@
      JavaScript is disabled on your browser.
      -
      +
      - + + +