diff --git a/testdata/dot-ref/Abstr.dot b/testdata/dot-ref/Abstr.dot index 212b074..4dfa35b 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 $Id$ +# Generated by UmlGraph version 4.1 (http://www.spinellis.gr/sw/umlgraph) # digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; - node [fontname="Helvetica",fontsize=10,shape=record]; + node [fontname="Helvetica",fontsize=10,shape=plaintext]; // test.AbstractNode - c0 [label="AbstractNode", fontname="Helvetica-Oblique", fontcolor="black", fontsize=10.0]; + c1 [label=<
AbstractNode
abstractMethod()
concreteMethod()
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // test.InnerNode - c1 [label="InnerNode", fontname="Helvetica", fontcolor="black", fontsize=10.0]; - //test.InnerNode extends test.AbstractNode - c0 -> c1 [dir=back,arrowtail=empty]; - // test.InnerNode composed test.AbstractNode - c1 -> c0 [taillabel="1", label="has", headlabel="*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none, arrowtail=diamond]; + c2 [label=<
InnerNode
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // test.Leaf - c2 [label="Leaf", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c3 [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]; //test.Leaf extends test.AbstractNode - c0 -> c2 [dir=back,arrowtail=empty]; + c1:p -> c3:p [dir=back,arrowtail=empty]; } diff --git a/testdata/dot-ref/Inference.dot b/testdata/dot-ref/Inference.dot index ed3c012..9be61b5 100644 --- a/testdata/dot-ref/Inference.dot +++ b/testdata/dot-ref/Inference.dot @@ -6,44 +6,44 @@ digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; - node [fontname="Helvetica",fontsize=10,shape=record]; + node [fontname="Helvetica",fontsize=10,shape=plaintext]; // A - c65 [label="{A\n|first : B\lsecond : B\lthird : C\l|}", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c66 [label=<
A
first : B
second : B
third : C
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // B - c66 [label="{B\n||doSomething(b : B, c : C) : A\l}", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c67 [label=<
B
doSomething(b : B, c : C) : A
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // C - c67 [label="{C\n|collectionOfA : List\\lcollectionOfB : ArrayList\\lmapOfD : Map\\lchilds : C[]\lanOpaqueList : List\<\>\l|}", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c68 [label=<
C
collectionOfA : List<A>
collectionOfB : ArrayList<B>
mapOfD : Map<String, D>
childs : C[]
anOpaqueList : List<>
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // MyFunnyList - c68 [label="{MyFunnyList\\n|myField : V\l|}", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c69 [label=<
MyFunnyList<T, V>
myField : V
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // MyList - c69 [label="MyList", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c70 [label=<
MyList
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // D - c70 [label="{D\n|anotherListOfA : MyList\l|}", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c71 [label=<
D
anotherListOfA : MyList
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; //MyFunnyList extends java.util.ArrayList - c71 -> c68 [dir=back,arrowtail=empty]; + c72:p -> c69:p [dir=back,arrowtail=empty]; //MyList extends MyFunnyList - c68 -> c69 [dir=back,arrowtail=empty]; - // A depend B - c65 -> c66 [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open, style=dashed]; + c69:p -> c70:p [dir=back,arrowtail=empty]; // A depend C - c65 -> c67 [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open, style=dashed]; - // B depend A - c66 -> c65 [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open, style=dashed]; + c66:p -> c68:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open, style=dashed]; + // A depend B + c66:p -> c67:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open, style=dashed]; // B depend C - c66 -> c67 [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open, style=dashed]; - // C depend java.util.Map - c67 -> c72 [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open, style=dashed]; - // C depend java.util.ArrayList - c67 -> c71 [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open, style=dashed]; + c67:p -> c68:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open, style=dashed]; + // B depend A + c67:p -> c66:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open, style=dashed]; // C depend java.util.List - c67 -> c73 [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open, style=dashed]; + c68:p -> c73:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open, style=dashed]; + // C depend java.util.ArrayList + c68:p -> c72:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open, style=dashed]; + // C depend java.util.Map + c68:p -> c74:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open, style=dashed]; // D depend MyList - c70 -> c69 [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open, style=dashed]; + c71:p -> c70:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open, style=dashed]; // java.util.Map - c72 [label="{«interface» \nMap\\n||size() : int\lisEmpty() : boolean\lcontainsKey(arg0 : Object) : boolean\lcontainsValue(arg0 : Object) : boolean\lget(arg0 : Object) : V\lput(arg0 : K, arg1 : V) : V\lremove(arg0 : Object) : V\lputAll(arg0 : Map\)\lclear()\lkeySet() : Set\\lvalues() : Collection\\lentrySet() : Set\\>\lequals(arg0 : Object) : boolean\lhashCode() : int\l}", fontname="Helvetica-Oblique", fontcolor="black", fontsize=10.0]; + c74 [label=<
«interface»
Map<K, V>
size() : int
isEmpty() : boolean
containsKey(arg0 : Object) : boolean
containsValue(arg0 : Object) : boolean
get(arg0 : Object) : V
put(arg0 : K, arg1 : V) : V
remove(arg0 : Object) : V
putAll(arg0 : Map<?, ?>)
clear()
keySet() : Set<K>
values() : Collection<V>
entrySet() : Set<Map.Entry<K, V>>
equals(arg0 : Object) : boolean
hashCode() : int
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // java.util.ArrayList - c71 [label="{ArrayList\\n|serialVersionUID : long\lelementData : E[]\lsize : int\l|trimToSize()\lensureCapacity(arg0 : int)\lsize() : int\lisEmpty() : boolean\lcontains(arg0 : Object) : boolean\lindexOf(arg0 : Object) : int\llastIndexOf(arg0 : Object) : int\lclone() : Object\ltoArray() : Object[]\ltoArray(arg0 : T[]) : T[]\lget(arg0 : int) : E\lset(arg0 : int, arg1 : E) : E\ladd(arg0 : E) : boolean\ladd(arg0 : int, arg1 : E)\lremove(arg0 : int) : E\lremove(arg0 : Object) : boolean\lfastRemove(arg0 : int)\lclear()\laddAll(arg0 : Collection\) : boolean\laddAll(arg0 : int, arg1 : Collection\) : boolean\lremoveRange(arg0 : int, arg1 : int)\lRangeCheck(arg0 : int)\lwriteObject(arg0 : ObjectOutputStream)\lreadObject(arg0 : ObjectInputStream)\l}", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + 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]; // java.util.List - c73 [label="{«interface» \nList\\n||size() : int\lisEmpty() : boolean\lcontains(arg0 : Object) : boolean\literator() : Iterator\\ltoArray() : Object[]\ltoArray(arg0 : T[]) : T[]\ladd(arg0 : E) : boolean\lremove(arg0 : Object) : boolean\lcontainsAll(arg0 : Collection\) : boolean\laddAll(arg0 : Collection\) : boolean\laddAll(arg0 : int, arg1 : Collection\) : boolean\lremoveAll(arg0 : Collection\) : boolean\lretainAll(arg0 : Collection\) : boolean\lclear()\lequals(arg0 : Object) : boolean\lhashCode() : int\lget(arg0 : int) : E\lset(arg0 : int, arg1 : E) : E\ladd(arg0 : int, arg1 : E)\lremove(arg0 : int) : E\lindexOf(arg0 : Object) : int\llastIndexOf(arg0 : Object) : int\llistIterator() : ListIterator\\llistIterator(arg0 : int) : ListIterator\\lsubList(arg0 : int, arg1 : int) : List\\l}", fontname="Helvetica-Oblique", fontcolor="black", fontsize=10.0]; + c73 [label=<
«interface»
List<E>
size() : int
isEmpty() : boolean
contains(arg0 : Object) : boolean
iterator() : Iterator<E>
toArray() : Object[]
toArray(arg0 : T[]) : T[]
add(arg0 : E) : boolean
remove(arg0 : Object) : boolean
containsAll(arg0 : Collection<?>) : boolean
addAll(arg0 : Collection<?>) : boolean
addAll(arg0 : int, arg1 : Collection<?>) : boolean
removeAll(arg0 : Collection<?>) : boolean
retainAll(arg0 : Collection<?>) : boolean
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 7aaa81d..7c70527 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 $Id$ +# Generated by UmlGraph version 4.1 (http://www.spinellis.gr/sw/umlgraph) # digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; - node [fontname="Helvetica",fontsize=10,shape=record]; + node [fontname="Helvetica",fontsize=10,shape=plaintext]; // Application - c0 [label="Application", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c75 [label=<
Application
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // IrpApplication - c1 [label="IrpApplication", fontname="Helvetica", fontcolor="black", fontsize=10.0]; - //IrpApplication extends Application - c0 -> c1 [dir=back,arrowtail=empty]; + c76 [label=<
IrpApplication
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // Main - c2 [label="Main", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c77 [label=<
Main
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + //IrpApplication extends Application + c75:p -> c76:p [dir=back,arrowtail=empty]; // Main depend IrpApplication - c2 -> c1 [taillabel="", label="«friend»", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open, style=dashed]; + c77:p -> c76:p [taillabel="", label="«friend»", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open, style=dashed]; } diff --git a/testdata/dot-ref/Java5.dot b/testdata/dot-ref/Java5.dot deleted file mode 100644 index b496101..0000000 --- a/testdata/dot-ref/Java5.dot +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/local/bin/dot -# -# Class diagram -# Generated by $Id$ -# - -digraph G { - edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; - node [fontname="Helvetica",fontsize=10,shape=record]; - // Java5 - c1 [label="{Java5\n|~ state : Java5.States\l- specifiedPackages : Set\\l|+ printAll(args : String[])\l}", fontname="Helvetica", fontcolor="black", fontsize=10.0]; - // Java5.States - c2 [label="{«enumeration» \nStates\n|start\ldash\lcolon\lspace\lopen\lw\lclose\l|}", fontname="Helvetica", fontcolor="black", fontsize=10.0]; -} - diff --git a/testdata/dot-ref/MultiAssoc.dot b/testdata/dot-ref/MultiAssoc.dot index fe66aa6..05ae880 100644 --- a/testdata/dot-ref/MultiAssoc.dot +++ b/testdata/dot-ref/MultiAssoc.dot @@ -6,12 +6,12 @@ digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; - node [fontname="Helvetica",fontsize=10,shape=record]; + node [fontname="Helvetica",fontsize=10,shape=plaintext]; // A - c73 [label="A", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c82 [label=<
A
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // C - c75 [label="C", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c84 [label=<
C
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // A depend C - c73 -> c75 [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open, style=dashed]; + c82:p -> c84: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 23dc2ac..f5d676a 100644 --- a/testdata/dot-ref/MyVector.dot +++ b/testdata/dot-ref/MyVector.dot @@ -1,26 +1,26 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UmlGraph version 4.2 (http://www.spinellis.gr/sw/umlgraph) +# Generated by UmlGraph version 4.1 (http://www.spinellis.gr/sw/umlgraph) # digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; - node [fontname="Helvetica",fontsize=10,shape=record]; + node [fontname="Helvetica",fontsize=10,shape=plaintext]; // MyVector - c1 [label="{MyVector\\n||~ addAll(index : int, c : Collection\) : boolean\l~ foo(x : MyVector\\>) : MyVector\\l~ removeAll(c : Collection\) : boolean\l~ set(index : int, element : E) : E\l}", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + 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]; //MyVector extends java.util.Vector - c2 -> c1 [dir=back,arrowtail=empty]; - c3 -> c1 [dir=back,arrowtail=empty,style=dashed]; //MyVector implements java.util.List - c4 -> c1 [dir=back,arrowtail=empty,style=dashed]; //MyVector implements java.util.RandomAccess - c5 -> c1 [dir=back,arrowtail=empty,style=dashed]; //MyVector implements java.lang.Cloneable + c87:p -> c86:p [dir=back,arrowtail=empty]; + c88:p -> c86:p [dir=back,arrowtail=empty,style=dashed]; //MyVector implements java.util.List + c89:p -> c86:p [dir=back,arrowtail=empty,style=dashed]; //MyVector implements java.util.RandomAccess + c90:p -> c86:p [dir=back,arrowtail=empty,style=dashed]; //MyVector implements java.lang.Cloneable // java.lang.Cloneable - c5 [label="«interface» \nCloneable", fontname="Helvetica-Oblique", fontcolor="black", fontsize=10.0]; - // java.util.RandomAccess - c4 [label="«interface» \nRandomAccess", fontname="Helvetica-Oblique", fontcolor="black", fontsize=10.0]; - // java.util.Vector - c2 [label="{Vector\\n|# elementData : Object[]\l# elementCount : int\l# capacityIncrement : int\l- serialVersionUID : long\l|+ copyInto(arg0 : Object[])\l+ trimToSize()\l+ ensureCapacity(arg0 : int)\l- ensureCapacityHelper(arg0 : int)\l+ setSize(arg0 : int)\l+ capacity() : int\l+ size() : int\l+ isEmpty() : boolean\l+ elements() : Enumeration\\l+ contains(arg0 : Object) : boolean\l+ indexOf(arg0 : Object) : int\l+ indexOf(arg0 : Object, arg1 : int) : int\l+ lastIndexOf(arg0 : Object) : int\l+ lastIndexOf(arg0 : Object, arg1 : int) : int\l+ elementAt(arg0 : int) : E\l+ firstElement() : E\l+ lastElement() : E\l+ setElementAt(arg0 : E, arg1 : int)\l+ removeElementAt(arg0 : int)\l+ insertElementAt(arg0 : E, arg1 : int)\l+ addElement(arg0 : E)\l+ removeElement(arg0 : Object) : boolean\l+ removeAllElements()\l+ clone() : Object\l+ toArray() : Object[]\l+ toArray(arg0 : T[]) : T[]\l+ get(arg0 : int) : E\l+ set(arg0 : int, arg1 : E) : E\l+ add(arg0 : E) : boolean\l+ remove(arg0 : Object) : boolean\l+ add(arg0 : int, arg1 : E)\l+ remove(arg0 : int) : E\l+ clear()\l+ containsAll(arg0 : Collection\) : boolean\l+ addAll(arg0 : Collection\) : boolean\l+ removeAll(arg0 : Collection\) : boolean\l+ retainAll(arg0 : Collection\) : boolean\l+ addAll(arg0 : int, arg1 : Collection\) : boolean\l+ equals(arg0 : Object) : boolean\l+ hashCode() : int\l+ toString() : String\l+ subList(arg0 : int, arg1 : int) : List\\l# removeRange(arg0 : int, arg1 : int)\l- writeObject(arg0 : ObjectOutputStream)\l}", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c90 [label=<
«interface»
Cloneable
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // java.util.List - c3 [label="{«interface» \nList\\n||+ size() : int\l+ isEmpty() : boolean\l+ contains(arg0 : Object) : boolean\l+ iterator() : Iterator\\l+ toArray() : Object[]\l+ toArray(arg0 : T[]) : T[]\l+ add(arg0 : E) : boolean\l+ remove(arg0 : Object) : boolean\l+ containsAll(arg0 : Collection\) : boolean\l+ addAll(arg0 : Collection\) : boolean\l+ addAll(arg0 : int, arg1 : Collection\) : boolean\l+ removeAll(arg0 : Collection\) : boolean\l+ retainAll(arg0 : Collection\) : boolean\l+ clear()\l+ equals(arg0 : Object) : boolean\l+ hashCode() : int\l+ get(arg0 : int) : E\l+ set(arg0 : int, arg1 : E) : E\l+ add(arg0 : int, arg1 : E)\l+ remove(arg0 : int) : E\l+ indexOf(arg0 : Object) : int\l+ lastIndexOf(arg0 : Object) : int\l+ listIterator() : ListIterator\\l+ listIterator(arg0 : int) : ListIterator\\l+ subList(arg0 : int, arg1 : int) : List\\l}", fontname="Helvetica-Oblique", fontcolor="black", fontsize=10.0]; + 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]; + // 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]; } diff --git a/testdata/dot-ref/Root.dot b/testdata/dot-ref/Root.dot index aacca9c..a26074c 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 $Id$ +# Generated by UmlGraph version 4.1 (http://www.spinellis.gr/sw/umlgraph) # digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; - node [fontname="Helvetica",fontsize=10,shape=record]; + node [fontname="Helvetica",fontsize=10,shape=plaintext]; // Root - c0 [label="Root", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c91 [label=<
Root
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // Adapter - c1 [label="Adapter", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c92 [label=<
Adapter
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // Element - c2 [label="Element", fontname="Helvetica-Oblique", fontcolor="black", fontsize=10.0]; + c93 [label=<
Element
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // ObjectType - c3 [label="ObjectType", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c94 [label=<
ObjectType
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // ObjectMap - c4 [label="ObjectMap", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c95 [label=<
ObjectMap
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // Table - c5 [label="Table", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c96 [label=<
Table
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // DataOperation - c6 [label="DataOperation", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c97 [label=<
DataOperation
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // Root assoc Adapter - c0 -> c1 [taillabel="1..1", label="", headlabel="0..n", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; + 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 - c0 -> c3 [taillabel="", label="", headlabel="0..n", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; + c91:p -> c94:p [taillabel="", label="", headlabel="0..n", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; // Root assoc ObjectMap - c0 -> c4 [taillabel="", label="", headlabel="0..n", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; + c91:p -> c95:p [taillabel="", label="", headlabel="0..n", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; // Root assoc Table - c0 -> c5 [taillabel="", label="", headlabel="0..n", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; + c91:p -> c96:p [taillabel="", label="", headlabel="0..n", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; // Root assoc DataOperation - c0 -> c6 [taillabel="", label="", headlabel="0..n", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; + c91:p -> c97:p [taillabel="", label="", headlabel="0..n", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; //ObjectType extends Element - c2 -> c3 [dir=back,arrowtail=empty]; + c93:p -> c94:p [dir=back,arrowtail=empty]; //ObjectMap extends Element - c2 -> c4 [dir=back,arrowtail=empty]; + c93:p -> c95:p [dir=back,arrowtail=empty]; // ObjectMap has ObjectType - c4 -> c3 [taillabel="1..1", label="", headlabel="1..1", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none, arrowtail=ediamond]; + c95:p -> c94:p [taillabel="1..1", label="", headlabel="1..1", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none, arrowtail=ediamond]; //Table extends Element - c2 -> c5 [dir=back,arrowtail=empty]; + c93:p -> c96:p [dir=back,arrowtail=empty]; //DataOperation extends Element - c2 -> c6 [dir=back,arrowtail=empty]; + c93:p -> c97:p [dir=back,arrowtail=empty]; } diff --git a/testdata/dot-ref/ViewAll.dot b/testdata/dot-ref/ViewAll.dot index 7d208cd..49d4391 100644 --- a/testdata/dot-ref/ViewAll.dot +++ b/testdata/dot-ref/ViewAll.dot @@ -6,24 +6,24 @@ digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; - node [fontname="Helvetica",fontsize=10,shape=record]; - // gr.spinellis.invoice.InvoiceItem - c140 [label="InvoiceItem", fontname="Helvetica", fontcolor="black", fontsize=10.0]; - // gr.spinellis.invoice.Invoice - c141 [label="Invoice", fontname="Helvetica", fontcolor="black", fontsize=10.0]; - // gr.spinellis.invoice.Customer - c142 [label="Customer", fontname="Helvetica", fontcolor="black", fontsize=10.0]; - // gr.spinellis.product.Product - c143 [label="Product", fontname="Helvetica", fontcolor="black", fontsize=10.0]; - // gr.spinellis.product.Category - c144 [label="Category", fontname="Helvetica", fontcolor="black", fontsize=10.0]; - // gr.spinellis.invoice.InvoiceItem assoc gr.spinellis.product.Product - c140 -> c143 [taillabel="*", label="", headlabel="1", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; - // gr.spinellis.invoice.Invoice assoc gr.spinellis.invoice.Customer - c141 -> c142 [taillabel="*", label="", headlabel="1", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; - // gr.spinellis.invoice.Invoice composed gr.spinellis.invoice.InvoiceItem - c141 -> c140 [taillabel="1", label="", headlabel="*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none, arrowtail=diamond]; - // gr.spinellis.product.Product assoc gr.spinellis.product.Category - c143 -> c144 [taillabel="*", label="", headlabel="1", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; + node [fontname="Helvetica",fontsize=10,shape=plaintext]; + // gr.spinellis.basic.invoice.InvoiceItem + c351 [label=<
InvoiceItem
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + // gr.spinellis.basic.invoice.Invoice + c352 [label=<
Invoice
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + // gr.spinellis.basic.invoice.Customer + c353 [label=<
Customer
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + // gr.spinellis.basic.product.Product + c354 [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]; } diff --git a/testdata/dot-ref/ViewAllDetailed.dot b/testdata/dot-ref/ViewAllDetailed.dot index 99d0125..70ea611 100644 --- a/testdata/dot-ref/ViewAllDetailed.dot +++ b/testdata/dot-ref/ViewAllDetailed.dot @@ -6,24 +6,24 @@ digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; - node [fontname="Helvetica",fontsize=10,shape=record]; - // gr.spinellis.invoice.InvoiceItem - c130 [label="{InvoiceItem\n|product : Product\lquantity : int\l|}", fontname="Helvetica", fontcolor="black", fontsize=10.0]; - // gr.spinellis.invoice.Invoice - c131 [label="{Invoice\n|total : double\litems : InvoiceItem[]\lcustomer : Customer\l|addItem(p : Product, quantity : int)\l}", fontname="Helvetica", fontcolor="black", fontsize=10.0]; - // gr.spinellis.invoice.Customer - c132 [label="{Customer\n|name : String\l|}", fontname="Helvetica", fontcolor="black", fontsize=10.0]; - // gr.spinellis.product.Product - c133 [label="{Product\n|name : String\lstock : int\lprice : double\lcategory : Category\l|}", fontname="Helvetica", fontcolor="black", fontsize=10.0]; - // gr.spinellis.product.Category - c134 [label="{Category\n|name : String\lproducts : List\<\>\l|}", fontname="Helvetica", fontcolor="black", fontsize=10.0]; - // gr.spinellis.invoice.InvoiceItem assoc gr.spinellis.product.Product - c130 -> c133 [taillabel="*", label="", headlabel="1", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; - // gr.spinellis.invoice.Invoice assoc gr.spinellis.invoice.Customer - c131 -> c132 [taillabel="*", label="", headlabel="1", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; - // gr.spinellis.invoice.Invoice composed gr.spinellis.invoice.InvoiceItem - c131 -> c130 [taillabel="1", label="", headlabel="*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none, arrowtail=diamond]; - // gr.spinellis.product.Product assoc gr.spinellis.product.Category - c133 -> c134 [taillabel="*", label="", headlabel="1", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; + 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]; + // 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]; + // gr.spinellis.basic.invoice.Customer + c314 [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]; + // 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]; } diff --git a/testdata/dot-ref/ViewAtt.dot b/testdata/dot-ref/ViewAtt.dot index dd5ba21..243e537 100644 --- a/testdata/dot-ref/ViewAtt.dot +++ b/testdata/dot-ref/ViewAtt.dot @@ -6,24 +6,24 @@ digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; - node [fontname="Helvetica",fontsize=10,shape=record]; - // gr.spinellis.invoice.InvoiceItem - c120 [label="{InvoiceItem\n|product\lquantity\l|}", fontname="Helvetica", style=filled, fillcolor="yellow", fontcolor="black", fontsize=16.0]; - // gr.spinellis.invoice.Invoice - c121 [label="{Invoice\n|total\litems\lcustomer\l|}", fontname="Helvetica", style=filled, fillcolor="yellow", fontcolor="black", fontsize=16.0]; - // gr.spinellis.invoice.Customer - c122 [label="{Customer\n|name\l|}", fontname="Helvetica", style=filled, fillcolor="yellow", fontcolor="black", fontsize=16.0]; - // gr.spinellis.product.Product - c123 [label="{Product\n|name\lstock\lprice\lcategory\l|}", fontname="Helvetica", style=filled, fillcolor="yellow", fontcolor="black", fontsize=16.0]; - // gr.spinellis.product.Category - c124 [label="{Category\n|name\lproducts\l|}", fontname="Helvetica", style=filled, fillcolor="yellow", fontcolor="black", fontsize=16.0]; - // gr.spinellis.invoice.InvoiceItem assoc gr.spinellis.product.Product - c120 -> c123 [taillabel="*", label="", headlabel="1", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; - // gr.spinellis.invoice.Invoice assoc gr.spinellis.invoice.Customer - c121 -> c122 [taillabel="*", label="", headlabel="1", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; - // gr.spinellis.invoice.Invoice composed gr.spinellis.invoice.InvoiceItem - c121 -> c120 [taillabel="1", label="", headlabel="*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none, arrowtail=diamond]; - // gr.spinellis.product.Product assoc gr.spinellis.product.Category - c123 -> c124 [taillabel="*", label="", headlabel="1", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; + node [fontname="Helvetica",fontsize=10,shape=plaintext]; + // gr.spinellis.basic.invoice.InvoiceItem + c273 [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]; + // gr.spinellis.basic.invoice.Customer + c275 [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]; + // 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]; } diff --git a/testdata/dot-ref/ViewChildEmpty.dot b/testdata/dot-ref/ViewChildEmpty.dot index 9a04f45..e74be7e 100644 --- a/testdata/dot-ref/ViewChildEmpty.dot +++ b/testdata/dot-ref/ViewChildEmpty.dot @@ -6,12 +6,12 @@ digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; - node [fontname="Helvetica",fontsize=10,shape=record]; - // gr.spinellis.product.Product - c146 [label="Product", fontname="Helvetica", style=filled, fillcolor="LemonChiffon", fontcolor="black", fontsize=10.0]; - // gr.spinellis.product.Category - c147 [label="Category", fontname="Helvetica", style=filled, fillcolor="LemonChiffon", fontcolor="black", fontsize=10.0]; - // gr.spinellis.product.Product assoc gr.spinellis.product.Category - c146 -> c147 [taillabel="*", label="", headlabel="1", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; + node [fontname="Helvetica",fontsize=10,shape=plaintext]; + // gr.spinellis.basic.product.Product + c237 [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]; } diff --git a/testdata/dot-ref/ViewChildOverride.dot b/testdata/dot-ref/ViewChildOverride.dot index caeac7a..fc762ff 100644 --- a/testdata/dot-ref/ViewChildOverride.dot +++ b/testdata/dot-ref/ViewChildOverride.dot @@ -6,12 +6,12 @@ digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; - node [fontname="Helvetica",fontsize=10,shape=record]; - // gr.spinellis.product.Product - c132 [label="{Product\n|name\lstock\lprice\lcategory\l|}", fontname="Helvetica", style=filled, fillcolor="LemonChiffon", fontcolor="black", fontsize=10.0]; - // gr.spinellis.product.Category - c133 [label="Category", fontname="Helvetica", style=filled, fillcolor="brown", fontcolor="black", fontsize=10.0]; - // gr.spinellis.product.Product assoc gr.spinellis.product.Category - c132 -> c133 [taillabel="*", label="", headlabel="1", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; + 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]; + // 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]; } diff --git a/testdata/dot-ref/ViewColors.dot b/testdata/dot-ref/ViewColors.dot index 01317a4..d96a415 100644 --- a/testdata/dot-ref/ViewColors.dot +++ b/testdata/dot-ref/ViewColors.dot @@ -6,28 +6,28 @@ digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; - node [fontname="Helvetica",fontsize=10,shape=record]; - // gr.spinellis.invoice.InvoiceItem - c0 [label="InvoiceItem", fontname="Helvetica", style=filled, fillcolor="yellow", fontcolor="black", fontsize=10.0]; - // gr.spinellis.invoice.Invoice - c1 [label="Invoice", fontname="Helvetica", style=filled, fillcolor="yellow", fontcolor="black", fontsize=10.0]; - // gr.spinellis.invoice.Customer - c2 [label="Customer", fontname="Helvetica", style=filled, fillcolor="yellow", fontcolor="black", fontsize=10.0]; - // gr.spinellis.product.Product - c3 [label="Product", fontname="Helvetica", style=filled, fillcolor="yellow", fontcolor="black", fontsize=10.0]; - // gr.spinellis.product.Category - c4 [label="Category", fontname="Helvetica", style=filled, fillcolor="yellow", fontcolor="black", fontsize=10.0]; - // gr.spinellis.invoice.InvoiceItem assoc gr.spinellis.product.Product - c0 -> c3 [taillabel="*", label="", headlabel="1", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; - // gr.spinellis.invoice.Invoice assoc gr.spinellis.invoice.Customer - c1 -> c2 [taillabel="*", label="", headlabel="1", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; - // gr.spinellis.invoice.Invoice composed gr.spinellis.invoice.InvoiceItem - c1 -> c0 [taillabel="1", label="", headlabel="*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none, arrowtail=diamond]; - // gr.spinellis.product.Product assoc gr.spinellis.product.Category - c3 -> c4 [taillabel="*", label="", headlabel="1", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; - // gr.spinellis.product.Category depend java.util.List - c4 -> c10 [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open, style=dashed]; + node [fontname="Helvetica",fontsize=10,shape=plaintext]; + // gr.spinellis.basic.invoice.InvoiceItem + c156 [label=<
InvoiceItem
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + // gr.spinellis.basic.invoice.Invoice + c157 [label=<
Invoice
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + // gr.spinellis.basic.invoice.Customer + c158 [label=<
Customer
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + // gr.spinellis.basic.product.Product + c159 [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]; // java.util.List - c10 [label="«interface» \nList\", fontname="Helvetica-Oblique", style=filled, fillcolor="gray", fontcolor="black", fontsize=10.0, URL="http://java.sun.com/j2se/1.4.2/docs/api/java/util/List.html"]; + c194 [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 1757343..fbe9b41 100644 --- a/testdata/dot-ref/ViewContext.dot +++ b/testdata/dot-ref/ViewContext.dot @@ -6,36 +6,36 @@ digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; - node [fontname="Helvetica",fontsize=10,shape=record]; + node [fontname="Helvetica",fontsize=10,shape=plaintext]; // gr.spinellis.context.classes.AClient - c420 [label="AClient", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c421 [label=<
AClient
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.context.classes.ASubclass - c422 [label="ASubclass", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c423 [label=<
ASubclass
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.context.classes.E - c423 [label="E", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c424 [label=<
E
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.context.classes.D - c425 [label="D", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c426 [label=<
D
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.context.classes.B - c428 [label="B", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c429 [label=<
B
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.context.classes.ABaseClass - c429 [label="ABaseClass", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c430 [label=<
ABaseClass
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.context.classes.A - c430 [label="A", fontname="Helvetica", style=filled, fillcolor="lemonchiffon", fontcolor="black", fontsize=10.0]; + c431 [label=<
A
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; //gr.spinellis.context.classes.ASubclass extends gr.spinellis.context.classes.A - c430 -> c422 [dir=back,arrowtail=empty]; + c431:p -> c423:p [dir=back,arrowtail=empty]; //gr.spinellis.context.classes.A extends gr.spinellis.context.classes.ABaseClass - c429 -> c430 [dir=back,arrowtail=empty]; + c430:p -> c431:p [dir=back,arrowtail=empty]; // gr.spinellis.context.classes.D navassoc gr.spinellis.context.classes.A - c425 -> c430 [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open]; + 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 - c430 -> c428 [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open]; + 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 - c430 -> c506 [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open]; + 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 - c420 -> c430 [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open, style=dashed]; + 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 - c430 -> c423 [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open, style=dashed]; + c431:p -> c424:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open, style=dashed]; // javax.swing.JComponent - c506 [label="JComponent", fontname="Helvetica-Oblique", fontcolor="black", fontsize=10.0, URL="http://java.sun.com/j2se/1.4.2/docs/api/javax/swing/JComponent.html"]; + c507 [label=<
JComponent
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; } diff --git a/testdata/dot-ref/ViewInterfaces.dot b/testdata/dot-ref/ViewInterfaces.dot index 46519a5..91a6c8a 100644 --- a/testdata/dot-ref/ViewInterfaces.dot +++ b/testdata/dot-ref/ViewInterfaces.dot @@ -6,20 +6,20 @@ digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; - node [fontname="Helvetica",fontsize=10,shape=record]; + node [fontname="Helvetica",fontsize=10,shape=plaintext]; // gr.spinellis.iface.classes.FarImplementor - c531 [label="FarImplementor", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c532 [label=<
FarImplementor
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.iface.classes.DirectImplementor - c532 [label="DirectImplementor", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c533 [label=<
DirectImplementor
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.iface.classes.SubSubFace - c534 [label="«interface» \nSubSubFace", fontname="Helvetica-Oblique", fontcolor="black", fontsize=10.0]; + c535 [label=<
«interface»
SubSubFace
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.iface.classes.SubFace - c535 [label="«interface» \nSubFace", fontname="Helvetica-Oblique", fontcolor="black", fontsize=10.0]; + c536 [label=<
«interface»
SubFace
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.iface.classes.Face - c536 [label="«interface» \nFace", fontname="Helvetica-Oblique", style=filled, fillcolor="lemonchiffon", fontcolor="black", fontsize=10.0]; - c534 -> c531 [dir=back,arrowtail=empty,style=dashed]; //gr.spinellis.iface.classes.FarImplementor implements gr.spinellis.iface.classes.SubSubFace - c536 -> c532 [dir=back,arrowtail=empty,style=dashed]; //gr.spinellis.iface.classes.DirectImplementor implements gr.spinellis.iface.classes.Face - c535 -> c534 [dir=back,arrowtail=empty,style=dashed]; //gr.spinellis.iface.classes.SubSubFace implements gr.spinellis.iface.classes.SubFace - c536 -> c535 [dir=back,arrowtail=empty,style=dashed]; //gr.spinellis.iface.classes.SubFace implements 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 } diff --git a/testdata/dot-ref/ViewProduct.dot b/testdata/dot-ref/ViewProduct.dot index 46dba2c..18ea19c 100644 --- a/testdata/dot-ref/ViewProduct.dot +++ b/testdata/dot-ref/ViewProduct.dot @@ -6,12 +6,12 @@ digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; - node [fontname="Helvetica",fontsize=10,shape=record]; - // gr.spinellis.product.Product - c102 [label="{Product\n|name\lstock\lprice\lcategory\l|}", fontname="Helvetica", fontcolor="black", fontsize=10.0]; - // gr.spinellis.product.Category - c103 [label="{Category\n|name\lproducts\l|}", fontname="Helvetica", fontcolor="black", fontsize=10.0]; - // gr.spinellis.product.Product assoc gr.spinellis.product.Category - c102 -> c103 [taillabel="*", label="", headlabel="1", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; + 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]; + // 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]; } diff --git a/testdata/dot-ref/ViewSubclasses.dot b/testdata/dot-ref/ViewSubclasses.dot index a120406..3a73a48 100644 --- a/testdata/dot-ref/ViewSubclasses.dot +++ b/testdata/dot-ref/ViewSubclasses.dot @@ -6,24 +6,24 @@ digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; - node [fontname="Helvetica",fontsize=10,shape=record]; + node [fontname="Helvetica",fontsize=10,shape=plaintext]; // gr.spinellis.subclass.classes.SubOneTwo - c577 [label="SubOneTwo", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c578 [label=<
SubOneTwo
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.subclass.classes.SubOneOne - c578 [label="SubOneOne", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c579 [label=<
SubOneOne
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.subclass.classes.SubTwo - c579 [label="SubTwo", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c580 [label=<
SubTwo
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.subclass.classes.SubOne - c580 [label="SubOne", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c581 [label=<
SubOne
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.subclass.classes.Super - c581 [label="Super", fontname="Helvetica", style=filled, fillcolor="lemonchiffon", fontcolor="black", fontsize=10.0]; + c582 [label=<
Super
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; //gr.spinellis.subclass.classes.SubOneTwo extends gr.spinellis.subclass.classes.SubOne - c580 -> c577 [dir=back,arrowtail=empty]; + c581:p -> c578:p [dir=back,arrowtail=empty]; //gr.spinellis.subclass.classes.SubOneOne extends gr.spinellis.subclass.classes.SubOne - c580 -> c578 [dir=back,arrowtail=empty]; + c581:p -> c579:p [dir=back,arrowtail=empty]; //gr.spinellis.subclass.classes.SubTwo extends gr.spinellis.subclass.classes.Super - c581 -> c579 [dir=back,arrowtail=empty]; + c582:p -> c580:p [dir=back,arrowtail=empty]; //gr.spinellis.subclass.classes.SubOne extends gr.spinellis.subclass.classes.Super - c581 -> c580 [dir=back,arrowtail=empty]; + c582:p -> c581:p [dir=back,arrowtail=empty]; } diff --git a/testdata/dot-ref/advrel.dot b/testdata/dot-ref/advrel.dot index dc797ac..bb6258d 100644 --- a/testdata/dot-ref/advrel.dot +++ b/testdata/dot-ref/advrel.dot @@ -1,32 +1,32 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by $Id$ +# Generated by UmlGraph version 4.1 (http://www.spinellis.gr/sw/umlgraph) # digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; - node [fontname="Helvetica",fontsize=10,shape=record]; + node [fontname="Helvetica",fontsize=10,shape=plaintext]; // Controller - c1 [label="Controller", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c5 [label=<
Controller
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // EmbeddedAgent - c2 [label="EmbeddedAgent", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c6 [label=<
EmbeddedAgent
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // PowerManager - c3 [label="PowerManager", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c7 [label=<
PowerManager
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // SetTopController - c4 [label="{SetTopController\n|authorizationLevel\l|startUp()\lshutDown()\lconnect()\l}", fontname="Helvetica", fontcolor="black", fontsize=10.0]; - //SetTopController extends Controller - c1 -> c4 [dir=back,arrowtail=empty]; - //SetTopController extends EmbeddedAgent - c2 -> c4 [dir=back,arrowtail=empty]; - // URLStreamHandler - c5 [label="{«interface» \nURLStreamHandler\n||OpenConnection()\lparseURL()\lsetURL()\ltoExternalForm()\l}", fontname="Helvetica-Oblique", fontcolor="black", fontsize=10.0]; - c5 -> c4 [dir=back,arrowtail=empty,style=dashed]; //SetTopController implements URLStreamHandler - // SetTopController navassoc PowerManager - c4 -> c3 [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open]; + c8 [label=<
SetTopController
authorizationLevel
startUp()
shutDown()
connect()
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // ChannelIterator - c6 [label="ChannelIterator", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c9 [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]; + //SetTopController extends Controller + c5:p -> c8: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 - c6 -> c4 [taillabel="", label="«friend»", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open, style=dashed]; + c9:p -> c8:p [taillabel="", label="«friend»", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open, style=dashed]; } diff --git a/testdata/dot-ref/assoc.dot b/testdata/dot-ref/assoc.dot index 87a7e24..7f5171f 100644 --- a/testdata/dot-ref/assoc.dot +++ b/testdata/dot-ref/assoc.dot @@ -1,23 +1,23 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by $Id$ +# Generated by UmlGraph version 4.1 (http://www.spinellis.gr/sw/umlgraph) # digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; - node [fontname="Helvetica",fontsize=10,shape=record]; + node [fontname="Helvetica",fontsize=10,shape=plaintext]; rankdir=LR; ranksep=1; // UserGroup - c1 [label="UserGroup", fontname="Helvetica", fontcolor="black", fontsize=10.0]; - // UserGroup assoc User - c1 -> c2 [taillabel="*", label="", headlabel="*\n\n+user ", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; + c12 [label=<
UserGroup
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // User - c2 [label="User", fontname="Helvetica", fontcolor="black", fontsize=10.0]; - // User navassoc Password - c2 -> c3 [taillabel="1\n\n+owner\r", label="", headlabel="*\n\n+key", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open]; + c13 [label=<
User
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // Password - c3 [label="Password", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + 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]; } diff --git a/testdata/dot-ref/car.dot b/testdata/dot-ref/car.dot index 64077c3..000968b 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 $Id$ +# Generated by UmlGraph version 4.1 (http://www.spinellis.gr/sw/umlgraph) # digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; - node [fontname="Helvetica",fontsize=10,shape=record]; + node [fontname="Helvetica",fontsize=10,shape=plaintext]; // Tyre - c0 [label="Tyre", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c15 [label=<
Tyre
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // Engine - c1 [label="Engine", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c16 [label=<
Engine
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // Body - c2 [label="Body", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c17 [label=<
Body
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // Car - c3 [label="Car", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c18 [label=<
Car
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // Car composed Tyre - c3 -> c0 [taillabel="1", label="", headlabel="4", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none, arrowtail=diamond]; + 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 - c3 -> c1 [taillabel="1", label="", headlabel="1", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none, arrowtail=diamond]; + 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 - c3 -> c2 [taillabel="1", label="", headlabel="1", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none, arrowtail=diamond]; + c18:p -> c17: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 a145c9e..2f3005a 100644 --- a/testdata/dot-ref/catalina.dot +++ b/testdata/dot-ref/catalina.dot @@ -1,46 +1,46 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by $Id$ +# Generated by UmlGraph version 4.1 (http://www.spinellis.gr/sw/umlgraph) # digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; - node [fontname="Helvetica",fontsize=10,shape=record]; + node [fontname="Helvetica",fontsize=10,shape=plaintext]; // HttpResponseBase - c0 [label="HttpResponseBase", fontname="Helvetica", fontcolor="black", fontsize=10.0]; - //HttpResponseBase extends ResponseBase - // ResponseBase - c1 [label="ResponseBase", fontname="Helvetica-Oblique", fontcolor="black", fontsize=10.0]; - c1 -> c0 [dir=back,arrowtail=empty]; - // HttpResponse - c2 [label="«interface» \nHttpResponse", fontname="Helvetica-Oblique", fontcolor="black", fontsize=10.0]; - c2 -> c0 [dir=back,arrowtail=empty,style=dashed]; //HttpResponseBase implements HttpResponse - // HttpServletResponse - c3 [label="«interface» \nHttpServletResponse", fontname="Helvetica-Oblique", fontcolor="black", fontsize=10.0]; - c3 -> c0 [dir=back,arrowtail=empty,style=dashed]; //HttpResponseBase implements HttpServletResponse + c19 [label=<
HttpResponseBase
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // HttpResponseWrapper - c4 [label="HttpResponseWrapper", fontname="Helvetica-Oblique", fontcolor="black", fontsize=10.0]; - //HttpResponseWrapper extends ResponseWrapper - // ResponseWrapper - c5 [label="ResponseWrapper", fontname="Helvetica-Oblique", fontcolor="black", fontsize=10.0]; - c5 -> c4 [dir=back,arrowtail=empty]; - c2 -> c4 [dir=back,arrowtail=empty,style=dashed]; //HttpResponseWrapper implements HttpResponse + c20 [label=<
HttpResponseWrapper
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // HttpResponseFacade - c6 [label="HttpResponseFacade", fontname="Helvetica", fontcolor="black", fontsize=10.0]; - //HttpResponseFacade extends ResponseFacade + c21 [label=<
HttpResponseFacade
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + // ResponseWrapper + c22 [label=<
ResponseWrapper
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + // HttpResponse + c23 [label=<
«interface»
HttpResponse
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + // ResponseBase + c24 [label=<
ResponseBase
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + // HttpServletResponse + c25 [label=<
«interface»
HttpServletResponse
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // ResponseFacade - c7 [label="ResponseFacade", fontname="Helvetica", fontcolor="black", fontsize=10.0]; - c7 -> c6 [dir=back,arrowtail=empty]; - c3 -> c6 [dir=back,arrowtail=empty,style=dashed]; //HttpResponseFacade implements HttpServletResponse - // Response - c8 [label="«interface» \nResponse", fontname="Helvetica-Oblique", fontcolor="black", fontsize=10.0]; - c8 -> c5 [dir=back,arrowtail=empty,style=dashed]; //ResponseWrapper implements Response - c8 -> c2 [dir=back,arrowtail=empty,style=dashed]; //HttpResponse implements Response - c8 -> c1 [dir=back,arrowtail=empty,style=dashed]; //ResponseBase implements Response + c26 [label=<
ResponseFacade
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // ServletResponse - c9 [label="«interface» \nServletResponse", fontname="Helvetica-Oblique", fontcolor="black", fontsize=10.0]; - c9 -> c1 [dir=back,arrowtail=empty,style=dashed]; //ResponseBase implements ServletResponse - c9 -> c7 [dir=back,arrowtail=empty,style=dashed]; //ResponseFacade implements ServletResponse + c27 [label=<
«interface»
ServletResponse
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + // Response + c28 [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 + //HttpResponseWrapper extends ResponseWrapper + c22:p -> c20:p [dir=back,arrowtail=empty]; + c23:p -> c20:p [dir=back,arrowtail=empty,style=dashed]; //HttpResponseWrapper implements HttpResponse + //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 } diff --git a/testdata/dot-ref/class-eg.dot b/testdata/dot-ref/class-eg.dot index c288fd8..a27413f 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 $Id$ +# Generated by UmlGraph version 4.1 (http://www.spinellis.gr/sw/umlgraph) # digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; - node [fontname="Helvetica",fontsize=10,shape=record]; + node [fontname="Helvetica",fontsize=10,shape=plaintext]; // Person - c1 [label="Person", fontname="Helvetica", style=filled, fillcolor=".13 .9 1", fontcolor="black", fontsize=10.0]; + c30 [label=<
Person
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // Employee - c2 [label="Employee", fontname="Helvetica", style=filled, fillcolor=".13 .9 1", fontcolor="black", fontsize=10.0]; - //Employee extends Person - c1 -> c2 [dir=back,arrowtail=empty]; + c31 [label=<
Employee
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // Client - c3 [label="Client", fontname="Helvetica", style=filled, fillcolor=".13 .9 1", fontcolor="black", fontsize=10.0]; + c32 [label=<
Client
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + //Employee extends Person + c30:p -> c31:p [dir=back,arrowtail=empty]; //Client extends Person - c1 -> c3 [dir=back,arrowtail=empty]; + c30:p -> c32:p [dir=back,arrowtail=empty]; } diff --git a/testdata/dot-ref/classadd.dot b/testdata/dot-ref/classadd.dot index 506405a..05f989e 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 $Id$ +# Generated by UmlGraph version 4.1 (http://www.spinellis.gr/sw/umlgraph) # digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; - node [fontname="Helvetica",fontsize=10,shape=record]; + node [fontname="Helvetica",fontsize=10,shape=plaintext]; // ActionQueue - c2 [label="{«container» \nActionQueue\n\{version = 3.2\}\r\n||add(a : Action)\ladd(a : Action, n : int)\l\{version = 1.0\}\rremove(n : int)\l«query» \llength() : int\l«helper functions» \lreorder()\l}", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + 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]; } diff --git a/testdata/dot-ref/color.dot b/testdata/dot-ref/color.dot index 11e08e4..f077d65 100644 --- a/testdata/dot-ref/color.dot +++ b/testdata/dot-ref/color.dot @@ -1,27 +1,27 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by $Id$ +# Generated by UmlGraph version 4.1 (http://www.spinellis.gr/sw/umlgraph) # digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; - node [fontname="Times",fontsize=10,shape=record]; + node [fontname="Times",fontsize=10,shape=plaintext]; bgcolor=".7 .9 1"; // Pixel - c1 [label="{Pixel\n|- x : int\l- y : int\l|}", fontname="Helvetica-Bold", style=filled, fillcolor="#a0a0a0", fontcolor="white", fontsize=14.0]; - // Pixel composed Red - c1 -> c2 [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="yellow", arrowhead=none, arrowtail=diamond]; - // Pixel composed Green - c1 -> c3 [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="yellow", arrowhead=none, arrowtail=diamond]; - // Pixel composed Blue - c1 -> c4 [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="yellow", arrowhead=none, arrowtail=diamond]; + c37 [label=<
Pixel
- x : int
- y : int
>, fontname="Helvetica-Bold", fontcolor="white", fontsize=14.0]; // Red - c2 [label="Red", fontname="Times", style=filled, fillcolor="red", fontcolor="black", fontsize=14.0]; + c38 [label=<
Red
>, fontname="Times", fontcolor="black", fontsize=14.0]; // Green - c3 [label="Green", fontname="Times", style=filled, fillcolor="green", fontcolor="black", fontsize=14.0]; + c39 [label=<
Green
>, fontname="Times", fontcolor="black", fontsize=14.0]; // Blue - c4 [label="Blue", fontname="Times", style=filled, fillcolor="blue", fontcolor="black", fontsize=14.0]; + 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]; } diff --git a/testdata/dot-ref/ctor.dot b/testdata/dot-ref/ctor.dot index 8643a34..b9beefe 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 $Id$ +# Generated by UmlGraph version 4.1 (http://www.spinellis.gr/sw/umlgraph) # digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; - node [fontname="Helvetica",fontsize=10,shape=record]; + node [fontname="Helvetica",fontsize=10,shape=plaintext]; // Junk - c1 [label="{Junk\n|- value : int\l|+ Junk(val : int)\l}", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c43 [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 078d273..92b222b 100644 --- a/testdata/dot-ref/disable.dot +++ b/testdata/dot-ref/disable.dot @@ -6,12 +6,12 @@ digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; - node [fontname="Helvetica",fontsize=10,shape=record]; + node [fontname="Helvetica",fontsize=10,shape=plaintext]; // Person1 - c44 [label="{Person1\n|~ address : String\l~ name : String\l|}", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c45 [label=<
Person1
~ address : String
~ name : String
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // Person2 - c45 [label="{Person2\n||~ displayName() : String\l}", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c46 [label=<
Person2
~ displayName() : String
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // Person3 - c46 [label="{Person3\n|address : Address\lname : String\l|displayName() : String\l}", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c47 [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 4b2b955..5891e3d 100644 --- a/testdata/dot-ref/extends.dot +++ b/testdata/dot-ref/extends.dot @@ -6,10 +6,10 @@ digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; - node [fontname="Helvetica",fontsize=10,shape=record]; + node [fontname="Helvetica",fontsize=10,shape=plaintext]; // Base - c0 [label="Base", fontname="Helvetica", fontcolor="black", fontsize=10.0]; - // Test2 - c1 [label="Test2\", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c48 [label=<
Base
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + // Test2 + c49 [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 40451d6..f1cac6b 100644 --- a/testdata/dot-ref/foo.dot +++ b/testdata/dot-ref/foo.dot @@ -6,18 +6,18 @@ digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; - node [fontname="Helvetica",fontsize=10,shape=record]; + node [fontname="Helvetica",fontsize=10,shape=plaintext]; // a.b.c.UMLOptions - c49 [label="UMLOptions", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c50 [label=<
UMLOptions
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // a.b.c.UserGroup - c50 [label="UserGroup", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c51 [label=<
UserGroup
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // a.b.c.User - c51 [label="User", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c52 [label=<
User
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // a.b.c.Password - c52 [label="Password", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c53 [label=<
Password
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // a.b.c.UserGroup assoc a.b.c.User - c50 -> c51 [taillabel="*", label="", headlabel="*\n\n+user ", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; + 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 - c51 -> c52 [taillabel="1\n\n+owner\r", label="", headlabel="*\n\n+key", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open]; + c52:p -> c53:p [taillabel="1\n\n+owner\r", label="", headlabel="*\n\n+key", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open]; } diff --git a/testdata/dot-ref/general.dot b/testdata/dot-ref/general.dot index 0d60f8b..b4b5639 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 $Id$ +# Generated by UmlGraph version 4.1 (http://www.spinellis.gr/sw/umlgraph) # digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; - node [fontname="Helvetica",fontsize=10,shape=record]; + node [fontname="Helvetica",fontsize=10,shape=plaintext]; // Asset - c0 [label="Asset", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c55 [label=<
Asset
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // InterestBearingItem - c1 [label="InterestBearingItem", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c56 [label=<
InterestBearingItem
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // InsurableItem - c2 [label="InsurableItem", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c57 [label=<
InsurableItem
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // BankAccount - c3 [label="BankAccount", fontname="Helvetica", fontcolor="black", fontsize=10.0]; - //BankAccount extends Asset - c0 -> c3 [dir=back,arrowtail=empty]; - //BankAccount extends InsurableItem - c2 -> c3 [dir=back,arrowtail=empty]; - //BankAccount extends InterestBearingItem - c1 -> c3 [dir=back,arrowtail=empty]; + c58 [label=<
BankAccount
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // RealEstate - c4 [label="RealEstate", fontname="Helvetica", fontcolor="black", fontsize=10.0]; - //RealEstate extends Asset - c0 -> c4 [dir=back,arrowtail=empty]; - //RealEstate extends InsurableItem - c2 -> c4 [dir=back,arrowtail=empty]; + c59 [label=<
RealEstate
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // Security - c5 [label="Security", fontname="Helvetica", fontcolor="black", fontsize=10.0]; - //Security extends Asset - c0 -> c5 [dir=back,arrowtail=empty]; + c60 [label=<
Security
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // Stock - c6 [label="Stock", fontname="Helvetica", fontcolor="black", fontsize=10.0]; - //Stock extends Security - c5 -> c6 [dir=back,arrowtail=empty]; + c61 [label=<
Stock
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // Bond - c7 [label="Bond", fontname="Helvetica", fontcolor="black", fontsize=10.0]; - //Bond extends Security - c5 -> c7 [dir=back,arrowtail=empty]; + c62 [label=<
Bond
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // CheckingAccount - c8 [label="CheckingAccount", fontname="Helvetica", fontcolor="black", fontsize=10.0]; - //CheckingAccount extends BankAccount - c3 -> c8 [dir=back,arrowtail=empty]; + c63 [label=<
CheckingAccount
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // SavingsAccount - c9 [label="SavingsAccount", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c64 [label=<
SavingsAccount
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; + //BankAccount extends Asset + c55:p -> c58:p [dir=back,arrowtail=empty]; + //BankAccount extends InsurableItem + c57:p -> c58:p [dir=back,arrowtail=empty]; + //BankAccount extends InterestBearingItem + c56:p -> c58:p [dir=back,arrowtail=empty]; + //RealEstate extends Asset + c55:p -> c59:p [dir=back,arrowtail=empty]; + //RealEstate extends InsurableItem + c57:p -> c59:p [dir=back,arrowtail=empty]; + //Security extends Asset + c55:p -> c60:p [dir=back,arrowtail=empty]; + //Stock extends Security + c60:p -> c61:p [dir=back,arrowtail=empty]; + //Bond extends Security + c60:p -> c62:p [dir=back,arrowtail=empty]; + //CheckingAccount extends BankAccount + c58:p -> c63:p [dir=back,arrowtail=empty]; //SavingsAccount extends BankAccount - c3 -> c9 [dir=back,arrowtail=empty]; + c58:p -> c64:p [dir=back,arrowtail=empty]; } diff --git a/testdata/dot-ref/java5.dot b/testdata/dot-ref/java5.dot new file mode 100644 index 0000000..7ae5757 --- /dev/null +++ b/testdata/dot-ref/java5.dot @@ -0,0 +1,15 @@ +#!/usr/local/bin/dot +# +# Class diagram +# Generated by UmlGraph version 4.1 (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]; + // Java5.States + c80 [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 f5596c5..cae9fbd 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 $Id$ +# Generated by UmlGraph version 4.1 (http://www.spinellis.gr/sw/umlgraph) # digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; - node [fontname="Helvetica",fontsize=10,shape=record]; + node [fontname="Helvetica",fontsize=10,shape=plaintext]; // School - c3 [label="{School\n|name : Name\laddress : String\lphone : Number\l|addStudent()\lremoveStudent()\lgetStudent()\lgetAllStudents()\laddDepartment()\lremoveDepartment()\lgetDepartment()\lgetAllDepartments()\l}", fontname="Helvetica", fontcolor="black", fontsize=10.0]; - // School has Student - c3 -> c4 [taillabel="1..*", label="Member", headlabel="*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none, arrowtail=ediamond]; - // School composed Department - c3 -> c5 [taillabel="1..*", label="Has", headlabel="1..*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none, arrowtail=diamond]; + c101 [label=<
School
name : Name
address : String
phone : Number
addStudent()
removeStudent()
getStudent()
getAllStudents()
addDepartment()
removeDepartment()
getDepartment()
getAllDepartments()
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // Department - c5 [label="{Department\n|name : Name\l|addInstructor()\lremoveInstructor()\lgetInstructor()\lgetAllInstructors()\l}", fontname="Helvetica", fontcolor="black", fontsize=10.0]; - // Department assoc Course - c5 -> c6 [taillabel="1..*", label="", headlabel="1..*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; - // Department assoc Instructor - c5 -> c7 [taillabel="0..*", label="", headlabel="0..1 chairperson", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; - // Department has Instructor - c5 -> c7 [taillabel="1..*", label="AssignedTo", headlabel="1..*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none, arrowtail=ediamond]; + c102 [label=<
Department
name : Name
addInstructor()
removeInstructor()
getInstructor()
getAllInstructors()
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // Student - c4 [label="{Student\n|name : Name\lstudentID : Number\l|}", fontname="Helvetica", fontcolor="black", fontsize=10.0]; - // Student assoc Course - c4 -> c6 [taillabel="*", label="Attends", headlabel="*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; + c103 [label=<
Student
name : Name
studentID : Number
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // Course - c6 [label="{Course\n|name : Name\lcourseID : Number\l|}", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c104 [label=<
Course
name : Name
courseID : Number
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // Instructor - c7 [label="{Instructor\n|name : Name\l|}", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + 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 - c7 -> c6 [taillabel="1..*", label="Teaches", headlabel="*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=none]; + c105:p -> c104: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 ef7855e..5df70f6 100644 --- a/testdata/dot-ref/strip.dot +++ b/testdata/dot-ref/strip.dot @@ -6,10 +6,10 @@ digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; - node [fontname="Helvetica",fontsize=10,shape=record]; + node [fontname="Helvetica",fontsize=10,shape=plaintext]; // Java5 - c1 [label="{Java5\n|~ state : Java5.States\l+ specifiedPackages : Set\\l|+ printAll(args : String[])\l}", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c107 [label=<
Java5
~ state : Java5.States
+ specifiedPackages : Set<String>
+ printAll(args : String[])
>, fontname="Helvetica", fontcolor="black", fontsize=10.0]; // Java5.States - c2 [label="{«enumeration» \nStates\n|start\ldash\lcolon\lspace\lopen\lw\lclose\l|}", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c108 [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 06fedae..7c73e62 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 $Id$ +# Generated by UmlGraph version 4.1 (http://www.spinellis.gr/sw/umlgraph) # digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; - node [fontname="Helvetica",fontsize=10,shape=record]; + node [fontname="Helvetica",fontsize=10,shape=plaintext]; // Toolbar - c2 [label="{Toolbar\n|# currentSelection : Tool\l# toolCount : Integer\l|+ pickItem(i : Integer)\l+ addTool(t : Tool)\l+ removeTool(i : Integer)\l+ getTool() : Tool\l# checkOrphans()\l- compact()\l}", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + 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]; }