diff --git a/testdata/dot-ref/Abstr.dot b/testdata/dot-ref/Abstr.dot index 4dfa35b..5f44e9a 100644 --- a/testdata/dot-ref/Abstr.dot +++ b/testdata/dot-ref/Abstr.dot @@ -1,23 +1,23 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 4.1 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph) # digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; node [fontname="Helvetica",fontsize=10,shape=plaintext]; // test.AbstractNode - c1 [label=<
AbstractNode
abstractMethod()
concreteMethod()
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c99 [label=<
AbstractNode
abstractMethod()
concreteMethod()
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // test.InnerNode - c2 [label=<
InnerNode
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c100 [label=<
InnerNode
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // test.Leaf - c3 [label=<
Leaf
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c101 [label=<
Leaf
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; //test.InnerNode extends test.AbstractNode - c1:p -> c2:p [dir=back,arrowtail=empty]; - // test.InnerNode composed test.AbstractNode - c2:p -> c1:p [taillabel="1", label="has", headlabel="*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none, arrowtail=diamond]; + c99:p -> c100:p [dir=back,arrowtail=empty]; + // test.InnerNode COMPOSED test.AbstractNode + c100:p -> c99:p [taillabel="1", label="has", headlabel="*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none, arrowtail=diamond]; //test.Leaf extends test.AbstractNode - c1:p -> c3:p [dir=back,arrowtail=empty]; + c99:p -> c101:p [dir=back,arrowtail=empty]; } diff --git a/testdata/dot-ref/Inference.dot b/testdata/dot-ref/Inference.dot index 531bd25..d033bcd 100644 --- a/testdata/dot-ref/Inference.dot +++ b/testdata/dot-ref/Inference.dot @@ -1,51 +1,51 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 4.4 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph) # digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; node [fontname="Helvetica",fontsize=10,shape=plaintext]; // A - c66 [label=<
A
first : B
second : B
third : C
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c113 [label=<
A
first : B
second : B
third : C
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // B - c67 [label=<
B
doSomething(b : B, c : C) : A
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c114 [label=<
B
doSomething(b : B, c : C) : A
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // C - c68 [label=<
C
collectionOfA : List<A>
collectionOfB : ArrayList<B>
mapOfD : Map<String, D>
childs : C[]
anOpaqueList : List<>
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c115 [label=<
C
collectionOfA : List<A>
collectionOfB : ArrayList<B>
mapOfD : Map<String, D>
childs : C[]
anOpaqueList : List<>
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // MyFunnyList - c69 [label=<
MyFunnyList<T, V>
myField : V
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c116 [label=<
MyFunnyList<T, V>
myField : V
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // MyList - c70 [label=<
MyList
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c117 [label=<
MyList
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // D - c71 [label=<
D
anotherListOfA : MyList
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c118 [label=<
D
anotherListOfA : MyList
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; //MyFunnyList extends java.util.ArrayList - c72:p -> c69:p [dir=back,arrowtail=empty]; + c119:p -> c116:p [dir=back,arrowtail=empty]; //MyList extends MyFunnyList - c69:p -> c70:p [dir=back,arrowtail=empty]; + c116:p -> c117: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]; + c113:p -> c114:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none, arrowtail=ediamond]; // A HAS B - c66:p -> c67:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none, arrowtail=ediamond]; + c113:p -> c114:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none, arrowtail=ediamond]; // A HAS C - c66:p -> c68:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none, arrowtail=ediamond]; + c113:p -> c115:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none, arrowtail=ediamond]; // C NAVASSOC A - c68:p -> c66:p [taillabel="", label="", headlabel="*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open]; + c115:p -> c113: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]; + c115:p -> c114:p [taillabel="", label="", headlabel="*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open]; // C NAVASSOC D - c68:p -> c71:p [taillabel="", label="", headlabel="*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open]; + c115:p -> c118:p [taillabel="", label="", headlabel="*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open]; // C NAVASSOC C - c68:p -> c68:p [taillabel="", label="", headlabel="*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open]; + c115:p -> c115:p [taillabel="", label="", headlabel="*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open]; // C NAVASSOC java.util.List - c68:p -> c73:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open]; + c115:p -> c120:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open]; // D NAVASSOC MyList - c71:p -> c70:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open]; + c118:p -> c117: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]; + c114:p -> c113: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 : E[]
size : int
trimToSize()
ensureCapacity(arg0 : 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[]
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)
writeObject(arg0 : ObjectOutputStream)
readObject(arg0 : ObjectInputStream)
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c119 [label=<
ArrayList<E>
serialVersionUID : long
elementData : Object[]
size : int
trimToSize()
ensureCapacity(arg0 : 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[]
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)
writeObject(arg0 : ObjectOutputStream)
readObject(arg0 : ObjectInputStream)
>, 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>
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c120 [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>
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; } diff --git a/testdata/dot-ref/Irp.dot b/testdata/dot-ref/Irp.dot index 7c70527..a077ba5 100644 --- a/testdata/dot-ref/Irp.dot +++ b/testdata/dot-ref/Irp.dot @@ -1,21 +1,21 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 4.1 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph) # digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; node [fontname="Helvetica",fontsize=10,shape=plaintext]; // Application - c75 [label=<
Application
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c0 [label=<
Application
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // IrpApplication - c76 [label=<
IrpApplication
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c1 [label=<
IrpApplication
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // Main - c77 [label=<
Main
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c2 [label=<
Main
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; //IrpApplication extends Application - c75:p -> c76:p [dir=back,arrowtail=empty]; - // Main depend IrpApplication - c77:p -> c76:p [taillabel="", label="«friend»", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open, style=dashed]; + c0:p -> c1:p [dir=back,arrowtail=empty]; + // Main DEPEND IrpApplication + c2:p -> c1:p [taillabel="", label="«friend»", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open, style=dashed]; } diff --git a/testdata/dot-ref/MultiAssoc.dot b/testdata/dot-ref/MultiAssoc.dot index 05ae880..e9f14f2 100644 --- a/testdata/dot-ref/MultiAssoc.dot +++ b/testdata/dot-ref/MultiAssoc.dot @@ -1,17 +1,17 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 4.1 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph) # digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; node [fontname="Helvetica",fontsize=10,shape=plaintext]; // A - c82 [label=<
A
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c91 [label=<
A
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // C - c84 [label=<
C
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; - // A depend C - c82:p -> c84:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open, style=dashed]; + c93 [label=<
C
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + // A DEPEND C + c91:p -> c93:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open, style=dashed]; } diff --git a/testdata/dot-ref/MyVector.dot b/testdata/dot-ref/MyVector.dot index 17520d8..5fcd14c 100644 --- a/testdata/dot-ref/MyVector.dot +++ b/testdata/dot-ref/MyVector.dot @@ -1,29 +1,29 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 4.1 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph) # digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; node [fontname="Helvetica",fontsize=10,shape=plaintext]; // MyVector - c86 [label=<
MyVector<E, P>
~ addAll(index : int, c : Collection<E>) : boolean
~ foo(x : MyVector<P, MyVector<E, E>>) : MyVector<E, P>
~ removeAll(c : Collection<?>) : boolean
~ set(index : int, element : E) : E
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c4 [label=<
MyVector<E, P>
~ addAll(index : int, c : Collection<E>) : boolean
~ foo(x : MyVector<P, MyVector<E, E>>) : MyVector<E, P>
~ removeAll(c : Collection<?>) : boolean
~ set(index : int, element : E) : E
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; //MyVector extends java.util.Vector - c87:p -> c86:p [dir=back,arrowtail=empty]; + c5:p -> c4:p [dir=back,arrowtail=empty]; //MyVector implements java.util.List - c88:p -> c86:p [dir=back,arrowtail=empty,style=dashed]; + c6:p -> c4:p [dir=back,arrowtail=empty,style=dashed]; //MyVector implements java.util.RandomAccess - c89:p -> c86:p [dir=back,arrowtail=empty,style=dashed]; + c7:p -> c4:p [dir=back,arrowtail=empty,style=dashed]; //MyVector implements java.lang.Cloneable - c90:p -> c86:p [dir=back,arrowtail=empty,style=dashed]; - // java.lang.Cloneable - c90 [label=<
«interface»
Cloneable
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; - // java.util.List - c88 [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>
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; - // java.util.RandomAccess - c89 [label=<
«interface»
RandomAccess
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c8:p -> c4:p [dir=back,arrowtail=empty,style=dashed]; // java.util.Vector - c87 [label=<
Vector<E>
# elementData : Object[]
# elementCount : int
# capacityIncrement : int
- serialVersionUID : long
+ copyInto(arg0 : Object[])
+ trimToSize()
+ ensureCapacity(arg0 : int)
- ensureCapacityHelper(arg0 : 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[]
+ 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)
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c5 [label=<
Vector<E>
# elementData : Object[]
# elementCount : int
# capacityIncrement : int
- serialVersionUID : long
+ copyInto(arg0 : Object[])
+ trimToSize()
+ ensureCapacity(arg0 : int)
- ensureCapacityHelper(arg0 : 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[]
+ 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)
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + // java.util.List + c6 [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>
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + // java.util.RandomAccess + c7 [label=<
«interface»
RandomAccess
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + // java.lang.Cloneable + c8 [label=<
«interface»
Cloneable
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; } diff --git a/testdata/dot-ref/Root.dot b/testdata/dot-ref/Root.dot index a26074c..c8a8231 100644 --- a/testdata/dot-ref/Root.dot +++ b/testdata/dot-ref/Root.dot @@ -1,45 +1,45 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 4.1 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph) # digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; node [fontname="Helvetica",fontsize=10,shape=plaintext]; // Root - c91 [label=<
Root
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c9 [label=<
Root
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // Adapter - c92 [label=<
Adapter
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c10 [label=<
Adapter
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // Element - c93 [label=<
Element
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c11 [label=<
Element
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // ObjectType - c94 [label=<
ObjectType
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c12 [label=<
ObjectType
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // ObjectMap - c95 [label=<
ObjectMap
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c13 [label=<
ObjectMap
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // Table - c96 [label=<
Table
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c14 [label=<
Table
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // DataOperation - c97 [label=<
DataOperation
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; - // Root assoc Adapter - c91:p -> c92:p [taillabel="1..1", label="", headlabel="0..n", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; - // Root assoc ObjectType - c91:p -> c94:p [taillabel="", label="", headlabel="0..n", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; - // Root assoc ObjectMap - c91:p -> c95:p [taillabel="", label="", headlabel="0..n", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; - // Root assoc Table - c91:p -> c96:p [taillabel="", label="", headlabel="0..n", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; - // Root assoc DataOperation - c91:p -> c97:p [taillabel="", label="", headlabel="0..n", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; + c15 [label=<
DataOperation
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + // Root ASSOC Adapter + c9:p -> c10:p [taillabel="1..1", label="", headlabel="0..n", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; + // Root ASSOC ObjectType + c9:p -> c12:p [taillabel="", label="", headlabel="0..n", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; + // Root ASSOC ObjectMap + c9:p -> c13:p [taillabel="", label="", headlabel="0..n", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; + // Root ASSOC Table + c9:p -> c14:p [taillabel="", label="", headlabel="0..n", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; + // Root ASSOC DataOperation + c9:p -> c15:p [taillabel="", label="", headlabel="0..n", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; //ObjectType extends Element - c93:p -> c94:p [dir=back,arrowtail=empty]; + c11:p -> c12:p [dir=back,arrowtail=empty]; //ObjectMap extends Element - c93:p -> c95:p [dir=back,arrowtail=empty]; - // ObjectMap has ObjectType - c95:p -> c94:p [taillabel="1..1", label="", headlabel="1..1", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none, arrowtail=ediamond]; + c11:p -> c13:p [dir=back,arrowtail=empty]; + // ObjectMap HAS ObjectType + c13:p -> c12:p [taillabel="1..1", label="", headlabel="1..1", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none, arrowtail=ediamond]; //Table extends Element - c93:p -> c96:p [dir=back,arrowtail=empty]; + c11:p -> c14:p [dir=back,arrowtail=empty]; //DataOperation extends Element - c93:p -> c97:p [dir=back,arrowtail=empty]; + c11:p -> c15:p [dir=back,arrowtail=empty]; } diff --git a/testdata/dot-ref/RunnableRef.dot b/testdata/dot-ref/RunnableRef.dot index 17360e5..d416dd4 100644 --- a/testdata/dot-ref/RunnableRef.dot +++ b/testdata/dot-ref/RunnableRef.dot @@ -1,17 +1,17 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 4.1 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph) # digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; node [fontname="Helvetica",fontsize=10,shape=plaintext]; // test.RunnableRef - c99 [label=<
RunnableRef
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; - // test.RunnableRef depend java.lang.Runnable - c99:p -> c100:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open, style=dashed]; + c103 [label=<
RunnableRef
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + // test.RunnableRef DEPEND java.lang.Runnable + c103:p -> c104:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open, style=dashed]; // java.lang.Runnable - c100 [label=<
«interface»
Runnable
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c104 [label=<
«interface»
Runnable
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; } diff --git a/testdata/dot-ref/Style.dot b/testdata/dot-ref/Style.dot index 5a9ad43..507a52e 100644 --- a/testdata/dot-ref/Style.dot +++ b/testdata/dot-ref/Style.dot @@ -1,25 +1,25 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 4.1 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph) # digraph G { edge [fontname="arialbd",fontsize=10,labelfontname="arialbd",labelfontsize=10]; node [fontname="arial",fontsize=10,shape=plaintext]; // net.sf.whatever.test.AbstractBase - c113 [label=<
«base»
AbstractBase
net.sf.whatever.test
{since = 1.0}
field : int
{since = 1.5}
abstractMethod()
concreteMethod() : int
>, fontname="arial", fontcolor="black", fontsize=9.0]; + c106 [label=<
«base»
AbstractBase
net.sf.whatever.test
{since = 1.0}
field : int
{since = 1.5}
abstractMethod()
concreteMethod() : int
>, fontname="arial", fontcolor="black", fontsize=9.0]; // net.sf.whatever.test.Composite - c114 [label=<
Composite
net.sf.whatever.test
>, fontname="arial", fontcolor="black", fontsize=9.0]; + c107 [label=<
Composite
net.sf.whatever.test
>, fontname="arial", fontcolor="black", fontsize=9.0]; // net.sf.whatever.test.Style - c115 [label=<
Style
net.sf.whatever.test
>, fontname="arial", fontcolor="black", fontsize=9.0]; + c108 [label=<
Style
net.sf.whatever.test
>, fontname="arial", fontcolor="black", fontsize=9.0]; //net.sf.whatever.test.Composite extends net.sf.whatever.test.AbstractBase - c113:p -> c114:p [dir=back,arrowtail=empty]; - // net.sf.whatever.test.Composite composed from.Outer.Space.AlienClass - c114:p -> c116:p [taillabel="1", label="has", headlabel="*", fontname="arialbd", fontcolor="black", fontsize=10.0, color="black", arrowhead=none, arrowtail=diamond]; + c106:p -> c107:p [dir=back,arrowtail=empty]; + // net.sf.whatever.test.Composite COMPOSED from.Outer.Space.AlienClass + c107:p -> c109:p [taillabel="1", label="has", headlabel="*", fontname="arialbd", fontcolor="black", fontsize=10.0, color="black", arrowhead=none, arrowtail=diamond]; //net.sf.whatever.test.Style extends net.sf.whatever.test.AbstractBase - c113:p -> c115:p [dir=back,arrowtail=empty]; + c106:p -> c108:p [dir=back,arrowtail=empty]; // from.Outer.Space.AlienClass - c116[label=<
AlienClass
from.Outer.Space
>, fontname="arial", fontcolor="black", fontsize=9.0]; + c109[label=<
AlienClass
from.Outer.Space
>, fontname="arial", fontcolor="black", fontsize=9.0]; } diff --git a/testdata/dot-ref/TestHideOp.dot b/testdata/dot-ref/TestHideOp.dot index d117539..77c3ff7 100644 --- a/testdata/dot-ref/TestHideOp.dot +++ b/testdata/dot-ref/TestHideOp.dot @@ -1,13 +1,13 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 4.1 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph) # digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; node [fontname="Helvetica",fontsize=10,shape=plaintext]; // test.TestHideOp - c118 [label=<
TestHideOp
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c111 [label=<
TestHideOp
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; } diff --git a/testdata/dot-ref/ViewAll.dot b/testdata/dot-ref/ViewAll.dot index 49d4391..a1a89f9 100644 --- a/testdata/dot-ref/ViewAll.dot +++ b/testdata/dot-ref/ViewAll.dot @@ -1,29 +1,29 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 4.1 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph) # digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; node [fontname="Helvetica",fontsize=10,shape=plaintext]; // gr.spinellis.basic.invoice.InvoiceItem - c351 [label=<
InvoiceItem
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c355 [label=<
InvoiceItem
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.basic.invoice.Invoice - c352 [label=<
Invoice
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c356 [label=<
Invoice
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.basic.invoice.Customer - c353 [label=<
Customer
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c357 [label=<
Customer
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.basic.product.Product - c354 [label=<
Product
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c358 [label=<
Product
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.basic.product.Category - c355 [label=<
Category
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; - // gr.spinellis.basic.invoice.InvoiceItem assoc gr.spinellis.basic.product.Product - c351:p -> c354:p [taillabel="*", label="", headlabel="1", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; - // gr.spinellis.basic.invoice.Invoice assoc gr.spinellis.basic.invoice.Customer - c352:p -> c353:p [taillabel="*", label="", headlabel="1", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; - // gr.spinellis.basic.invoice.Invoice composed gr.spinellis.basic.invoice.InvoiceItem - c352:p -> c351:p [taillabel="1", label="", headlabel="*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none, arrowtail=diamond]; - // gr.spinellis.basic.product.Product assoc gr.spinellis.basic.product.Category - c354:p -> c355:p [taillabel="*", label="", headlabel="1", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; + c359 [label=<
Category
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + // gr.spinellis.basic.invoice.InvoiceItem ASSOC gr.spinellis.basic.product.Product + c355:p -> c358:p [taillabel="*", label="", headlabel="1", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; + // gr.spinellis.basic.invoice.Invoice ASSOC gr.spinellis.basic.invoice.Customer + c356:p -> c357:p [taillabel="*", label="", headlabel="1", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; + // gr.spinellis.basic.invoice.Invoice COMPOSED gr.spinellis.basic.invoice.InvoiceItem + c356:p -> c355:p [taillabel="1", label="", headlabel="*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none, arrowtail=diamond]; + // gr.spinellis.basic.product.Product ASSOC gr.spinellis.basic.product.Category + c358:p -> c359:p [taillabel="*", label="", headlabel="1", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; } diff --git a/testdata/dot-ref/ViewAllDetailed.dot b/testdata/dot-ref/ViewAllDetailed.dot index 70ea611..5d9de6e 100644 --- a/testdata/dot-ref/ViewAllDetailed.dot +++ b/testdata/dot-ref/ViewAllDetailed.dot @@ -1,29 +1,29 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 4.1 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph) # digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; node [fontname="Helvetica",fontsize=10,shape=plaintext]; // gr.spinellis.basic.invoice.InvoiceItem - c312 [label=<
InvoiceItem
product : Product
quantity : int
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c317 [label=<
InvoiceItem
product : Product
quantity : int
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.basic.invoice.Invoice - c313 [label=<
Invoice
total : double
items : InvoiceItem[]
customer : Customer
addItem(p : Product, quantity : int)
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c318 [label=<
Invoice
total : double
items : InvoiceItem[]
customer : Customer
addItem(p : Product, quantity : int)
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.basic.invoice.Customer - c314 [label=<
Customer
name : String
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c319 [label=<
Customer
name : String
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.basic.product.Product - c315 [label=<
Product
name : String
stock : int
price : double
category : Category
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c320 [label=<
Product
name : String
stock : int
price : double
category : Category
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.basic.product.Category - c316 [label=<
Category
name : String
products : List<>
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; - // gr.spinellis.basic.invoice.InvoiceItem assoc gr.spinellis.basic.product.Product - c312:p -> c315:p [taillabel="*", label="", headlabel="1", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; - // gr.spinellis.basic.invoice.Invoice assoc gr.spinellis.basic.invoice.Customer - c313:p -> c314:p [taillabel="*", label="", headlabel="1", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; - // gr.spinellis.basic.invoice.Invoice composed gr.spinellis.basic.invoice.InvoiceItem - c313:p -> c312:p [taillabel="1", label="", headlabel="*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none, arrowtail=diamond]; - // gr.spinellis.basic.product.Product assoc gr.spinellis.basic.product.Category - c315:p -> c316:p [taillabel="*", label="", headlabel="1", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; + c321 [label=<
Category
name : String
products : List<>
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + // gr.spinellis.basic.invoice.InvoiceItem ASSOC gr.spinellis.basic.product.Product + c317:p -> c320:p [taillabel="*", label="", headlabel="1", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; + // gr.spinellis.basic.invoice.Invoice ASSOC gr.spinellis.basic.invoice.Customer + c318:p -> c319:p [taillabel="*", label="", headlabel="1", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; + // gr.spinellis.basic.invoice.Invoice COMPOSED gr.spinellis.basic.invoice.InvoiceItem + c318:p -> c317:p [taillabel="1", label="", headlabel="*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none, arrowtail=diamond]; + // gr.spinellis.basic.product.Product ASSOC gr.spinellis.basic.product.Category + c320:p -> c321:p [taillabel="*", label="", headlabel="1", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; } diff --git a/testdata/dot-ref/ViewAtt.dot b/testdata/dot-ref/ViewAtt.dot index 243e537..31ced18 100644 --- a/testdata/dot-ref/ViewAtt.dot +++ b/testdata/dot-ref/ViewAtt.dot @@ -1,29 +1,29 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 4.1 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph) # digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; node [fontname="Helvetica",fontsize=10,shape=plaintext]; // gr.spinellis.basic.invoice.InvoiceItem - c273 [label=<
InvoiceItem
product
quantity
>, fontname="Helvetica", fontcolor="black", fontsize=16.0]; + c279 [label=<
InvoiceItem
product
quantity
>, fontname="Helvetica", fontcolor="black", fontsize=16.0]; // gr.spinellis.basic.invoice.Invoice - c274 [label=<
Invoice
total
items
customer
>, fontname="Helvetica", fontcolor="black", fontsize=16.0]; + c280 [label=<
Invoice
total
items
customer
>, fontname="Helvetica", fontcolor="black", fontsize=16.0]; // gr.spinellis.basic.invoice.Customer - c275 [label=<
Customer
name
>, fontname="Helvetica", fontcolor="black", fontsize=16.0]; + c281 [label=<
Customer
name
>, fontname="Helvetica", fontcolor="black", fontsize=16.0]; // gr.spinellis.basic.product.Product - c276 [label=<
Product
name
stock
price
category
>, fontname="Helvetica", fontcolor="black", fontsize=16.0]; + c282 [label=<
Product
name
stock
price
category
>, fontname="Helvetica", fontcolor="black", fontsize=16.0]; // gr.spinellis.basic.product.Category - c277 [label=<
Category
name
products
>, fontname="Helvetica", fontcolor="black", fontsize=16.0]; - // gr.spinellis.basic.invoice.InvoiceItem assoc gr.spinellis.basic.product.Product - c273:p -> c276:p [taillabel="*", label="", headlabel="1", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; - // gr.spinellis.basic.invoice.Invoice assoc gr.spinellis.basic.invoice.Customer - c274:p -> c275:p [taillabel="*", label="", headlabel="1", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; - // gr.spinellis.basic.invoice.Invoice composed gr.spinellis.basic.invoice.InvoiceItem - c274:p -> c273:p [taillabel="1", label="", headlabel="*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none, arrowtail=diamond]; - // gr.spinellis.basic.product.Product assoc gr.spinellis.basic.product.Category - c276:p -> c277:p [taillabel="*", label="", headlabel="1", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; + c283 [label=<
Category
name
products
>, fontname="Helvetica", fontcolor="black", fontsize=16.0]; + // gr.spinellis.basic.invoice.InvoiceItem ASSOC gr.spinellis.basic.product.Product + c279:p -> c282:p [taillabel="*", label="", headlabel="1", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; + // gr.spinellis.basic.invoice.Invoice ASSOC gr.spinellis.basic.invoice.Customer + c280:p -> c281:p [taillabel="*", label="", headlabel="1", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; + // gr.spinellis.basic.invoice.Invoice COMPOSED gr.spinellis.basic.invoice.InvoiceItem + c280:p -> c279:p [taillabel="1", label="", headlabel="*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none, arrowtail=diamond]; + // gr.spinellis.basic.product.Product ASSOC gr.spinellis.basic.product.Category + c282:p -> c283:p [taillabel="*", label="", headlabel="1", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; } diff --git a/testdata/dot-ref/ViewChildEmpty.dot b/testdata/dot-ref/ViewChildEmpty.dot index e74be7e..d4fd10f 100644 --- a/testdata/dot-ref/ViewChildEmpty.dot +++ b/testdata/dot-ref/ViewChildEmpty.dot @@ -1,17 +1,17 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 4.1 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph) # digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; node [fontname="Helvetica",fontsize=10,shape=plaintext]; // gr.spinellis.basic.product.Product - c237 [label=<
Product
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c244 [label=<
Product
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.basic.product.Category - c238 [label=<
Category
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; - // gr.spinellis.basic.product.Product assoc gr.spinellis.basic.product.Category - c237:p -> c238:p [taillabel="*", label="", headlabel="1", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; + c245 [label=<
Category
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + // gr.spinellis.basic.product.Product ASSOC gr.spinellis.basic.product.Category + c244:p -> c245:p [taillabel="*", label="", headlabel="1", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; } diff --git a/testdata/dot-ref/ViewChildOverride.dot b/testdata/dot-ref/ViewChildOverride.dot index fc762ff..b9d6fd1 100644 --- a/testdata/dot-ref/ViewChildOverride.dot +++ b/testdata/dot-ref/ViewChildOverride.dot @@ -1,17 +1,17 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 4.1 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph) # digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; node [fontname="Helvetica",fontsize=10,shape=plaintext]; // gr.spinellis.basic.product.Product - c198 [label=<
Product
name
stock
price
category
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c206 [label=<
Product
name
stock
price
category
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.basic.product.Category - c199 [label=<
Category
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; - // gr.spinellis.basic.product.Product assoc gr.spinellis.basic.product.Category - c198:p -> c199:p [taillabel="*", label="", headlabel="1", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; + c207 [label=<
Category
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + // gr.spinellis.basic.product.Product ASSOC gr.spinellis.basic.product.Category + c206:p -> c207:p [taillabel="*", label="", headlabel="1", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; } diff --git a/testdata/dot-ref/ViewColors.dot b/testdata/dot-ref/ViewColors.dot index d96a415..c892d33 100644 --- a/testdata/dot-ref/ViewColors.dot +++ b/testdata/dot-ref/ViewColors.dot @@ -1,33 +1,33 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 4.1 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph) # digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; node [fontname="Helvetica",fontsize=10,shape=plaintext]; // gr.spinellis.basic.invoice.InvoiceItem - c156 [label=<
InvoiceItem
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c164 [label=<
InvoiceItem
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.basic.invoice.Invoice - c157 [label=<
Invoice
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c165 [label=<
Invoice
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.basic.invoice.Customer - c158 [label=<
Customer
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c166 [label=<
Customer
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.basic.product.Product - c159 [label=<
Product
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c167 [label=<
Product
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.basic.product.Category - c160 [label=<
Category
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; - // gr.spinellis.basic.invoice.InvoiceItem assoc gr.spinellis.basic.product.Product - c156:p -> c159:p [taillabel="*", label="", headlabel="1", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; - // gr.spinellis.basic.invoice.Invoice assoc gr.spinellis.basic.invoice.Customer - c157:p -> c158:p [taillabel="*", label="", headlabel="1", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; - // gr.spinellis.basic.invoice.Invoice composed gr.spinellis.basic.invoice.InvoiceItem - c157:p -> c156:p [taillabel="1", label="", headlabel="*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none, arrowtail=diamond]; - // gr.spinellis.basic.product.Product assoc gr.spinellis.basic.product.Category - c159:p -> c160:p [taillabel="*", label="", headlabel="1", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; - // gr.spinellis.basic.product.Category depend java.util.List - c160:p -> c194:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open, style=dashed]; + c168 [label=<
Category
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + // gr.spinellis.basic.invoice.InvoiceItem ASSOC gr.spinellis.basic.product.Product + c164:p -> c167:p [taillabel="*", label="", headlabel="1", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; + // gr.spinellis.basic.invoice.Invoice ASSOC gr.spinellis.basic.invoice.Customer + c165:p -> c166:p [taillabel="*", label="", headlabel="1", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; + // gr.spinellis.basic.invoice.Invoice COMPOSED gr.spinellis.basic.invoice.InvoiceItem + c165:p -> c164:p [taillabel="1", label="", headlabel="*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none, arrowtail=diamond]; + // gr.spinellis.basic.product.Product ASSOC gr.spinellis.basic.product.Category + c167:p -> c168:p [taillabel="*", label="", headlabel="1", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; + // gr.spinellis.basic.product.Category DEPEND java.util.List + c168:p -> c202:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open, style=dashed]; // java.util.List - c194 [label=<
«interface»
List<E>
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c202 [label=<
«interface»
List<E>
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; } diff --git a/testdata/dot-ref/ViewContext.dot b/testdata/dot-ref/ViewContext.dot index fbe9b41..00906ad 100644 --- a/testdata/dot-ref/ViewContext.dot +++ b/testdata/dot-ref/ViewContext.dot @@ -1,41 +1,41 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 4.1 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph) # digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; node [fontname="Helvetica",fontsize=10,shape=plaintext]; // gr.spinellis.context.classes.AClient - c421 [label=<
AClient
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c424 [label=<
AClient
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.context.classes.ASubclass - c423 [label=<
ASubclass
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c426 [label=<
ASubclass
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.context.classes.E - c424 [label=<
E
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c427 [label=<
E
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.context.classes.D - c426 [label=<
D
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c429 [label=<
D
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.context.classes.B - c429 [label=<
B
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c432 [label=<
B
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.context.classes.ABaseClass - c430 [label=<
ABaseClass
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c433 [label=<
ABaseClass
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.context.classes.A - c431 [label=<
A
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c434 [label=<
A
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; //gr.spinellis.context.classes.ASubclass extends gr.spinellis.context.classes.A - c431:p -> c423:p [dir=back,arrowtail=empty]; + c434:p -> c426:p [dir=back,arrowtail=empty]; //gr.spinellis.context.classes.A extends gr.spinellis.context.classes.ABaseClass - c430:p -> c431:p [dir=back,arrowtail=empty]; - // gr.spinellis.context.classes.D navassoc gr.spinellis.context.classes.A - c426:p -> c431: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 - c431:p -> c429:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open]; - // gr.spinellis.context.classes.A navassoc javax.swing.JComponent - c431:p -> c507: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 - c421:p -> c431: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 - c431:p -> c424:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open, style=dashed]; + 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 - c507 [label=<
JComponent
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c509 [label=<
JComponent
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; } diff --git a/testdata/dot-ref/ViewInterfaces.dot b/testdata/dot-ref/ViewInterfaces.dot index 91a6c8a..a43356e 100644 --- a/testdata/dot-ref/ViewInterfaces.dot +++ b/testdata/dot-ref/ViewInterfaces.dot @@ -1,25 +1,29 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 4.1 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph) # digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; node [fontname="Helvetica",fontsize=10,shape=plaintext]; // gr.spinellis.iface.classes.FarImplementor - c532 [label=<
FarImplementor
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c534 [label=<
FarImplementor
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.iface.classes.DirectImplementor - c533 [label=<
DirectImplementor
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c535 [label=<
DirectImplementor
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.iface.classes.SubSubFace - c535 [label=<
«interface»
SubSubFace
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c537 [label=<
«interface»
SubSubFace
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.iface.classes.SubFace - c536 [label=<
«interface»
SubFace
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c538 [label=<
«interface»
SubFace
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.iface.classes.Face - c537 [label=<
«interface»
Face
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; - c535:p -> c532:p [dir=back,arrowtail=empty,style=dashed]; //gr.spinellis.iface.classes.FarImplementor implements gr.spinellis.iface.classes.SubSubFace - c537:p -> c533:p [dir=back,arrowtail=empty,style=dashed]; //gr.spinellis.iface.classes.DirectImplementor implements gr.spinellis.iface.classes.Face - c536:p -> c535:p [dir=back,arrowtail=empty,style=dashed]; //gr.spinellis.iface.classes.SubSubFace implements gr.spinellis.iface.classes.SubFace - c537:p -> c536:p [dir=back,arrowtail=empty,style=dashed]; //gr.spinellis.iface.classes.SubFace implements gr.spinellis.iface.classes.Face + c539 [label=<
«interface»
Face
>, 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]; + //gr.spinellis.iface.classes.DirectImplementor implements gr.spinellis.iface.classes.Face + 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]; + //gr.spinellis.iface.classes.SubFace implements gr.spinellis.iface.classes.Face + c539:p -> c538:p [dir=back,arrowtail=empty,style=dashed]; } diff --git a/testdata/dot-ref/ViewProduct.dot b/testdata/dot-ref/ViewProduct.dot index 18ea19c..3d0e21e 100644 --- a/testdata/dot-ref/ViewProduct.dot +++ b/testdata/dot-ref/ViewProduct.dot @@ -1,17 +1,17 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 4.1 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph) # digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; node [fontname="Helvetica",fontsize=10,shape=plaintext]; // gr.spinellis.basic.product.Product - c120 [label=<
Product
name
stock
price
category
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c129 [label=<
Product
name
stock
price
category
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.basic.product.Category - c121 [label=<
Category
name
products
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; - // gr.spinellis.basic.product.Product assoc gr.spinellis.basic.product.Category - c120:p -> c121:p [taillabel="*", label="", headlabel="1", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; + c130 [label=<
Category
name
products
>, 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 3a73a48..88db385 100644 --- a/testdata/dot-ref/ViewSubclasses.dot +++ b/testdata/dot-ref/ViewSubclasses.dot @@ -1,29 +1,29 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 4.1 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph) # digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; node [fontname="Helvetica",fontsize=10,shape=plaintext]; // gr.spinellis.subclass.classes.SubOneTwo - c578 [label=<
SubOneTwo
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c580 [label=<
SubOneTwo
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.subclass.classes.SubOneOne - c579 [label=<
SubOneOne
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c581 [label=<
SubOneOne
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.subclass.classes.SubTwo - c580 [label=<
SubTwo
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c582 [label=<
SubTwo
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.subclass.classes.SubOne - c581 [label=<
SubOne
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c583 [label=<
SubOne
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.subclass.classes.Super - c582 [label=<
Super
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c584 [label=<
Super
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; //gr.spinellis.subclass.classes.SubOneTwo extends gr.spinellis.subclass.classes.SubOne - c581:p -> c578:p [dir=back,arrowtail=empty]; + c583:p -> c580:p [dir=back,arrowtail=empty]; //gr.spinellis.subclass.classes.SubOneOne extends gr.spinellis.subclass.classes.SubOne - c581:p -> c579:p [dir=back,arrowtail=empty]; + c583:p -> c581:p [dir=back,arrowtail=empty]; //gr.spinellis.subclass.classes.SubTwo extends gr.spinellis.subclass.classes.Super - c582:p -> c580:p [dir=back,arrowtail=empty]; + c584:p -> c582:p [dir=back,arrowtail=empty]; //gr.spinellis.subclass.classes.SubOne extends gr.spinellis.subclass.classes.Super - c582:p -> c581: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 bb6258d..fba4643 100644 --- a/testdata/dot-ref/advrel.dot +++ b/testdata/dot-ref/advrel.dot @@ -1,32 +1,33 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 4.1 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph) # digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; node [fontname="Helvetica",fontsize=10,shape=plaintext]; // Controller - c5 [label=<
Controller
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c17 [label=<
Controller
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // EmbeddedAgent - c6 [label=<
EmbeddedAgent
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c18 [label=<
EmbeddedAgent
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // PowerManager - c7 [label=<
PowerManager
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c19 [label=<
PowerManager
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // SetTopController - c8 [label=<
SetTopController
authorizationLevel
startUp()
shutDown()
connect()
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c20 [label=<
SetTopController
authorizationLevel
startUp()
shutDown()
connect()
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // ChannelIterator - c9 [label=<
ChannelIterator
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c21 [label=<
ChannelIterator
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // URLStreamHandler - c10 [label=<
«interface»
URLStreamHandler
OpenConnection()
parseURL()
setURL()
toExternalForm()
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c22 [label=<
«interface»
URLStreamHandler
OpenConnection()
parseURL()
setURL()
toExternalForm()
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; //SetTopController extends Controller - c5:p -> c8:p [dir=back,arrowtail=empty]; + c17:p -> c20:p [dir=back,arrowtail=empty]; //SetTopController extends EmbeddedAgent - c6:p -> c8:p [dir=back,arrowtail=empty]; - c10:p -> c8:p [dir=back,arrowtail=empty,style=dashed]; //SetTopController implements URLStreamHandler - // 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]; + c18:p -> c20:p [dir=back,arrowtail=empty]; + //SetTopController implements URLStreamHandler + c22:p -> c20:p [dir=back,arrowtail=empty,style=dashed]; + // SetTopController NAVASSOC PowerManager + c20:p -> c19:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open]; + // ChannelIterator DEPEND SetTopController + c21:p -> c20: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 7f5171f..db307d3 100644 --- a/testdata/dot-ref/assoc.dot +++ b/testdata/dot-ref/assoc.dot @@ -1,7 +1,7 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 4.1 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph) # digraph G { @@ -10,14 +10,14 @@ digraph G { rankdir=LR; ranksep=1; // UserGroup - c12 [label=<
UserGroup
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c24 [label=<
UserGroup
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // User - c13 [label=<
User
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c25 [label=<
User
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // Password - c14 [label=<
Password
>, 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]; + c26 [label=<
Password
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + // UserGroup ASSOC User + c24:p -> c25:p [taillabel="*", label="", headlabel="*\n\n+user ", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; + // User NAVASSOC Password + c25:p -> c26: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 000968b..391d51f 100644 --- a/testdata/dot-ref/car.dot +++ b/testdata/dot-ref/car.dot @@ -1,25 +1,25 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 4.1 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph) # digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; node [fontname="Helvetica",fontsize=10,shape=plaintext]; // Tyre - c15 [label=<
Tyre
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c27 [label=<
Tyre
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // Engine - c16 [label=<
Engine
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c28 [label=<
Engine
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // Body - c17 [label=<
Body
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c29 [label=<
Body
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // Car - c18 [label=<
Car
>, 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]; - // 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]; - // 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]; + c30 [label=<
Car
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + // Car COMPOSED Tyre + c30:p -> c27:p [taillabel="1", label="", headlabel="4", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none, arrowtail=diamond]; + // Car COMPOSED Engine + c30:p -> c28:p [taillabel="1", label="", headlabel="1", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none, arrowtail=diamond]; + // Car COMPOSED Body + c30:p -> c29:p [taillabel="1", label="", headlabel="1", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none, arrowtail=diamond]; } diff --git a/testdata/dot-ref/catalina.dot b/testdata/dot-ref/catalina.dot index 2f3005a..48f45d1 100644 --- a/testdata/dot-ref/catalina.dot +++ b/testdata/dot-ref/catalina.dot @@ -1,46 +1,55 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 4.1 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph) # digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; node [fontname="Helvetica",fontsize=10,shape=plaintext]; // HttpResponseBase - c19 [label=<
HttpResponseBase
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c31 [label=<
HttpResponseBase
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // HttpResponseWrapper - c20 [label=<
HttpResponseWrapper
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c32 [label=<
HttpResponseWrapper
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // HttpResponseFacade - c21 [label=<
HttpResponseFacade
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c33 [label=<
HttpResponseFacade
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // ResponseWrapper - c22 [label=<
ResponseWrapper
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c34 [label=<
ResponseWrapper
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // HttpResponse - c23 [label=<
«interface»
HttpResponse
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c35 [label=<
«interface»
HttpResponse
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // ResponseBase - c24 [label=<
ResponseBase
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c36 [label=<
ResponseBase
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // HttpServletResponse - c25 [label=<
«interface»
HttpServletResponse
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c37 [label=<
«interface»
HttpServletResponse
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // ResponseFacade - c26 [label=<
ResponseFacade
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c38 [label=<
ResponseFacade
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // ServletResponse - c27 [label=<
«interface»
ServletResponse
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c39 [label=<
«interface»
ServletResponse
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // Response - c28 [label=<
«interface»
Response
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c40 [label=<
«interface»
Response
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; //HttpResponseBase extends ResponseBase - c24:p -> c19:p [dir=back,arrowtail=empty]; - c23:p -> c19:p [dir=back,arrowtail=empty,style=dashed]; //HttpResponseBase implements HttpResponse - c25:p -> c19:p [dir=back,arrowtail=empty,style=dashed]; //HttpResponseBase implements HttpServletResponse + c36:p -> c31:p [dir=back,arrowtail=empty]; + //HttpResponseBase implements HttpResponse + c35:p -> c31:p [dir=back,arrowtail=empty,style=dashed]; + //HttpResponseBase implements HttpServletResponse + c37:p -> c31:p [dir=back,arrowtail=empty,style=dashed]; //HttpResponseWrapper extends ResponseWrapper - c22:p -> c20:p [dir=back,arrowtail=empty]; - c23:p -> c20:p [dir=back,arrowtail=empty,style=dashed]; //HttpResponseWrapper implements HttpResponse + c34:p -> c32:p [dir=back,arrowtail=empty]; + //HttpResponseWrapper implements HttpResponse + c35:p -> c32:p [dir=back,arrowtail=empty,style=dashed]; //HttpResponseFacade extends ResponseFacade - c26:p -> c21:p [dir=back,arrowtail=empty]; - c25:p -> c21:p [dir=back,arrowtail=empty,style=dashed]; //HttpResponseFacade implements HttpServletResponse - c28:p -> c22:p [dir=back,arrowtail=empty,style=dashed]; //ResponseWrapper implements Response - c28:p -> c23:p [dir=back,arrowtail=empty,style=dashed]; //HttpResponse implements Response - c28:p -> c24:p [dir=back,arrowtail=empty,style=dashed]; //ResponseBase implements Response - c27:p -> c24:p [dir=back,arrowtail=empty,style=dashed]; //ResponseBase implements ServletResponse - c27:p -> c26:p [dir=back,arrowtail=empty,style=dashed]; //ResponseFacade implements ServletResponse + c38:p -> c33:p [dir=back,arrowtail=empty]; + //HttpResponseFacade implements HttpServletResponse + c37:p -> c33:p [dir=back,arrowtail=empty,style=dashed]; + //ResponseWrapper implements Response + c40:p -> c34:p [dir=back,arrowtail=empty,style=dashed]; + //HttpResponse implements Response + c40:p -> c35:p [dir=back,arrowtail=empty,style=dashed]; + //ResponseBase implements Response + c40:p -> c36:p [dir=back,arrowtail=empty,style=dashed]; + //ResponseBase implements ServletResponse + c39:p -> c36:p [dir=back,arrowtail=empty,style=dashed]; + //ResponseFacade implements ServletResponse + c39:p -> c38:p [dir=back,arrowtail=empty,style=dashed]; } diff --git a/testdata/dot-ref/class-eg.dot b/testdata/dot-ref/class-eg.dot index a27413f..2bb3dfe 100644 --- a/testdata/dot-ref/class-eg.dot +++ b/testdata/dot-ref/class-eg.dot @@ -1,21 +1,21 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 4.1 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph) # digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; node [fontname="Helvetica",fontsize=10,shape=plaintext]; // Person - c30 [label=<
Person
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c42 [label=<
Person
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // Employee - c31 [label=<
Employee
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c43 [label=<
Employee
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // Client - c32 [label=<
Client
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c44 [label=<
Client
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; //Employee extends Person - c30:p -> c31:p [dir=back,arrowtail=empty]; + c42:p -> c43:p [dir=back,arrowtail=empty]; //Client extends Person - c30:p -> c32:p [dir=back,arrowtail=empty]; + c42:p -> c44:p [dir=back,arrowtail=empty]; } diff --git a/testdata/dot-ref/classadd.dot b/testdata/dot-ref/classadd.dot index 05f989e..6cd5a67 100644 --- a/testdata/dot-ref/classadd.dot +++ b/testdata/dot-ref/classadd.dot @@ -1,13 +1,13 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 4.1 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph) # digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; node [fontname="Helvetica",fontsize=10,shape=plaintext]; // 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()
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c47 [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()
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; } diff --git a/testdata/dot-ref/color.dot b/testdata/dot-ref/color.dot index f077d65..2d21d03 100644 --- a/testdata/dot-ref/color.dot +++ b/testdata/dot-ref/color.dot @@ -1,7 +1,7 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 4.1 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph) # digraph G { @@ -10,18 +10,18 @@ digraph G { bgcolor=".7 .9 1"; // Pixel - c37 [label=<
Pixel
- x : int
- y : int
>, fontname="Helvetica-Bold", fontcolor="white", fontsize=14.0]; + c49 [label=<
Pixel
- x : int
- y : int
>, fontname="Helvetica-Bold", fontcolor="white", fontsize=14.0]; // Red - c38 [label=<
Red
>, fontname="Times", fontcolor="black", fontsize=14.0]; + c50 [label=<
Red
>, fontname="Times", fontcolor="black", fontsize=14.0]; // Green - c39 [label=<
Green
>, fontname="Times", fontcolor="black", fontsize=14.0]; + c51 [label=<
Green
>, fontname="Times", fontcolor="black", fontsize=14.0]; // Blue - c40 [label=<
Blue
>, fontname="Times", 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]; - // Pixel composed Green - c37:p -> c39:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="yellow", arrowhead=none, arrowtail=diamond]; - // Pixel composed Blue - c37:p -> c40:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="yellow", arrowhead=none, arrowtail=diamond]; + c52 [label=<
Blue
>, fontname="Times", fontcolor="black", fontsize=14.0]; + // Pixel COMPOSED Red + c49:p -> c50:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="yellow", arrowhead=none, arrowtail=diamond]; + // Pixel COMPOSED Green + c49:p -> c51:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="yellow", arrowhead=none, arrowtail=diamond]; + // Pixel COMPOSED Blue + c49:p -> c52:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="yellow", arrowhead=none, arrowtail=diamond]; } diff --git a/testdata/dot-ref/ctor.dot b/testdata/dot-ref/ctor.dot index b9beefe..8afb36d 100644 --- a/testdata/dot-ref/ctor.dot +++ b/testdata/dot-ref/ctor.dot @@ -1,13 +1,13 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 4.1 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph) # digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; node [fontname="Helvetica",fontsize=10,shape=plaintext]; // Junk - c43 [label=<
Junk
- value : int
+ Junk(val : int)
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c55 [label=<
Junk
- value : int
+ Junk(val : int)
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; } diff --git a/testdata/dot-ref/disable.dot b/testdata/dot-ref/disable.dot index 92b222b..df094aa 100644 --- a/testdata/dot-ref/disable.dot +++ b/testdata/dot-ref/disable.dot @@ -1,17 +1,17 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 4.1 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph) # digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; node [fontname="Helvetica",fontsize=10,shape=plaintext]; // Person1 - c45 [label=<
Person1
~ address : String
~ name : String
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c95 [label=<
Person1
~ address : String
~ name : String
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // Person2 - c46 [label=<
Person2
~ displayName() : String
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c96 [label=<
Person2
~ displayName() : String
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // Person3 - c47 [label=<
Person3
address : Address
name : String
displayName() : String
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c97 [label=<
Person3
address : Address
name : String
displayName() : String
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; } diff --git a/testdata/dot-ref/extends.dot b/testdata/dot-ref/extends.dot index 5891e3d..6fca886 100644 --- a/testdata/dot-ref/extends.dot +++ b/testdata/dot-ref/extends.dot @@ -1,15 +1,15 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 4.1 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph) # digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; node [fontname="Helvetica",fontsize=10,shape=plaintext]; // Base - c48 [label=<
Base
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c56 [label=<
Base
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // Test2 - c49 [label=<
Test2<B extends Base>
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c57 [label=<
Test2<B extends Base>
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; } diff --git a/testdata/dot-ref/foo.dot b/testdata/dot-ref/foo.dot index f1cac6b..aaa87dc 100644 --- a/testdata/dot-ref/foo.dot +++ b/testdata/dot-ref/foo.dot @@ -1,23 +1,23 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 4.1 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph) # digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; node [fontname="Helvetica",fontsize=10,shape=plaintext]; // a.b.c.UMLOptions - c50 [label=<
UMLOptions
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c58 [label=<
UMLOptions
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // a.b.c.UserGroup - c51 [label=<
UserGroup
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c59 [label=<
UserGroup
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // a.b.c.User - c52 [label=<
User
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c60 [label=<
User
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // a.b.c.Password - c53 [label=<
Password
>, 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]; + c61 [label=<
Password
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + // a.b.c.UserGroup ASSOC a.b.c.User + c59:p -> c60: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 + c60:p -> c61: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 b4b5639..7478a79 100644 --- a/testdata/dot-ref/general.dot +++ b/testdata/dot-ref/general.dot @@ -1,51 +1,51 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 4.1 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph) # digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; node [fontname="Helvetica",fontsize=10,shape=plaintext]; // Asset - c55 [label=<
Asset
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c63 [label=<
Asset
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // InterestBearingItem - c56 [label=<
InterestBearingItem
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c64 [label=<
InterestBearingItem
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // InsurableItem - c57 [label=<
InsurableItem
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c65 [label=<
InsurableItem
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // BankAccount - c58 [label=<
BankAccount
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c66 [label=<
BankAccount
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // RealEstate - c59 [label=<
RealEstate
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c67 [label=<
RealEstate
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // Security - c60 [label=<
Security
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c68 [label=<
Security
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // Stock - c61 [label=<
Stock
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c69 [label=<
Stock
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // Bond - c62 [label=<
Bond
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c70 [label=<
Bond
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // CheckingAccount - c63 [label=<
CheckingAccount
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c71 [label=<
CheckingAccount
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // SavingsAccount - c64 [label=<
SavingsAccount
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c72 [label=<
SavingsAccount
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; //BankAccount extends Asset - c55:p -> c58:p [dir=back,arrowtail=empty]; + c63:p -> c66:p [dir=back,arrowtail=empty]; //BankAccount extends InsurableItem - c57:p -> c58:p [dir=back,arrowtail=empty]; + c65:p -> c66:p [dir=back,arrowtail=empty]; //BankAccount extends InterestBearingItem - c56:p -> c58:p [dir=back,arrowtail=empty]; + c64:p -> c66:p [dir=back,arrowtail=empty]; //RealEstate extends Asset - c55:p -> c59:p [dir=back,arrowtail=empty]; + c63:p -> c67:p [dir=back,arrowtail=empty]; //RealEstate extends InsurableItem - c57:p -> c59:p [dir=back,arrowtail=empty]; + c65:p -> c67:p [dir=back,arrowtail=empty]; //Security extends Asset - c55:p -> c60:p [dir=back,arrowtail=empty]; + c63:p -> c68:p [dir=back,arrowtail=empty]; //Stock extends Security - c60:p -> c61:p [dir=back,arrowtail=empty]; + c68:p -> c69:p [dir=back,arrowtail=empty]; //Bond extends Security - c60:p -> c62:p [dir=back,arrowtail=empty]; + c68:p -> c70:p [dir=back,arrowtail=empty]; //CheckingAccount extends BankAccount - c58:p -> c63:p [dir=back,arrowtail=empty]; + c66:p -> c71:p [dir=back,arrowtail=empty]; //SavingsAccount extends BankAccount - c58:p -> c64:p [dir=back,arrowtail=empty]; + c66:p -> c72:p [dir=back,arrowtail=empty]; } diff --git a/testdata/dot-ref/java5.dot b/testdata/dot-ref/java5.dot index 7ae5757..79238d2 100644 --- a/testdata/dot-ref/java5.dot +++ b/testdata/dot-ref/java5.dot @@ -1,15 +1,15 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 4.1 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph) # digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; node [fontname="Helvetica",fontsize=10,shape=plaintext]; // Java5 - c79 [label=<
Java5
~ state : Java5.States
- specifiedPackages : Set<String>
+ printAll(args : String[])
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c74 [label=<
Java5
~ state : Java5.States
- specifiedPackages : Set<String>
+ printAll(args : String[])
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // Java5.States - c80 [label=<
«enumeration»
States
start
dash
colon
space
open
w
close
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c75 [label=<
«enumeration»
States
start
dash
colon
space
open
w
close
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; } diff --git a/testdata/dot-ref/schema.dot b/testdata/dot-ref/schema.dot index cae9fbd..18a0f2d 100644 --- a/testdata/dot-ref/schema.dot +++ b/testdata/dot-ref/schema.dot @@ -1,35 +1,35 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 4.1 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph) # digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; node [fontname="Helvetica",fontsize=10,shape=plaintext]; // School - c101 [label=<
School
name : Name
address : String
phone : Number
addStudent()
removeStudent()
getStudent()
getAllStudents()
addDepartment()
removeDepartment()
getDepartment()
getAllDepartments()
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c79 [label=<
School
name : Name
address : String
phone : Number
addStudent()
removeStudent()
getStudent()
getAllStudents()
addDepartment()
removeDepartment()
getDepartment()
getAllDepartments()
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // Department - c102 [label=<
Department
name : Name
addInstructor()
removeInstructor()
getInstructor()
getAllInstructors()
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c80 [label=<
Department
name : Name
addInstructor()
removeInstructor()
getInstructor()
getAllInstructors()
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // Student - c103 [label=<
Student
name : Name
studentID : Number
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c81 [label=<
Student
name : Name
studentID : Number
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // Course - c104 [label=<
Course
name : Name
courseID : Number
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c82 [label=<
Course
name : Name
courseID : Number
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // Instructor - c105 [label=<
Instructor
name : Name
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; - // School has Student - c101:p -> c103:p [taillabel="1..*", label="Member", headlabel="*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none, arrowtail=ediamond]; - // School composed Department - c101:p -> c102:p [taillabel="1..*", label="Has", headlabel="1..*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none, arrowtail=diamond]; - // Department assoc Course - c102:p -> c104:p [taillabel="1..*", label="", headlabel="1..*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; - // Department assoc Instructor - c102:p -> c105:p [taillabel="0..*", label="", headlabel="0..1 chairperson", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; - // Department has Instructor - c102:p -> c105:p [taillabel="1..*", label="AssignedTo", headlabel="1..*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none, arrowtail=ediamond]; - // Student assoc Course - c103:p -> c104:p [taillabel="*", label="Attends", headlabel="*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; - // Instructor assoc Course - c105:p -> c104:p [taillabel="1..*", label="Teaches", headlabel="*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; + c83 [label=<
Instructor
name : Name
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + // School HAS Student + c79:p -> c81:p [taillabel="1..*", label="Member", headlabel="*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none, arrowtail=ediamond]; + // School COMPOSED Department + c79:p -> c80:p [taillabel="1..*", label="Has", headlabel="1..*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none, arrowtail=diamond]; + // Department ASSOC Course + c80:p -> c82:p [taillabel="1..*", label="", headlabel="1..*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; + // Department ASSOC Instructor + c80:p -> c83:p [taillabel="0..*", label="", headlabel="0..1 chairperson", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; + // Department HAS Instructor + c80:p -> c83:p [taillabel="1..*", label="AssignedTo", headlabel="1..*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none, arrowtail=ediamond]; + // Student ASSOC Course + c81:p -> c82:p [taillabel="*", label="Attends", headlabel="*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; + // Instructor ASSOC Course + c83:p -> c82: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 5df70f6..4a048b3 100644 --- a/testdata/dot-ref/strip.dot +++ b/testdata/dot-ref/strip.dot @@ -1,15 +1,15 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 4.1 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph) # digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; node [fontname="Helvetica",fontsize=10,shape=plaintext]; // Java5 - c107 [label=<
Java5
~ state : Java5.States
+ specifiedPackages : Set<String>
+ printAll(args : String[])
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c85 [label=<
Java5
~ state : Java5.States
+ specifiedPackages : Set<String>
+ printAll(args : String[])
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // Java5.States - c108 [label=<
«enumeration»
States
start
dash
colon
space
open
w
close
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c86 [label=<
«enumeration»
States
start
dash
colon
space
open
w
close
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; } diff --git a/testdata/dot-ref/vis.dot b/testdata/dot-ref/vis.dot index 7c73e62..07840e7 100644 --- a/testdata/dot-ref/vis.dot +++ b/testdata/dot-ref/vis.dot @@ -1,13 +1,13 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 4.1 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph) # digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; node [fontname="Helvetica",fontsize=10,shape=plaintext]; // Toolbar - c111 [label=<
Toolbar
# currentSelection : Tool
# toolCount : Integer
+ pickItem(i : Integer)
+ addTool(t : Tool)
+ removeTool(i : Integer)
+ getTool() : Tool
# checkOrphans()
- compact()
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c89 [label=<
Toolbar
# currentSelection : Tool
# toolCount : Integer
+ pickItem(i : Integer)
+ addTool(t : Tool)
+ removeTool(i : Integer)
+ getTool() : Tool
# checkOrphans()
- compact()
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; } diff --git a/testdata/umldoc-ref/allclasses-frame.html b/testdata/umldoc-ref/allclasses-frame.html index d9fef4a..e44d5c1 100644 --- a/testdata/umldoc-ref/allclasses-frame.html +++ b/testdata/umldoc-ref/allclasses-frame.html @@ -2,12 +2,12 @@ - + All Classes - + diff --git a/testdata/umldoc-ref/allclasses-noframe.html b/testdata/umldoc-ref/allclasses-noframe.html index d93dab6..e28ca47 100644 --- a/testdata/umldoc-ref/allclasses-noframe.html +++ b/testdata/umldoc-ref/allclasses-noframe.html @@ -2,12 +2,12 @@ - + All Classes - + diff --git a/testdata/umldoc-ref/constant-values.html b/testdata/umldoc-ref/constant-values.html index 1c117f2..745ffa0 100644 --- a/testdata/umldoc-ref/constant-values.html +++ b/testdata/umldoc-ref/constant-values.html @@ -2,12 +2,12 @@ - + Constant Field Values - + diff --git a/testdata/umldoc-ref/deprecated-list.html b/testdata/umldoc-ref/deprecated-list.html index 89ae00c..8d7aebe 100644 --- a/testdata/umldoc-ref/deprecated-list.html +++ b/testdata/umldoc-ref/deprecated-list.html @@ -2,12 +2,12 @@ - + Deprecated List - + diff --git a/testdata/umldoc-ref/gr/spinellis/invoice/Customer.dot b/testdata/umldoc-ref/gr/spinellis/invoice/Customer.dot index da0ad92..2a4603e 100644 --- a/testdata/umldoc-ref/gr/spinellis/invoice/Customer.dot +++ b/testdata/umldoc-ref/gr/spinellis/invoice/Customer.dot @@ -1,21 +1,21 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 4.4 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph) # digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; node [fontname="Helvetica",fontsize=10,shape=plaintext]; // gr.spinellis.invoice.Invoice - c41 [label=<
Invoice
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c41 [label=<
Invoice
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.invoice.Customer - c42 [label=<
Customer
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; - // gr.spinellis.invoice.Invoice navassoc gr.spinellis.invoice.Customer + c42 [label=<
Customer
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + // gr.spinellis.invoice.Invoice NAVASSOC gr.spinellis.invoice.Customer c41:p -> c42:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open]; - // gr.spinellis.invoice.Customer navassoc java.lang.String + // gr.spinellis.invoice.Customer NAVASSOC java.lang.String c42:p -> c45:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open]; // java.lang.String - c45 [label=<
String
java.lang
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c45 [label=<
String
java.lang
>, 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 c5151a8..250007f 100644 --- a/testdata/umldoc-ref/gr/spinellis/invoice/Customer.html +++ b/testdata/umldoc-ref/gr/spinellis/invoice/Customer.html @@ -2,12 +2,12 @@ - + Customer - + @@ -91,9 +91,9 @@ gr.spinellis.invoice
Class Customer - - - + + +
Package class diagram package Customer
diff --git a/testdata/umldoc-ref/gr/spinellis/invoice/Invoice.dot b/testdata/umldoc-ref/gr/spinellis/invoice/Invoice.dot
index c56b078..4425355 100644
--- a/testdata/umldoc-ref/gr/spinellis/invoice/Invoice.dot
+++ b/testdata/umldoc-ref/gr/spinellis/invoice/Invoice.dot
@@ -1,31 +1,31 @@
 #!/usr/local/bin/dot
 #
 # Class diagram 
-# Generated by UmlGraph version 4.4 (http://www.spinellis.gr/sw/umlgraph)
+# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph)
 #
 
 digraph G {
 	edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10];
 	node [fontname="Helvetica",fontsize=10,shape=plaintext];
 	// gr.spinellis.invoice.InvoiceItem
-	c34 [label=<
 InvoiceItem 
>, fontname="Helvetica", fontcolor="black", fontsize=10.0];
+	c34 [label=<
 InvoiceItem 
>, fontname="Helvetica", fontcolor="black", fontsize=10.0];
 	// gr.spinellis.invoice.Invoice
-	c35 [label=<
 Invoice 
>, fontname="Helvetica", fontcolor="black", fontsize=10.0];
+	c35 [label=<
 Invoice 
>, fontname="Helvetica", fontcolor="black", fontsize=10.0];
 	// gr.spinellis.invoice.Customer
-	c36 [label=<
 Customer 
>, fontname="Helvetica", fontcolor="black", fontsize=10.0];
+	c36 [label=<
 Customer 
>, fontname="Helvetica", fontcolor="black", fontsize=10.0];
 	// gr.spinellis.product.Product
-	c37 [label=<
 Product 
 gr.spinellis.product 
>, fontname="Helvetica", fontcolor="black", fontsize=10.0];
-	// gr.spinellis.invoice.InvoiceItem navassoc gr.spinellis.product.Product
+	c37 [label=<
 Product 
 gr.spinellis.product 
>, fontname="Helvetica", fontcolor="black", fontsize=10.0];
+	// gr.spinellis.invoice.InvoiceItem NAVASSOC gr.spinellis.product.Product
 	c34:p -> c37:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open];
-	// gr.spinellis.invoice.Invoice navassoc gr.spinellis.invoice.InvoiceItem
+	// gr.spinellis.invoice.Invoice NAVASSOC gr.spinellis.invoice.InvoiceItem
 	c35:p -> c34:p [taillabel="", label="", headlabel="*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open];
-	// gr.spinellis.invoice.Invoice navassoc gr.spinellis.invoice.Customer
+	// gr.spinellis.invoice.Invoice NAVASSOC gr.spinellis.invoice.Customer
 	c35:p -> c36:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open];
-	// gr.spinellis.invoice.Invoice navassoc java.util.Date
+	// gr.spinellis.invoice.Invoice NAVASSOC java.util.Date
 	c35:p -> c39:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open];
-	// gr.spinellis.invoice.Invoice depend gr.spinellis.product.Product
+	// gr.spinellis.invoice.Invoice DEPEND gr.spinellis.product.Product
 	c35:p -> c37:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open, style=dashed];
 	// java.util.Date
-	c39 [label=<
 Date 
 java.util 
>, fontname="Helvetica", fontcolor="black", fontsize=10.0];
+	c39 [label=<
 Date 
 java.util 
>, fontname="Helvetica", fontcolor="black", fontsize=10.0];
 }
 
diff --git a/testdata/umldoc-ref/gr/spinellis/invoice/Invoice.html b/testdata/umldoc-ref/gr/spinellis/invoice/Invoice.html
index 93e0247..c720c13 100644
--- a/testdata/umldoc-ref/gr/spinellis/invoice/Invoice.html
+++ b/testdata/umldoc-ref/gr/spinellis/invoice/Invoice.html
@@ -2,12 +2,12 @@
 
 
 
-
+
 
 Invoice
 
 
-
+
 
 
 
@@ -91,11 +91,11 @@ gr.spinellis.invoice
 

 Class Invoice
 
-
-
-
-
-
+
+
+
+
+
 
 
Package class diagram package Invoice

 
diff --git a/testdata/umldoc-ref/gr/spinellis/invoice/InvoiceItem.dot b/testdata/umldoc-ref/gr/spinellis/invoice/InvoiceItem.dot
index 493f9fb..a94849b 100644
--- a/testdata/umldoc-ref/gr/spinellis/invoice/InvoiceItem.dot
+++ b/testdata/umldoc-ref/gr/spinellis/invoice/InvoiceItem.dot
@@ -1,23 +1,23 @@
 #!/usr/local/bin/dot
 #
 # Class diagram 
-# Generated by UmlGraph version 4.4 (http://www.spinellis.gr/sw/umlgraph)
+# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph)
 #
 
 digraph G {
 	edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10];
 	node [fontname="Helvetica",fontsize=10,shape=plaintext];
 	// gr.spinellis.invoice.InvoiceItem
-	c12 [label=<
 InvoiceItem 
>, fontname="Helvetica", fontcolor="black", fontsize=10.0];
+	c12 [label=<
 InvoiceItem 
>, fontname="Helvetica", fontcolor="black", fontsize=10.0];
 	// gr.spinellis.invoice.Invoice
-	c16 [label=<
 Invoice 
>, fontname="Helvetica", fontcolor="black", fontsize=10.0];
+	c16 [label=<
 Invoice 
>, fontname="Helvetica", fontcolor="black", fontsize=10.0];
 	// gr.spinellis.product.Product
-	c20 [label=<
 Product 
 gr.spinellis.product 
>, fontname="Helvetica", fontcolor="black", fontsize=10.0];
-	// gr.spinellis.invoice.InvoiceItem navassoc gr.spinellis.product.Product
+	c20 [label=<
 Product 
 gr.spinellis.product 
>, fontname="Helvetica", fontcolor="black", fontsize=10.0];
+	// gr.spinellis.invoice.InvoiceItem NAVASSOC gr.spinellis.product.Product
 	c12:p -> c20:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open];
-	// gr.spinellis.invoice.Invoice navassoc gr.spinellis.invoice.InvoiceItem
+	// gr.spinellis.invoice.Invoice NAVASSOC gr.spinellis.invoice.InvoiceItem
 	c16:p -> c12:p [taillabel="", label="", headlabel="*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open];
-	// gr.spinellis.invoice.Invoice depend gr.spinellis.product.Product
+	// gr.spinellis.invoice.Invoice DEPEND gr.spinellis.product.Product
 	c16:p -> c20:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open, style=dashed];
 }
 
diff --git a/testdata/umldoc-ref/gr/spinellis/invoice/InvoiceItem.html b/testdata/umldoc-ref/gr/spinellis/invoice/InvoiceItem.html
index 2b0594e..97ad84d 100644
--- a/testdata/umldoc-ref/gr/spinellis/invoice/InvoiceItem.html
+++ b/testdata/umldoc-ref/gr/spinellis/invoice/InvoiceItem.html
@@ -2,12 +2,12 @@
 
 
 
-
+
 
 InvoiceItem
 
 
-
+
 
 
 
@@ -91,9 +91,9 @@ gr.spinellis.invoice
 

 Class InvoiceItem
 
-
-
-
+
+
+
 
 
Package class diagram package InvoiceItem

 
diff --git a/testdata/umldoc-ref/gr/spinellis/invoice/gr.spinellis.invoice.dot b/testdata/umldoc-ref/gr/spinellis/invoice/gr.spinellis.invoice.dot
index ae55a08..c823b1d 100644
--- a/testdata/umldoc-ref/gr/spinellis/invoice/gr.spinellis.invoice.dot
+++ b/testdata/umldoc-ref/gr/spinellis/invoice/gr.spinellis.invoice.dot
@@ -1,21 +1,21 @@
 #!/usr/local/bin/dot
 #
 # Class diagram 
-# Generated by UmlGraph version 4.4 (http://www.spinellis.gr/sw/umlgraph)
+# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph)
 #
 
 digraph G {
 	edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10];
 	node [fontname="Helvetica",fontsize=10,shape=plaintext];
 	// gr.spinellis.invoice.InvoiceItem
-	c0 [label=<
 InvoiceItem 
>, fontname="Helvetica", fontcolor="black", fontsize=10.0];
+	c0 [label=<
 InvoiceItem 
>, fontname="Helvetica", fontcolor="black", fontsize=10.0];
 	// gr.spinellis.invoice.Invoice
-	c1 [label=<
 Invoice 
>, fontname="Helvetica", fontcolor="black", fontsize=10.0];
+	c1 [label=<
 Invoice 
>, fontname="Helvetica", fontcolor="black", fontsize=10.0];
 	// gr.spinellis.invoice.Customer
-	c2 [label=<
 Customer 
>, fontname="Helvetica", fontcolor="black", fontsize=10.0];
-	// gr.spinellis.invoice.Invoice navassoc gr.spinellis.invoice.InvoiceItem
+	c2 [label=<
 Customer 
>, fontname="Helvetica", fontcolor="black", fontsize=10.0];
+	// gr.spinellis.invoice.Invoice NAVASSOC gr.spinellis.invoice.InvoiceItem
 	c1:p -> c0:p [taillabel="", label="", headlabel="*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open];
-	// gr.spinellis.invoice.Invoice navassoc gr.spinellis.invoice.Customer
+	// gr.spinellis.invoice.Invoice NAVASSOC gr.spinellis.invoice.Customer
 	c1:p -> c2:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open];
 }
 
diff --git a/testdata/umldoc-ref/gr/spinellis/invoice/package-frame.html b/testdata/umldoc-ref/gr/spinellis/invoice/package-frame.html
index a880ec4..102b5d6 100644
--- a/testdata/umldoc-ref/gr/spinellis/invoice/package-frame.html
+++ b/testdata/umldoc-ref/gr/spinellis/invoice/package-frame.html
@@ -2,12 +2,12 @@
 
 
 
-
+
 
 gr.spinellis.invoice
 
 
-
+
 
 
 
diff --git a/testdata/umldoc-ref/gr/spinellis/invoice/package-summary.html b/testdata/umldoc-ref/gr/spinellis/invoice/package-summary.html
index 5043d6a..50cbe4b 100644
--- a/testdata/umldoc-ref/gr/spinellis/invoice/package-summary.html
+++ b/testdata/umldoc-ref/gr/spinellis/invoice/package-summary.html
@@ -2,12 +2,12 @@
 
 
 
-
+
 
 gr.spinellis.invoice
 
 
-
+
 
 
 
@@ -82,9 +82,9 @@ function windowTitle()
 Package gr.spinellis.invoice
 
 
-
-
-
+
+
+
 
 
Package class diagram package gr.spinellis.invoice

 
diff --git a/testdata/umldoc-ref/gr/spinellis/invoice/package-tree.html b/testdata/umldoc-ref/gr/spinellis/invoice/package-tree.html
index c69d208..810e98f 100644
--- a/testdata/umldoc-ref/gr/spinellis/invoice/package-tree.html
+++ b/testdata/umldoc-ref/gr/spinellis/invoice/package-tree.html
@@ -2,12 +2,12 @@
 
 
 
-
+
 
 gr.spinellis.invoice Class Hierarchy
 
 
-
+
 
 
 
diff --git a/testdata/umldoc-ref/gr/spinellis/product/Category.dot b/testdata/umldoc-ref/gr/spinellis/product/Category.dot
index 630ea8d..e951793 100644
--- a/testdata/umldoc-ref/gr/spinellis/product/Category.dot
+++ b/testdata/umldoc-ref/gr/spinellis/product/Category.dot
@@ -1,25 +1,25 @@
 #!/usr/local/bin/dot
 #
 # Class diagram 
-# Generated by UmlGraph version 4.4 (http://www.spinellis.gr/sw/umlgraph)
+# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph)
 #
 
 digraph G {
 	edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10];
 	node [fontname="Helvetica",fontsize=10,shape=plaintext];
 	// gr.spinellis.product.Product
-	c59 [label=<
 Product 
>, fontname="Helvetica", fontcolor="black", fontsize=10.0];
+	c57 [label=<
 Product 
>, fontname="Helvetica", fontcolor="black", fontsize=10.0];
 	// gr.spinellis.product.Category
-	c60 [label=<
 Category 
>, fontname="Helvetica", fontcolor="black", fontsize=10.0];
-	// gr.spinellis.product.Product navassoc java.lang.String
-	c59:p -> c61:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open];
-	// gr.spinellis.product.Product navassoc gr.spinellis.product.Category
-	c59:p -> c60:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open];
-	// gr.spinellis.product.Category navassoc java.lang.String
-	c60:p -> c61:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open];
-	// gr.spinellis.product.Category navassoc gr.spinellis.product.Product
-	c60:p -> c59:p [taillabel="", label="", headlabel="*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open];
+	c58 [label=<
 Category 
>, fontname="Helvetica", fontcolor="black", fontsize=10.0];
+	// gr.spinellis.product.Product NAVASSOC java.lang.String
+	c57:p -> c59:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open];
+	// gr.spinellis.product.Product NAVASSOC gr.spinellis.product.Category
+	c57:p -> c58:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open];
+	// gr.spinellis.product.Category NAVASSOC java.lang.String
+	c58:p -> c59:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open];
+	// gr.spinellis.product.Category NAVASSOC gr.spinellis.product.Product
+	c58:p -> c57:p [taillabel="", label="", headlabel="*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open];
 	// java.lang.String
-	c61 [label=<
 String 
 java.lang 
>, fontname="Helvetica", fontcolor="black", fontsize=10.0];
+	c59 [label=<
 String 
 java.lang 
>, fontname="Helvetica", fontcolor="black", fontsize=10.0];
 }
 
diff --git a/testdata/umldoc-ref/gr/spinellis/product/Category.html b/testdata/umldoc-ref/gr/spinellis/product/Category.html
index 1cab557..3ddbbda 100644
--- a/testdata/umldoc-ref/gr/spinellis/product/Category.html
+++ b/testdata/umldoc-ref/gr/spinellis/product/Category.html
@@ -2,12 +2,12 @@
 
 
 
-
+
 
 Category
 
 
-
+
 
 
 
@@ -91,9 +91,9 @@ gr.spinellis.product
 

 Class Category
 
-
-
-
+
+
+
 
 
Package class diagram package Category

 
diff --git a/testdata/umldoc-ref/gr/spinellis/product/Product.dot b/testdata/umldoc-ref/gr/spinellis/product/Product.dot
index a236946..f861ac0 100644
--- a/testdata/umldoc-ref/gr/spinellis/product/Product.dot
+++ b/testdata/umldoc-ref/gr/spinellis/product/Product.dot
@@ -1,35 +1,35 @@
 #!/usr/local/bin/dot
 #
 # Class diagram 
-# Generated by UmlGraph version 4.4 (http://www.spinellis.gr/sw/umlgraph)
+# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph)
 #
 
 digraph G {
 	edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10];
 	node [fontname="Helvetica",fontsize=10,shape=plaintext];
 	// gr.spinellis.invoice.InvoiceItem
-	c46 [label=<
 InvoiceItem 
 gr.spinellis.invoice 
>, fontname="Helvetica", fontcolor="black", fontsize=10.0];
+	c46 [label=<
 InvoiceItem 
 gr.spinellis.invoice 
>, fontname="Helvetica", fontcolor="black", fontsize=10.0];
 	// gr.spinellis.invoice.Invoice
-	c47 [label=<
 Invoice 
 gr.spinellis.invoice 
>, fontname="Helvetica", fontcolor="black", fontsize=10.0];
+	c47 [label=<
 Invoice 
 gr.spinellis.invoice 
>, fontname="Helvetica", fontcolor="black", fontsize=10.0];
 	// gr.spinellis.product.Product
-	c49 [label=<
 Product 
>, fontname="Helvetica", fontcolor="black", fontsize=10.0];
+	c49 [label=<
 Product 
>, fontname="Helvetica", fontcolor="black", fontsize=10.0];
 	// gr.spinellis.product.Category
-	c50 [label=<
 Category 
>, fontname="Helvetica", fontcolor="black", fontsize=10.0];
-	// gr.spinellis.invoice.InvoiceItem navassoc gr.spinellis.product.Product
+	c50 [label=<
 Category 
>, fontname="Helvetica", fontcolor="black", fontsize=10.0];
+	// gr.spinellis.invoice.InvoiceItem NAVASSOC gr.spinellis.product.Product
 	c46:p -> c49:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open];
-	// gr.spinellis.invoice.Invoice navassoc gr.spinellis.invoice.InvoiceItem
+	// gr.spinellis.invoice.Invoice NAVASSOC gr.spinellis.invoice.InvoiceItem
 	c47:p -> c46:p [taillabel="", label="", headlabel="*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open];
-	// gr.spinellis.product.Product navassoc java.lang.String
+	// gr.spinellis.product.Product NAVASSOC java.lang.String
 	c49:p -> c51:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open];
-	// gr.spinellis.product.Product navassoc gr.spinellis.product.Category
+	// gr.spinellis.product.Product NAVASSOC gr.spinellis.product.Category
 	c49:p -> c50:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open];
-	// gr.spinellis.product.Category navassoc java.lang.String
+	// gr.spinellis.product.Category NAVASSOC java.lang.String
 	c50:p -> c51:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open];
-	// gr.spinellis.product.Category navassoc gr.spinellis.product.Product
+	// gr.spinellis.product.Category NAVASSOC gr.spinellis.product.Product
 	c50:p -> c49:p [taillabel="", label="", headlabel="*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open];
-	// gr.spinellis.invoice.Invoice depend gr.spinellis.product.Product
+	// gr.spinellis.invoice.Invoice DEPEND gr.spinellis.product.Product
 	c47:p -> c49:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open, style=dashed];
 	// java.lang.String
-	c51 [label=<
 String 
 java.lang 
>, fontname="Helvetica", fontcolor="black", fontsize=10.0];
+	c51 [label=<
 String 
 java.lang 
>, fontname="Helvetica", fontcolor="black", fontsize=10.0];
 }
 
diff --git a/testdata/umldoc-ref/gr/spinellis/product/Product.html b/testdata/umldoc-ref/gr/spinellis/product/Product.html
index b967856..f3ca4b5 100644
--- a/testdata/umldoc-ref/gr/spinellis/product/Product.html
+++ b/testdata/umldoc-ref/gr/spinellis/product/Product.html
@@ -2,12 +2,12 @@
 
 
 
-
+
 
 Product
 
 
-
+
 
 
 
@@ -91,11 +91,11 @@ gr.spinellis.product
 

 Class Product
 
-
-
-
-
-
+
+
+
+
+
 
 
Package class diagram package Product

 
diff --git a/testdata/umldoc-ref/gr/spinellis/product/gr.spinellis.product.dot b/testdata/umldoc-ref/gr/spinellis/product/gr.spinellis.product.dot
index c73e577..ef819d1 100644
--- a/testdata/umldoc-ref/gr/spinellis/product/gr.spinellis.product.dot
+++ b/testdata/umldoc-ref/gr/spinellis/product/gr.spinellis.product.dot
@@ -1,19 +1,19 @@
 #!/usr/local/bin/dot
 #
 # Class diagram 
-# Generated by UmlGraph version 4.4 (http://www.spinellis.gr/sw/umlgraph)
+# Generated by UmlGraph version 5.0 (http://www.spinellis.gr/sw/umlgraph)
 #
 
 digraph G {
 	edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10];
 	node [fontname="Helvetica",fontsize=10,shape=plaintext];
 	// gr.spinellis.product.Product
-	c8 [label=<
 Product 
>, fontname="Helvetica", fontcolor="black", fontsize=10.0];
+	c8 [label=<
 Product 
>, fontname="Helvetica", fontcolor="black", fontsize=10.0];
 	// gr.spinellis.product.Category
-	c9 [label=<
 Category 
>, fontname="Helvetica", fontcolor="black", fontsize=10.0];
-	// gr.spinellis.product.Product navassoc gr.spinellis.product.Category
+	c9 [label=<
 Category 
>, fontname="Helvetica", fontcolor="black", fontsize=10.0];
+	// gr.spinellis.product.Product NAVASSOC gr.spinellis.product.Category
 	c8:p -> c9:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open];
-	// gr.spinellis.product.Category navassoc gr.spinellis.product.Product
+	// gr.spinellis.product.Category NAVASSOC gr.spinellis.product.Product
 	c9:p -> c8:p [taillabel="", label="", headlabel="*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open];
 }
 
diff --git a/testdata/umldoc-ref/gr/spinellis/product/package-frame.html b/testdata/umldoc-ref/gr/spinellis/product/package-frame.html
index 17c8dac..8df1dcc 100644
--- a/testdata/umldoc-ref/gr/spinellis/product/package-frame.html
+++ b/testdata/umldoc-ref/gr/spinellis/product/package-frame.html
@@ -2,12 +2,12 @@
 
 
 
-
+
 
 gr.spinellis.product
 
 
-
+
 
 
 
diff --git a/testdata/umldoc-ref/gr/spinellis/product/package-summary.html b/testdata/umldoc-ref/gr/spinellis/product/package-summary.html
index ccae1ce..e5e7ce8 100644
--- a/testdata/umldoc-ref/gr/spinellis/product/package-summary.html
+++ b/testdata/umldoc-ref/gr/spinellis/product/package-summary.html
@@ -2,12 +2,12 @@
 
 
 
-
+
 
 gr.spinellis.product
 
 
-
+
 
 
 
@@ -82,8 +82,8 @@ function windowTitle()
 Package gr.spinellis.product
 
 
-
-
+
+
 
 
Package class diagram package gr.spinellis.product

 
diff --git a/testdata/umldoc-ref/gr/spinellis/product/package-tree.html b/testdata/umldoc-ref/gr/spinellis/product/package-tree.html
index ec80240..9399b77 100644
--- a/testdata/umldoc-ref/gr/spinellis/product/package-tree.html
+++ b/testdata/umldoc-ref/gr/spinellis/product/package-tree.html
@@ -2,12 +2,12 @@
 
 
 
-
+
 
 gr.spinellis.product Class Hierarchy
 
 
-
+
 
 
 
diff --git a/testdata/umldoc-ref/help-doc.html b/testdata/umldoc-ref/help-doc.html
index d2a175c..2d0f5fe 100644
--- a/testdata/umldoc-ref/help-doc.html
+++ b/testdata/umldoc-ref/help-doc.html
@@ -2,12 +2,12 @@
 
 
 
-
+
 
 API Help
 
 
-
+
 
 
 
diff --git a/testdata/umldoc-ref/index-all.html b/testdata/umldoc-ref/index-all.html
index 8a8b6a8..5c11061 100644
--- a/testdata/umldoc-ref/index-all.html
+++ b/testdata/umldoc-ref/index-all.html
@@ -2,12 +2,12 @@
 
 
 
-
+
 
 Index
 
 
-
+
 
 
 
diff --git a/testdata/umldoc-ref/index.html b/testdata/umldoc-ref/index.html
index 45cf062..2f57066 100644
--- a/testdata/umldoc-ref/index.html
+++ b/testdata/umldoc-ref/index.html
@@ -2,7 +2,7 @@
 
 
 
-
+
 
 Generated Documentation (Untitled)
 
diff --git a/testdata/umldoc-ref/overview-frame.html b/testdata/umldoc-ref/overview-frame.html
index dce01f4..5604bba 100644
--- a/testdata/umldoc-ref/overview-frame.html
+++ b/testdata/umldoc-ref/overview-frame.html
@@ -2,12 +2,12 @@
 
 
 
-
+
 
 Overview List
 
 
-
+
 
 
 
diff --git a/testdata/umldoc-ref/overview-summary.html b/testdata/umldoc-ref/overview-summary.html
index 4aebcf4..7051952 100644
--- a/testdata/umldoc-ref/overview-summary.html
+++ b/testdata/umldoc-ref/overview-summary.html
@@ -2,12 +2,12 @@
 
 
 
-
+
 
 Overview
 
 
-
+
 
 
 
diff --git a/testdata/umldoc-ref/overview-tree.html b/testdata/umldoc-ref/overview-tree.html
index e08980b..908c4f7 100644
--- a/testdata/umldoc-ref/overview-tree.html
+++ b/testdata/umldoc-ref/overview-tree.html
@@ -2,12 +2,12 @@
 
 
 
-
+
 
 Class Hierarchy
 
 
-
+