diff --git a/src/main/java/org/umlgraph/doclet/ClassGraph.java b/src/main/java/org/umlgraph/doclet/ClassGraph.java index fe2e21e..249a923 100644 --- a/src/main/java/org/umlgraph/doclet/ClassGraph.java +++ b/src/main/java/org/umlgraph/doclet/ClassGraph.java @@ -82,7 +82,7 @@ class ClassGraph { protected Map classnames = new HashMap(); protected Set rootClasses; - protected Map rootClassdocs = new HashMap(); + protected Map rootClassdocs = new HashMap(); protected OptionProvider optionProvider; protected PrintWriter w; protected ClassDoc collectionClassDoc; @@ -200,7 +200,7 @@ class ClassGraph { private String typeParameters(Options opt, ParameterizedType t) { if (t == null) return ""; - StringBuffer tp = new StringBuffer(1000).append("<"); + StringBuilder tp = new StringBuilder(1000).append("<"); Type args[] = t.typeArguments(); for (int i = 0; i < args.length; i++) { tp.append(type(opt, args[i], true)); @@ -439,7 +439,7 @@ class ClassGraph { if (ecs.length == 0) { tableLine(Align.LEFT, ""); } else { - for (FieldDoc fd : c.enumConstants()) { + for (FieldDoc fd : ecs) { tableLine(Align.LEFT, fd.name()); } } @@ -673,7 +673,8 @@ class ClassGraph { } } - /** Returns an array representing the imported classes of c. + /** + * Returns an array representing the imported classes of c. * Disables the deprecation warning, which is output, because the * imported classed are an implementation detail. */ @@ -848,8 +849,10 @@ class ClassGraph { .append(".html").toString(); } - /** Dot prologue - * @throws IOException */ + /** + * Dot prologue + * @throws IOException + */ public void prologue() throws IOException { Options opt = optionProvider.getGlobalOptions(); OutputStream os; diff --git a/src/main/java/org/umlgraph/doclet/ClassInfo.java b/src/main/java/org/umlgraph/doclet/ClassInfo.java index f498210..34480c5 100644 --- a/src/main/java/org/umlgraph/doclet/ClassInfo.java +++ b/src/main/java/org/umlgraph/doclet/ClassInfo.java @@ -66,7 +66,5 @@ class ClassInfo { public static void reset() { classNumber = 0; } - - } diff --git a/src/main/java/org/umlgraph/doclet/ContextMatcher.java b/src/main/java/org/umlgraph/doclet/ContextMatcher.java index cc59d00..cfa4ed3 100644 --- a/src/main/java/org/umlgraph/doclet/ContextMatcher.java +++ b/src/main/java/org/umlgraph/doclet/ContextMatcher.java @@ -192,5 +192,4 @@ public class ContextMatcher implements ClassMatcher { } } - } diff --git a/src/main/java/org/umlgraph/doclet/ContextView.java b/src/main/java/org/umlgraph/doclet/ContextView.java index 040725e..9adb5fc 100755 --- a/src/main/java/org/umlgraph/doclet/ContextView.java +++ b/src/main/java/org/umlgraph/doclet/ContextView.java @@ -116,5 +116,4 @@ public class ContextView implements OptionProvider { if (!(matcher.matches(className) || opt.matchesIncludeExpression(className))) opt.setOption(HIDE_OPTIONS); } - } diff --git a/src/main/java/org/umlgraph/doclet/InterfaceMatcher.java b/src/main/java/org/umlgraph/doclet/InterfaceMatcher.java index 6c63b98..2f87370 100644 --- a/src/main/java/org/umlgraph/doclet/InterfaceMatcher.java +++ b/src/main/java/org/umlgraph/doclet/InterfaceMatcher.java @@ -38,5 +38,4 @@ public class InterfaceMatcher implements ClassMatcher { ClassDoc cd = root.classNamed(name); return cd == null ? false : matches(cd); } - } diff --git a/src/main/java/org/umlgraph/doclet/Options.java b/src/main/java/org/umlgraph/doclet/Options.java index 90b7542..836432e 100644 --- a/src/main/java/org/umlgraph/doclet/Options.java +++ b/src/main/java/org/umlgraph/doclet/Options.java @@ -130,7 +130,7 @@ public class Options implements Cloneable, OptionProvider { } @Override - public Object clone() { + public Object clone() { Options clone = null; try { clone = (Options) super.clone(); @@ -680,5 +680,4 @@ public class Options implements Cloneable, OptionProvider { } return sb.toString(); } - } diff --git a/src/main/java/org/umlgraph/doclet/PackageMatcher.java b/src/main/java/org/umlgraph/doclet/PackageMatcher.java index 99bd7ff..be1183f 100644 --- a/src/main/java/org/umlgraph/doclet/PackageMatcher.java +++ b/src/main/java/org/umlgraph/doclet/PackageMatcher.java @@ -7,7 +7,6 @@ public class PackageMatcher implements ClassMatcher { protected PackageDoc packageDoc; public PackageMatcher(PackageDoc packageDoc) { - super(); this.packageDoc = packageDoc; } @@ -21,5 +20,4 @@ public class PackageMatcher implements ClassMatcher { return true; return false; } - } diff --git a/src/main/java/org/umlgraph/doclet/PackageView.java b/src/main/java/org/umlgraph/doclet/PackageView.java index c66bf6d..1547ebb 100755 --- a/src/main/java/org/umlgraph/doclet/PackageView.java +++ b/src/main/java/org/umlgraph/doclet/PackageView.java @@ -77,5 +77,4 @@ public class PackageView implements OptionProvider { if (!included || this.opt.matchesHideExpression(className)) opt.setOption(HIDE); } - } diff --git a/src/main/java/org/umlgraph/doclet/PatternMatcher.java b/src/main/java/org/umlgraph/doclet/PatternMatcher.java index 78a9135..59c2d47 100644 --- a/src/main/java/org/umlgraph/doclet/PatternMatcher.java +++ b/src/main/java/org/umlgraph/doclet/PatternMatcher.java @@ -14,6 +14,7 @@ * * */ + package org.umlgraph.doclet; import java.util.regex.Pattern; @@ -39,5 +40,4 @@ public class PatternMatcher implements ClassMatcher { public boolean matches(String name) { return pattern.matcher(name).matches(); } - } diff --git a/src/main/java/org/umlgraph/doclet/RelationDirection.java b/src/main/java/org/umlgraph/doclet/RelationDirection.java index 4d3595c..39dab31 100644 --- a/src/main/java/org/umlgraph/doclet/RelationDirection.java +++ b/src/main/java/org/umlgraph/doclet/RelationDirection.java @@ -36,5 +36,4 @@ public enum RelationDirection { public RelationDirection inverse() { return this == IN ? OUT : this == OUT ? IN : this; } - -}; +} diff --git a/src/main/java/org/umlgraph/doclet/RelationPattern.java b/src/main/java/org/umlgraph/doclet/RelationPattern.java index 4fa994e..0de0490 100644 --- a/src/main/java/org/umlgraph/doclet/RelationPattern.java +++ b/src/main/java/org/umlgraph/doclet/RelationPattern.java @@ -46,5 +46,4 @@ public class RelationPattern { } return false; } - } diff --git a/src/main/java/org/umlgraph/doclet/SubclassMatcher.java b/src/main/java/org/umlgraph/doclet/SubclassMatcher.java index 999b823..c96a500 100644 --- a/src/main/java/org/umlgraph/doclet/SubclassMatcher.java +++ b/src/main/java/org/umlgraph/doclet/SubclassMatcher.java @@ -32,5 +32,4 @@ public class SubclassMatcher implements ClassMatcher { ClassDoc cd = root.classNamed(name); return cd == null ? false : matches(cd); } - } diff --git a/src/main/java/org/umlgraph/doclet/UmlGraphDoc.java b/src/main/java/org/umlgraph/doclet/UmlGraphDoc.java index dca406f..46d0d22 100644 --- a/src/main/java/org/umlgraph/doclet/UmlGraphDoc.java +++ b/src/main/java/org/umlgraph/doclet/UmlGraphDoc.java @@ -138,12 +138,12 @@ public class UmlGraphDoc { dotExecutable = "dot"; } File dotFile = new File(outputFolder, packageName.replace(".", "/") + "/" + name + ".dot"); - File svgFile = new File(outputFolder, packageName.replace(".", "/") + "/" + name + ".svg"); + File svgFile = new File(outputFolder, packageName.replace(".", "/") + "/" + name + ".svg"); try { Process p = Runtime.getRuntime().exec(new String [] { dotExecutable, - "-Tsvg", + "-Tsvg", "-o", svgFile.getAbsolutePath(), dotFile.getAbsolutePath() diff --git a/src/main/java/org/umlgraph/doclet/Version.java b/src/main/java/org/umlgraph/doclet/Version.java index 03f857d..4508ec7 100644 --- a/src/main/java/org/umlgraph/doclet/Version.java +++ b/src/main/java/org/umlgraph/doclet/Version.java @@ -1,4 +1,4 @@ /* Automatically generated file */ package org.umlgraph.doclet; -class Version { public static String VERSION = "R5_7_2-60-g0e99a6";} +class Version { public static String VERSION = "281411";} \ No newline at end of file diff --git a/src/main/java/org/umlgraph/doclet/View.java b/src/main/java/org/umlgraph/doclet/View.java index 8659a1c..da087cc 100644 --- a/src/main/java/org/umlgraph/doclet/View.java +++ b/src/main/java/org/umlgraph/doclet/View.java @@ -14,6 +14,7 @@ * * */ + package org.umlgraph.doclet; import java.util.ArrayList; @@ -169,5 +170,4 @@ public class View implements OptionProvider { public String getDisplayName() { return "view " + viewDoc.name(); } - } diff --git a/src/main/java/org/umlgraph/doclet/Visibility.java b/src/main/java/org/umlgraph/doclet/Visibility.java index 408a551..87c4134 100644 --- a/src/main/java/org/umlgraph/doclet/Visibility.java +++ b/src/main/java/org/umlgraph/doclet/Visibility.java @@ -16,6 +16,7 @@ * * */ + package org.umlgraph.doclet; import com.sun.javadoc.ProgramElementDoc; diff --git a/src/test/java/org/umlgraph/test/BasicTest.java b/src/test/java/org/umlgraph/test/BasicTest.java index 28f1cad..b989a6d 100644 --- a/src/test/java/org/umlgraph/test/BasicTest.java +++ b/src/test/java/org/umlgraph/test/BasicTest.java @@ -58,13 +58,13 @@ public class BasicTest { for (String className : differences) { pw.println(className); } + System.exit(1); } else { pw.println("GOOD, all files are structurally equal"); } pw.println(); pw.println(); pw.flush(); - System.exit(differences.size() > 0 ? 1 : 0); } private static void performViewTests(List differences, File outFolder) @@ -98,7 +98,7 @@ public class BasicTest { private static List getViewList(File viewFolder) { if (!viewFolder.exists()) throw new RuntimeException("The folder " + viewFolder.getAbsolutePath() - + " does not exists."); + + " does not exist."); else if (!viewFolder.isDirectory()) throw new RuntimeException(viewFolder.getAbsolutePath() + " is not a folder!."); else if (!viewFolder.canRead()) @@ -145,5 +145,4 @@ public class BasicTest { differences.add(dotFile.getName() + " is different from the reference"); } } - } diff --git a/src/test/java/org/umlgraph/test/DotDiff.java b/src/test/java/org/umlgraph/test/DotDiff.java index 266981a..420c32a 100644 --- a/src/test/java/org/umlgraph/test/DotDiff.java +++ b/src/test/java/org/umlgraph/test/DotDiff.java @@ -304,5 +304,4 @@ public class DotDiff { return "Arc: " + from.label + " -> " + to.label + "; " + line; } } - } diff --git a/src/test/java/org/umlgraph/test/RunDoc.java b/src/test/java/org/umlgraph/test/RunDoc.java index 3a7f525..6261d9c 100644 --- a/src/test/java/org/umlgraph/test/RunDoc.java +++ b/src/test/java/org/umlgraph/test/RunDoc.java @@ -43,5 +43,4 @@ public class RunDoc { com.sun.tools.javadoc.Main.execute("UMLGraph test", pw, pw, pw, "org.umlgraph.doclet.UmlGraphDoc", options); } - } diff --git a/src/test/java/org/umlgraph/test/RunOne.java b/src/test/java/org/umlgraph/test/RunOne.java index e2f7b8c..0fb55da 100644 --- a/src/test/java/org/umlgraph/test/RunOne.java +++ b/src/test/java/org/umlgraph/test/RunOne.java @@ -55,6 +55,4 @@ public class RunOne { private static void runDoclet(String[] options) { com.sun.tools.javadoc.Main.execute("UMLGraph test", pw, pw, pw, "org.umlgraph.doclet.UmlGraph", options); } - - } diff --git a/src/test/java/org/umlgraph/test/SimpleFileFilter.java b/src/test/java/org/umlgraph/test/SimpleFileFilter.java index 9c3b123..c45db53 100644 --- a/src/test/java/org/umlgraph/test/SimpleFileFilter.java +++ b/src/test/java/org/umlgraph/test/SimpleFileFilter.java @@ -16,6 +16,7 @@ * * */ + package org.umlgraph.test; import java.io.File; @@ -31,4 +32,4 @@ class SimpleFileFilter implements FilenameFilter { public boolean accept(File dir, String name) { return name.endsWith(extension); } -} \ No newline at end of file +} diff --git a/src/test/java/org/umlgraph/test/TestUtils.java b/src/test/java/org/umlgraph/test/TestUtils.java index 9b1341f..b59ce72 100644 --- a/src/test/java/org/umlgraph/test/TestUtils.java +++ b/src/test/java/org/umlgraph/test/TestUtils.java @@ -34,10 +34,10 @@ import java.util.List; public class TestUtils { /** - * Simple text file diffing: will tell you if two text files are line by - * line equals, and will stop at the first difference found. - * @throws IOException - */ + * Simple text file diffing: will tell you if two text files are line by + * line equals, and will stop at the first difference found. + * @throws IOException + */ public static boolean textFilesEquals(PrintWriter pw, File refTextFile, File outTextFile) throws IOException { BufferedReader refReader = null, outReader = null; @@ -123,23 +123,20 @@ public class TestUtils { } /** - * Deletes the content of the folder, eventually in a recursive way (but - * avoids deleting eventual .cvsignore files and CVS folders) - */ + * Deletes the content of the folder, eventually in a recursive way + */ public static void cleanFolder(File folder, boolean recurse) { for (File f : folder.listFiles()) { - if (f.isDirectory() && !f.getName().equals("CVS")) { + if (f.isDirectory()) { if (recurse) { cleanFolder(f, true); if (f.list().length == 0) f.delete(); } - } else if (!f.getName().equals(".cvsignore")) { + } else { f.delete(); } } - } - } diff --git a/src/test/java/org/umlgraph/test/UmlDocTest.java b/src/test/java/org/umlgraph/test/UmlDocTest.java index d470b4f..ac6ab12 100644 --- a/src/test/java/org/umlgraph/test/UmlDocTest.java +++ b/src/test/java/org/umlgraph/test/UmlDocTest.java @@ -16,6 +16,7 @@ * * */ + package org.umlgraph.test; import java.io.File; @@ -78,24 +79,21 @@ public class UmlDocTest { } /** - * Ensures that reference and output have the same contents in terms of: - *
    - *
  • html files
    • - *
  • dot files
    • - *
  • folders
    • - *
- * @throws IOException - */ + * Ensures that reference and output have the same contents in terms of: + *
    + *
  • html files
    • + *
  • dot files
    • + *
  • folders
    • + *
+ * @throws IOException + */ private static void compareDocletOutputs(List differences, File refFolder, File outFolder) throws IOException { - if(refFolder.getName().equals("CVS")) - return; - if (!refFolder.exists() || !refFolder.isDirectory()) - throw new IllegalArgumentException("Reference does not exists or is not a folder: " + throw new IllegalArgumentException("Reference does not exist or is not a folder: " + refFolder.getAbsolutePath()); if (!outFolder.exists() || !outFolder.isDirectory()) - throw new IllegalArgumentException("Output does not exists or is not a folder: " + throw new IllegalArgumentException("Output does not exist or is not a folder: " + outFolder.getAbsolutePath()); // get elements and sort @@ -142,17 +140,15 @@ public class UmlDocTest { } /** - * Runs the UmlGraphDoc doclet - * @param options - */ + * Runs the UmlGraphDoc doclet + * @param options + */ private static void runDoclet(String[] options) { pw.print("Run javadoc -doclet " + doclet); for (String o : options) - pw.print(" " + o); + pw.print(o + " "); pw.println(); com.sun.tools.javadoc.Main.execute("UMLDoc test", pw, pw, pw, doclet, options); - System.exit(0); } - } diff --git a/testdata/dot-ref/Abstr.dot b/testdata/dot-ref/Abstr.dot index 1528241..1b33e08 100644 --- a/testdata/dot-ref/Abstr.dot +++ b/testdata/dot-ref/Abstr.dot @@ -1,26 +1,26 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UMLGraph version R5_6-9-g37cd34 (http://www.umlgraph.org/) +# Generated by UMLGraph version 281411 (http://www.spinellis.gr/umlgraph/) # digraph G { graph [fontnames="svg"] edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10,color="black"]; -node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; -nodesep=0.25; -ranksep=0.5; -// test.AbstractNode -c1 [label=<
AbstractNode
abstractMethod()
concreteMethod()
>]; -// test.InnerNode -c2 [label=<
InnerNode
>]; -// test.Leaf -c3 [label=<
Leaf
>]; +node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; +nodesep=0.25; +ranksep=0.5; +// test.AbstractNode +c106 [label=<
AbstractNode
abstractMethod()
concreteMethod()
>]; +// test.InnerNode +c107 [label=<
InnerNode
>]; +// test.Leaf +c108 [label=<
Leaf
>]; // test.InnerNode extends test.AbstractNode -c1 -> c2 [arrowtail=empty,dir=back,weight=10]; -// test.InnerNode composed test.AbstractNode -c2 -> c1 [arrowhead=none,arrowtail=diamond,dir=back,weight=6,taillabel="1", label="has", headlabel="*"]; +c106 -> c107 [arrowtail=empty,dir=back,weight=10]; +// test.InnerNode composed test.AbstractNode +c107 -> c106 [arrowhead=none,arrowtail=diamond,dir=back,weight=6,taillabel="1",label="has",headlabel="*"]; // test.Leaf extends test.AbstractNode -c1 -> c3 [arrowtail=empty,dir=back,weight=10]; +c106 -> c108 [arrowtail=empty,dir=back,weight=10]; } - + diff --git a/testdata/dot-ref/Inference.dot b/testdata/dot-ref/Inference.dot index 64737cf..97b9e49 100644 --- a/testdata/dot-ref/Inference.dot +++ b/testdata/dot-ref/Inference.dot @@ -1,50 +1,50 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UMLGraph version R5_7_2-10-g442559 (http://www.umlgraph.org/) +# Generated by UMLGraph version 281411 (http://www.spinellis.gr/umlgraph/) # digraph G { graph [fontnames="svg"] edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10,color="black"]; -node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; -nodesep=0.25; -ranksep=0.5; -// A -c66 [label=<
A
first : B
second : B
third : C
>]; -// B -c67 [label=<
B
doSomething(b : B, c : C) : A
>]; -// C -c68 [label=<
C
collectionOfA : List<A>
collectionOfB : ArrayList<B>
mapOfD : Map<String, D>
childs : C[]
anOpaqueList : List<>
>]; -// MyFunnyList -c69 [label=<
MyFunnyList<T, V>
myField : V
>]; -// MyList -c70 [label=<
MyList
>]; -// D -c71 [label=<
D
anotherListOfA : MyList
>]; -// MyFunnyList extends java.util.ArrayList -c72 -> c69 [arrowtail=empty,dir=back,weight=10]; -// MyList extends MyFunnyList -c69 -> c70 [arrowtail=empty,dir=back,weight=10]; -// A has B -c66 -> c67 [arrowhead=none,arrowtail=ediamond,dir=back,weight=4]; -// A has C -c66 -> c68 [arrowhead=none,arrowtail=ediamond,dir=back,weight=4]; -// C navassoc B -c68 -> c67 [arrowhead=open,weight=1,headlabel="*"]; -// C navassoc D -c68 -> c71 [arrowhead=open,weight=1,headlabel="*"]; -// C navassoc C -c68 -> c68 [arrowhead=open,weight=1,headlabel="*"]; -// C navassoc java.util.List -c68 -> c73 [arrowhead=open,weight=1]; -// D navassoc MyList -c71 -> c70 [arrowhead=open,weight=1]; -// B depend A -c67 -> c66 [arrowhead=open,style=dashed,weight=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
replaceAll(arg0 : UnaryOperator<E>)
sort(arg0 : Comparator<?>)
clear()
equals(arg0 : Object) : boolean
hashCode() : int
get(arg0 : int) : E
set(arg0 : int, arg1 : E) : E
add(arg0 : int, arg1 : E)
remove(arg0 : int) : E
indexOf(arg0 : Object) : int
lastIndexOf(arg0 : Object) : int
listIterator() : ListIterator<E>
listIterator(arg0 : int) : ListIterator<E>
subList(arg0 : int, arg1 : int) : List<E>
spliterator() : Spliterator<E>
>, URL="http://docs.oracle.com/javase/7/docs/api/java/util/List.html"]; -// java.util.ArrayList -c72 [label=<
ArrayList<E>
serialVersionUID : long
DEFAULT_CAPACITY : int
EMPTY_ELEMENTDATA : Object[]
DEFAULTCAPACITY_EMPTY_ELEMENTDATA : Object[]
elementData : Object[]
size : int
MAX_ARRAY_SIZE : int
trimToSize()
ensureCapacity(arg0 : int)
ensureCapacityInternal(arg0 : int)
ensureExplicitCapacity(arg0 : int)
grow(arg0 : int)
hugeCapacity(arg0 : int) : int
size() : int
isEmpty() : boolean
contains(arg0 : Object) : boolean
indexOf(arg0 : Object) : int
lastIndexOf(arg0 : Object) : int
clone() : Object
toArray() : Object[]
toArray(arg0 : T[]) : T[]
elementData(arg0 : int) : E
get(arg0 : int) : E
set(arg0 : int, arg1 : E) : E
add(arg0 : E) : boolean
add(arg0 : int, arg1 : E)
remove(arg0 : int) : E
remove(arg0 : Object) : boolean
fastRemove(arg0 : int)
clear()
addAll(arg0 : Collection<?>) : boolean
addAll(arg0 : int, arg1 : Collection<?>) : boolean
removeRange(arg0 : int, arg1 : int)
rangeCheck(arg0 : int)
rangeCheckForAdd(arg0 : int)
outOfBoundsMsg(arg0 : int) : String
removeAll(arg0 : Collection<?>) : boolean
retainAll(arg0 : Collection<?>) : boolean
batchRemove(arg0 : Collection<?>, arg1 : boolean) : boolean
writeObject(arg0 : ObjectOutputStream)
readObject(arg0 : ObjectInputStream)
listIterator(arg0 : int) : ListIterator<E>
listIterator() : ListIterator<E>
iterator() : Iterator<E>
subList(arg0 : int, arg1 : int) : List<E>
subListRangeCheck(arg0 : int, arg1 : int, arg2 : int)
forEach(arg0 : Consumer<?>)
spliterator() : Spliterator<E>
removeIf(arg0 : Predicate<?>) : boolean
replaceAll(arg0 : UnaryOperator<E>)
sort(arg0 : Comparator<?>)
>, URL="http://docs.oracle.com/javase/7/docs/api/java/util/ArrayList.html"]; +node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; +nodesep=0.25; +ranksep=0.5; +// A +c97 [label=<
A
first : B
second : B
third : C
>]; +// B +c98 [label=<
B
doSomething(b : B, c : C) : A
>]; +// C +c99 [label=<
C
collectionOfA : List<A>
collectionOfB : ArrayList<B>
mapOfD : Map<String, D>
childs : C[]
anOpaqueList : List<>
>]; +// MyFunnyList +c100 [label=<
MyFunnyList<T, V>
myField : V
>]; +// MyList +c101 [label=<
MyList
>]; +// D +c102 [label=<
D
anotherListOfA : MyList
>]; +// MyFunnyList extends java.util.ArrayList +c103 -> c100 [arrowtail=empty,dir=back,weight=10]; +// MyList extends MyFunnyList +c100 -> c101 [arrowtail=empty,dir=back,weight=10]; +// A has B +c97 -> c98 [arrowhead=none,arrowtail=ediamond,dir=back,weight=4]; +// A has C +c97 -> c99 [arrowhead=none,arrowtail=ediamond,dir=back,weight=4]; +// C navassoc B +c99 -> c98 [arrowhead=open,weight=1,headlabel="*"]; +// C navassoc D +c99 -> c102 [arrowhead=open,weight=1,headlabel="*"]; +// C navassoc C +c99 -> c99 [arrowhead=open,weight=1,headlabel="*"]; +// C navassoc java.util.List +c99 -> c104 [arrowhead=open,weight=1]; +// D navassoc MyList +c102 -> c101 [arrowhead=open,weight=1]; +// B depend A +c98 -> c97 [arrowhead=open,style=dashed,weight=0]; +// java.util.List +c104 [label=<
«interface»
List<E>
size() : int
isEmpty() : boolean
contains(arg0 : Object) : boolean
iterator() : Iterator<E>
toArray() : Object[]
toArray(arg0 : T[]) : T[]
add(arg0 : E) : boolean
remove(arg0 : Object) : boolean
containsAll(arg0 : Collection<?>) : boolean
addAll(arg0 : Collection<?>) : boolean
addAll(arg0 : int, arg1 : Collection<?>) : boolean
removeAll(arg0 : Collection<?>) : boolean
retainAll(arg0 : Collection<?>) : boolean
replaceAll(arg0 : UnaryOperator<E>)
sort(arg0 : Comparator<?>)
clear()
equals(arg0 : Object) : boolean
hashCode() : int
get(arg0 : int) : E
set(arg0 : int, arg1 : E) : E
add(arg0 : int, arg1 : E)
remove(arg0 : int) : E
indexOf(arg0 : Object) : int
lastIndexOf(arg0 : Object) : int
listIterator() : ListIterator<E>
listIterator(arg0 : int) : ListIterator<E>
subList(arg0 : int, arg1 : int) : List<E>
spliterator() : Spliterator<E>
>, URL="http://docs.oracle.com/javase/7/docs/api/java/util/List.html"]; +// java.util.ArrayList +c103 [label=<
ArrayList<E>
serialVersionUID : long
DEFAULT_CAPACITY : int
EMPTY_ELEMENTDATA : Object[]
DEFAULTCAPACITY_EMPTY_ELEMENTDATA : Object[]
elementData : Object[]
size : int
MAX_ARRAY_SIZE : int
trimToSize()
ensureCapacity(arg0 : int)
calculateCapacity(arg0 : Object[], arg1 : int) : int
ensureCapacityInternal(arg0 : int)
ensureExplicitCapacity(arg0 : int)
grow(arg0 : int)
hugeCapacity(arg0 : int) : int
size() : int
isEmpty() : boolean
contains(arg0 : Object) : boolean
indexOf(arg0 : Object) : int
lastIndexOf(arg0 : Object) : int
clone() : Object
toArray() : Object[]
toArray(arg0 : T[]) : T[]
elementData(arg0 : int) : E
get(arg0 : int) : E
set(arg0 : int, arg1 : E) : E
add(arg0 : E) : boolean
add(arg0 : int, arg1 : E)
remove(arg0 : int) : E
remove(arg0 : Object) : boolean
fastRemove(arg0 : int)
clear()
addAll(arg0 : Collection<?>) : boolean
addAll(arg0 : int, arg1 : Collection<?>) : boolean
removeRange(arg0 : int, arg1 : int)
rangeCheck(arg0 : int)
rangeCheckForAdd(arg0 : int)
outOfBoundsMsg(arg0 : int) : String
removeAll(arg0 : Collection<?>) : boolean
retainAll(arg0 : Collection<?>) : boolean
batchRemove(arg0 : Collection<?>, arg1 : boolean) : boolean
writeObject(arg0 : ObjectOutputStream)
readObject(arg0 : ObjectInputStream)
listIterator(arg0 : int) : ListIterator<E>
listIterator() : ListIterator<E>
iterator() : Iterator<E>
subList(arg0 : int, arg1 : int) : List<E>
subListRangeCheck(arg0 : int, arg1 : int, arg2 : int)
forEach(arg0 : Consumer<?>)
spliterator() : Spliterator<E>
removeIf(arg0 : Predicate<?>) : boolean
replaceAll(arg0 : UnaryOperator<E>)
sort(arg0 : Comparator<?>)
>, URL="http://docs.oracle.com/javase/7/docs/api/java/util/ArrayList.html"]; } - + diff --git a/testdata/dot-ref/Irp.dot b/testdata/dot-ref/Irp.dot index 58bd3d1..61bbece 100644 --- a/testdata/dot-ref/Irp.dot +++ b/testdata/dot-ref/Irp.dot @@ -1,24 +1,24 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UMLGraph version R5_6-9-g37cd34 (http://www.umlgraph.org/) +# Generated by UMLGraph version 281411 (http://www.spinellis.gr/umlgraph/) # digraph G { graph [fontnames="svg"] edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10,color="black"]; -node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; -nodesep=0.25; -ranksep=0.5; -// Application -c74 [label=<
Application
>]; -// IrpApplication -c75 [label=<
IrpApplication
>]; -// Main -c76 [label=<
Main
>]; +node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; +nodesep=0.25; +ranksep=0.5; +// Application +c116 [label=<
Application
>]; +// IrpApplication +c117 [label=<
IrpApplication
>]; +// Main +c118 [label=<
Main
>]; // IrpApplication extends Application -c74 -> c75 [arrowtail=empty,dir=back,weight=10]; -// Main depend IrpApplication -c76 -> c75 [arrowhead=open,style=dashed,weight=0,label="«friend»"]; +c116 -> c117 [arrowtail=empty,dir=back,weight=10]; +// Main depend IrpApplication +c118 -> c117 [arrowhead=open,style=dashed,weight=0,label="«friend»"]; } - + diff --git a/testdata/dot-ref/MultiAssoc.dot b/testdata/dot-ref/MultiAssoc.dot index a2841c0..62d0463 100644 --- a/testdata/dot-ref/MultiAssoc.dot +++ b/testdata/dot-ref/MultiAssoc.dot @@ -1,20 +1,20 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UMLGraph version R5_6-9-g37cd34 (http://www.umlgraph.org/) +# Generated by UMLGraph version 281411 (http://www.spinellis.gr/umlgraph/) # digraph G { graph [fontnames="svg"] edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10,color="black"]; -node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; -nodesep=0.25; -ranksep=0.5; -// A -c81 [label=<
A
>]; -// C -c83 [label=<
C
>]; -// A depend C -c81 -> c83 [arrowhead=open,style=dashed,weight=0]; +node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; +nodesep=0.25; +ranksep=0.5; +// A +c26 [label=<
A
>]; +// C +c28 [label=<
C
>]; +// A depend C +c26 -> c28 [arrowhead=open,style=dashed,weight=0]; } - + diff --git a/testdata/dot-ref/MyVector.dot b/testdata/dot-ref/MyVector.dot index 47aaf55..47381a4 100644 --- a/testdata/dot-ref/MyVector.dot +++ b/testdata/dot-ref/MyVector.dot @@ -1,32 +1,32 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UMLGraph version R5_7_2-10-g442559 (http://www.umlgraph.org/) +# Generated by UMLGraph version 281411 (http://www.spinellis.gr/umlgraph/) # digraph G { graph [fontnames="svg"] edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10,color="black"]; -node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; -nodesep=0.25; -ranksep=0.5; -// MyVector -c85 [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
>]; +node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; +nodesep=0.25; +ranksep=0.5; +// MyVector +c42 [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
>]; // MyVector extends java.util.Vector -c86 -> c85 [arrowtail=empty,dir=back,weight=10]; +c43 -> c42 [arrowtail=empty,dir=back,weight=10]; // MyVector implements java.util.List -c87 -> c85 [arrowtail=empty,style=dashed,dir=back,weight=9]; +c44 -> c42 [arrowtail=empty,style=dashed,dir=back,weight=9]; // MyVector implements java.util.RandomAccess -c88 -> c85 [arrowtail=empty,style=dashed,dir=back,weight=9]; +c45 -> c42 [arrowtail=empty,style=dashed,dir=back,weight=9]; // MyVector implements java.lang.Cloneable -c89 -> c85 [arrowtail=empty,style=dashed,dir=back,weight=9]; -// java.util.RandomAccess -c88 [label=<
«interface»
RandomAccess
>, URL="http://docs.oracle.com/javase/7/docs/api/java/util/RandomAccess.html"]; -// java.util.List -c87 [label=<
«interface»
List<E>
+ size() : int
+ isEmpty() : boolean
+ contains(arg0 : Object) : boolean
+ iterator() : Iterator<E>
+ toArray() : Object[]
+ toArray(arg0 : T[]) : T[]
+ add(arg0 : E) : boolean
+ remove(arg0 : Object) : boolean
+ containsAll(arg0 : Collection<?>) : boolean
+ addAll(arg0 : Collection<?>) : boolean
+ addAll(arg0 : int, arg1 : Collection<?>) : boolean
+ removeAll(arg0 : Collection<?>) : boolean
+ retainAll(arg0 : Collection<?>) : boolean
+ replaceAll(arg0 : UnaryOperator<E>)
+ sort(arg0 : Comparator<?>)
+ clear()
+ equals(arg0 : Object) : boolean
+ hashCode() : int
+ get(arg0 : int) : E
+ set(arg0 : int, arg1 : E) : E
+ add(arg0 : int, arg1 : E)
+ remove(arg0 : int) : E
+ indexOf(arg0 : Object) : int
+ lastIndexOf(arg0 : Object) : int
+ listIterator() : ListIterator<E>
+ listIterator(arg0 : int) : ListIterator<E>
+ subList(arg0 : int, arg1 : int) : List<E>
+ spliterator() : Spliterator<E>
>, URL="http://docs.oracle.com/javase/7/docs/api/java/util/List.html"]; -// java.lang.Cloneable -c89 [label=<
«interface»
Cloneable
>, URL="http://docs.oracle.com/javase/7/docs/api/java/lang/Cloneable.html"]; -// java.util.Vector -c86 [label=<
Vector<E>
# elementData : Object[]
# elementCount : int
# capacityIncrement : int
- serialVersionUID : long
- MAX_ARRAY_SIZE : int
+ copyInto(arg0 : Object[])
+ trimToSize()
+ ensureCapacity(arg0 : int)
- ensureCapacityHelper(arg0 : int)
- grow(arg0 : int)
- hugeCapacity(arg0 : int) : int
+ setSize(arg0 : int)
+ capacity() : int
+ size() : int
+ isEmpty() : boolean
+ elements() : Enumeration<E>
+ contains(arg0 : Object) : boolean
+ indexOf(arg0 : Object) : int
+ indexOf(arg0 : Object, arg1 : int) : int
+ lastIndexOf(arg0 : Object) : int
+ lastIndexOf(arg0 : Object, arg1 : int) : int
+ elementAt(arg0 : int) : E
+ firstElement() : E
+ lastElement() : E
+ setElementAt(arg0 : E, arg1 : int)
+ removeElementAt(arg0 : int)
+ insertElementAt(arg0 : E, arg1 : int)
+ addElement(arg0 : E)
+ removeElement(arg0 : Object) : boolean
+ removeAllElements()
+ clone() : Object
+ toArray() : Object[]
+ toArray(arg0 : T[]) : T[]
~ elementData(arg0 : int) : E
+ get(arg0 : int) : E
+ set(arg0 : int, arg1 : E) : E
+ add(arg0 : E) : boolean
+ remove(arg0 : Object) : boolean
+ add(arg0 : int, arg1 : E)
+ remove(arg0 : int) : E
+ clear()
+ containsAll(arg0 : Collection<?>) : boolean
+ addAll(arg0 : Collection<?>) : boolean
+ removeAll(arg0 : Collection<?>) : boolean
+ retainAll(arg0 : Collection<?>) : boolean
+ addAll(arg0 : int, arg1 : Collection<?>) : boolean
+ equals(arg0 : Object) : boolean
+ hashCode() : int
+ toString() : String
+ subList(arg0 : int, arg1 : int) : List<E>
# removeRange(arg0 : int, arg1 : int)
- writeObject(arg0 : ObjectOutputStream)
+ listIterator(arg0 : int) : ListIterator<E>
+ listIterator() : ListIterator<E>
+ iterator() : Iterator<E>
+ forEach(arg0 : Consumer<?>)
+ removeIf(arg0 : Predicate<?>) : boolean
+ replaceAll(arg0 : UnaryOperator<E>)
+ sort(arg0 : Comparator<?>)
+ spliterator() : Spliterator<E>
>, URL="http://docs.oracle.com/javase/7/docs/api/java/util/Vector.html"]; +c46 -> c42 [arrowtail=empty,style=dashed,dir=back,weight=9]; +// java.util.RandomAccess +c45 [label=<
«interface»
RandomAccess
>, URL="http://docs.oracle.com/javase/7/docs/api/java/util/RandomAccess.html"]; +// java.util.List +c44 [label=<
«interface»
List<E>
+ size() : int
+ isEmpty() : boolean
+ contains(arg0 : Object) : boolean
+ iterator() : Iterator<E>
+ toArray() : Object[]
+ toArray(arg0 : T[]) : T[]
+ add(arg0 : E) : boolean
+ remove(arg0 : Object) : boolean
+ containsAll(arg0 : Collection<?>) : boolean
+ addAll(arg0 : Collection<?>) : boolean
+ addAll(arg0 : int, arg1 : Collection<?>) : boolean
+ removeAll(arg0 : Collection<?>) : boolean
+ retainAll(arg0 : Collection<?>) : boolean
+ replaceAll(arg0 : UnaryOperator<E>)
+ sort(arg0 : Comparator<?>)
+ clear()
+ equals(arg0 : Object) : boolean
+ hashCode() : int
+ get(arg0 : int) : E
+ set(arg0 : int, arg1 : E) : E
+ add(arg0 : int, arg1 : E)
+ remove(arg0 : int) : E
+ indexOf(arg0 : Object) : int
+ lastIndexOf(arg0 : Object) : int
+ listIterator() : ListIterator<E>
+ listIterator(arg0 : int) : ListIterator<E>
+ subList(arg0 : int, arg1 : int) : List<E>
+ spliterator() : Spliterator<E>
>, URL="http://docs.oracle.com/javase/7/docs/api/java/util/List.html"]; +// java.lang.Cloneable +c46 [label=<
«interface»
Cloneable
>, URL="http://docs.oracle.com/javase/7/docs/api/java/lang/Cloneable.html"]; +// java.util.Vector +c43 [label=<
Vector<E>
# elementData : Object[]
# elementCount : int
# capacityIncrement : int
- serialVersionUID : long
- MAX_ARRAY_SIZE : int
+ copyInto(arg0 : Object[])
+ trimToSize()
+ ensureCapacity(arg0 : int)
- ensureCapacityHelper(arg0 : int)
- grow(arg0 : int)
- hugeCapacity(arg0 : int) : int
+ setSize(arg0 : int)
+ capacity() : int
+ size() : int
+ isEmpty() : boolean
+ elements() : Enumeration<E>
+ contains(arg0 : Object) : boolean
+ indexOf(arg0 : Object) : int
+ indexOf(arg0 : Object, arg1 : int) : int
+ lastIndexOf(arg0 : Object) : int
+ lastIndexOf(arg0 : Object, arg1 : int) : int
+ elementAt(arg0 : int) : E
+ firstElement() : E
+ lastElement() : E
+ setElementAt(arg0 : E, arg1 : int)
+ removeElementAt(arg0 : int)
+ insertElementAt(arg0 : E, arg1 : int)
+ addElement(arg0 : E)
+ removeElement(arg0 : Object) : boolean
+ removeAllElements()
+ clone() : Object
+ toArray() : Object[]
+ toArray(arg0 : T[]) : T[]
~ elementData(arg0 : int) : E
+ get(arg0 : int) : E
+ set(arg0 : int, arg1 : E) : E
+ add(arg0 : E) : boolean
+ remove(arg0 : Object) : boolean
+ add(arg0 : int, arg1 : E)
+ remove(arg0 : int) : E
+ clear()
+ containsAll(arg0 : Collection<?>) : boolean
+ addAll(arg0 : Collection<?>) : boolean
+ removeAll(arg0 : Collection<?>) : boolean
+ retainAll(arg0 : Collection<?>) : boolean
+ addAll(arg0 : int, arg1 : Collection<?>) : boolean
+ equals(arg0 : Object) : boolean
+ hashCode() : int
+ toString() : String
+ subList(arg0 : int, arg1 : int) : List<E>
# removeRange(arg0 : int, arg1 : int)
- readObject(arg0 : ObjectInputStream)
- writeObject(arg0 : ObjectOutputStream)
+ listIterator(arg0 : int) : ListIterator<E>
+ listIterator() : ListIterator<E>
+ iterator() : Iterator<E>
+ forEach(arg0 : Consumer<?>)
+ removeIf(arg0 : Predicate<?>) : boolean
+ replaceAll(arg0 : UnaryOperator<E>)
+ sort(arg0 : Comparator<?>)
+ spliterator() : Spliterator<E>
>, URL="http://docs.oracle.com/javase/7/docs/api/java/util/Vector.html"]; } - + diff --git a/testdata/dot-ref/Root.dot b/testdata/dot-ref/Root.dot index 8379501..c2e3c2c 100644 --- a/testdata/dot-ref/Root.dot +++ b/testdata/dot-ref/Root.dot @@ -1,48 +1,48 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UMLGraph version R5_6-9-g37cd34 (http://www.umlgraph.org/) +# Generated by UMLGraph version 281411 (http://www.spinellis.gr/umlgraph/) # digraph G { graph [fontnames="svg"] edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10,color="black"]; -node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; -nodesep=0.25; -ranksep=0.5; -// Root -c90 [label=<
Root
>]; -// Adapter -c91 [label=<
Adapter
>]; -// Element -c92 [label=<
Element
>]; -// ObjectType -c93 [label=<
ObjectType
>]; -// ObjectMap -c94 [label=<
ObjectMap
>]; -// Table -c95 [label=<
Table
>]; -// DataOperation -c96 [label=<
DataOperation
>]; -// Root assoc Adapter -c90 -> c91 [arrowhead=none,weight=2,taillabel="1..1", headlabel="0..n"]; -// Root assoc ObjectType -c90 -> c93 [arrowhead=none,weight=2,headlabel="0..n"]; -// Root assoc ObjectMap -c90 -> c94 [arrowhead=none,weight=2,headlabel="0..n"]; -// Root assoc Table -c90 -> c95 [arrowhead=none,weight=2,headlabel="0..n"]; -// Root assoc DataOperation -c90 -> c96 [arrowhead=none,weight=2,headlabel="0..n"]; +node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; +nodesep=0.25; +ranksep=0.5; +// Root +c89 [label=<
Root
>]; +// Adapter +c90 [label=<
Adapter
>]; +// Element +c91 [label=<
Element
>]; +// ObjectType +c92 [label=<
ObjectType
>]; +// ObjectMap +c93 [label=<
ObjectMap
>]; +// Table +c94 [label=<
Table
>]; +// DataOperation +c95 [label=<
DataOperation
>]; +// Root assoc Adapter +c89 -> c90 [arrowhead=none,weight=2,taillabel="1..1",headlabel="0..n"]; +// Root assoc ObjectType +c89 -> c92 [arrowhead=none,weight=2,headlabel="0..n"]; +// Root assoc ObjectMap +c89 -> c93 [arrowhead=none,weight=2,headlabel="0..n"]; +// Root assoc Table +c89 -> c94 [arrowhead=none,weight=2,headlabel="0..n"]; +// Root assoc DataOperation +c89 -> c95 [arrowhead=none,weight=2,headlabel="0..n"]; // ObjectType extends Element -c92 -> c93 [arrowtail=empty,dir=back,weight=10]; +c91 -> c92 [arrowtail=empty,dir=back,weight=10]; // ObjectMap extends Element -c92 -> c94 [arrowtail=empty,dir=back,weight=10]; -// ObjectMap has ObjectType -c94 -> c93 [arrowhead=none,arrowtail=ediamond,dir=back,weight=4,taillabel="1..1", headlabel="1..1"]; +c91 -> c93 [arrowtail=empty,dir=back,weight=10]; +// ObjectMap has ObjectType +c93 -> c92 [arrowhead=none,arrowtail=ediamond,dir=back,weight=4,taillabel="1..1",headlabel="1..1"]; // Table extends Element -c92 -> c95 [arrowtail=empty,dir=back,weight=10]; +c91 -> c94 [arrowtail=empty,dir=back,weight=10]; // DataOperation extends Element -c92 -> c96 [arrowtail=empty,dir=back,weight=10]; +c91 -> c95 [arrowtail=empty,dir=back,weight=10]; } - + diff --git a/testdata/dot-ref/RunnableRef.dot b/testdata/dot-ref/RunnableRef.dot index f347d8f..bc948a2 100644 --- a/testdata/dot-ref/RunnableRef.dot +++ b/testdata/dot-ref/RunnableRef.dot @@ -1,20 +1,20 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UMLGraph version R5_7_2-10-g442559 (http://www.umlgraph.org/) +# Generated by UMLGraph version 281411 (http://www.spinellis.gr/umlgraph/) # digraph G { graph [fontnames="svg"] edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10,color="black"]; -node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; -nodesep=0.25; -ranksep=0.5; -// test.RunnableRef -c98 [label=<
RunnableRef
>]; -// test.RunnableRef depend java.lang.Runnable -c98 -> c99 [arrowhead=open,style=dashed,weight=0]; -// java.lang.Runnable -c99 [label=<
«interface»
Runnable
>, URL="http://docs.oracle.com/javase/7/docs/api/java/lang/Runnable.html"]; +node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; +nodesep=0.25; +ranksep=0.5; +// test.RunnableRef +c1 [label=<
RunnableRef
>]; +// test.RunnableRef depend java.lang.Runnable +c1 -> c2 [arrowhead=open,style=dashed,weight=0]; +// java.lang.Runnable +c2 [label=<
«interface»
Runnable
>, URL="http://docs.oracle.com/javase/7/docs/api/java/lang/Runnable.html"]; } - + diff --git a/testdata/dot-ref/Style.dot b/testdata/dot-ref/Style.dot index 09ab5f4..30194db 100644 --- a/testdata/dot-ref/Style.dot +++ b/testdata/dot-ref/Style.dot @@ -1,7 +1,7 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UMLGraph version R5_7_2-10-g442559 (http://www.umlgraph.org/) +# Generated by UMLGraph version 281411 (http://www.spinellis.gr/umlgraph/) # digraph G { @@ -11,11 +11,11 @@ node [fontname="arial",fontcolor="black",fontsize=9,shape=plaintext,margin=0,wid nodesep=0.25; ranksep=0.5; // net.sf.whatever.test.AbstractBase -c112 [label=<
«base»
AbstractBase
net.sf.whatever.test
{since = 1.0}
field : int
{since = 1.5}
abstractMethod()
concreteMethod() : int
>]; +c112 [label=<
«base»
AbstractBase
net.sf.whatever.test
{since = 1.0}
field : int
{since = 1.5}
abstractMethod()
concreteMethod() : int
>]; // net.sf.whatever.test.Composite -c113 [label=<
Composite
net.sf.whatever.test
>]; +c113 [label=<
Composite
net.sf.whatever.test
>]; // net.sf.whatever.test.Style -c114 [label=<
Style
net.sf.whatever.test
>]; +c114 [label=<
Style
net.sf.whatever.test
>]; // net.sf.whatever.test.Composite extends net.sf.whatever.test.AbstractBase c112 -> c113 [arrowtail=empty,dir=back,weight=10]; // net.sf.whatever.test.Composite composed from.Outer.Space.AlienClass @@ -23,6 +23,6 @@ c113 -> c115 [arrowhead=none,arrowtail=diamond,dir=back,weight=6,taillabel="1",l // net.sf.whatever.test.Style extends net.sf.whatever.test.AbstractBase c112 -> c114 [arrowtail=empty,dir=back,weight=10]; // from.Outer.Space.AlienClass -c115[label=<
AlienClass
from.Outer.Space
>]; +c115[label=<
AlienClass
from.Outer.Space
>]; } diff --git a/testdata/dot-ref/TestHideOp.dot b/testdata/dot-ref/TestHideOp.dot index 793bf78..e133414 100644 --- a/testdata/dot-ref/TestHideOp.dot +++ b/testdata/dot-ref/TestHideOp.dot @@ -1,16 +1,16 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UMLGraph version R5_6-9-g37cd34 (http://www.umlgraph.org/) +# Generated by UMLGraph version 281411 (http://www.spinellis.gr/umlgraph/) # digraph G { graph [fontnames="svg"] edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10,color="black"]; -node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; -nodesep=0.25; -ranksep=0.5; -// test.TestHideOp -c117 [label=<
TestHideOp
>]; +node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; +nodesep=0.25; +ranksep=0.5; +// test.TestHideOp +c110 [label=<
TestHideOp
>]; } - + diff --git a/testdata/dot-ref/ViewAll.dot b/testdata/dot-ref/ViewAll.dot index 84cf660..697bad8 100644 --- a/testdata/dot-ref/ViewAll.dot +++ b/testdata/dot-ref/ViewAll.dot @@ -1,32 +1,32 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UMLGraph version R5_6-9-g37cd34 (http://www.umlgraph.org/) +# Generated by UMLGraph version 281411 (http://www.spinellis.gr/umlgraph/) # digraph G { graph [fontnames="svg"] edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10,color="black"]; -node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; -nodesep=0.25; -ranksep=0.5; -// gr.spinellis.basic.invoice.InvoiceItem -c355 [label=<
InvoiceItem
>]; -// gr.spinellis.basic.invoice.Invoice -c356 [label=<
Invoice
>]; -// gr.spinellis.basic.invoice.Customer -c357 [label=<
Customer
>]; -// gr.spinellis.basic.product.Product -c358 [label=<
Product
>]; -// gr.spinellis.basic.product.Category -c359 [label=<
Category
>]; -// gr.spinellis.basic.invoice.InvoiceItem assoc gr.spinellis.basic.product.Product -c355 -> c358 [arrowhead=none,weight=2,taillabel="*", headlabel="1"]; -// gr.spinellis.basic.invoice.Invoice assoc gr.spinellis.basic.invoice.Customer -c356 -> c357 [arrowhead=none,weight=2,taillabel="*", headlabel="1"]; -// gr.spinellis.basic.invoice.Invoice composed gr.spinellis.basic.invoice.InvoiceItem -c356 -> c355 [arrowhead=none,arrowtail=diamond,dir=back,weight=6,taillabel="1", headlabel="*"]; -// gr.spinellis.basic.product.Product assoc gr.spinellis.basic.product.Category -c358 -> c359 [arrowhead=none,weight=2,taillabel="*", headlabel="1"]; +node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; +nodesep=0.25; +ranksep=0.5; +// gr.spinellis.basic.invoice.Customer +c174 [label=<
Customer
>]; +// gr.spinellis.basic.invoice.InvoiceItem +c175 [label=<
InvoiceItem
>]; +// gr.spinellis.basic.invoice.Invoice +c176 [label=<
Invoice
>]; +// gr.spinellis.basic.product.Product +c177 [label=<
Product
>]; +// gr.spinellis.basic.product.Category +c178 [label=<
Category
>]; +// gr.spinellis.basic.invoice.InvoiceItem assoc gr.spinellis.basic.product.Product +c175 -> c177 [arrowhead=none,weight=2,taillabel="*",headlabel="1"]; +// gr.spinellis.basic.invoice.Invoice composed gr.spinellis.basic.invoice.InvoiceItem +c176 -> c175 [arrowhead=none,arrowtail=diamond,dir=back,weight=6,taillabel="1",headlabel="*"]; +// gr.spinellis.basic.invoice.Invoice assoc gr.spinellis.basic.invoice.Customer +c176 -> c174 [arrowhead=none,weight=2,taillabel="*",headlabel="1"]; +// gr.spinellis.basic.product.Product assoc gr.spinellis.basic.product.Category +c177 -> c178 [arrowhead=none,weight=2,taillabel="*",headlabel="1"]; } - + diff --git a/testdata/dot-ref/ViewAllDetailed.dot b/testdata/dot-ref/ViewAllDetailed.dot index 7833953..e33b0f2 100644 --- a/testdata/dot-ref/ViewAllDetailed.dot +++ b/testdata/dot-ref/ViewAllDetailed.dot @@ -1,32 +1,32 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UMLGraph version R5_6-9-g37cd34 (http://www.umlgraph.org/) +# Generated by UMLGraph version 281411 (http://www.spinellis.gr/umlgraph/) # digraph G { graph [fontnames="svg"] edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10,color="black"]; -node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; -nodesep=0.25; -ranksep=0.5; -// gr.spinellis.basic.invoice.InvoiceItem -c317 [label=<
InvoiceItem
product : Product
quantity : int
>]; -// gr.spinellis.basic.invoice.Invoice -c318 [label=<
Invoice
total : double
items : InvoiceItem[]
customer : Customer
addItem(p : Product, quantity : int)
>]; -// gr.spinellis.basic.invoice.Customer -c319 [label=<
Customer
name : String
>]; -// gr.spinellis.basic.product.Product -c320 [label=<
Product
name : String
stock : int
price : double
category : Category
>]; -// gr.spinellis.basic.product.Category -c321 [label=<
Category
name : String
products : List<>
>]; -// gr.spinellis.basic.invoice.InvoiceItem assoc gr.spinellis.basic.product.Product -c317 -> c320 [arrowhead=none,weight=2,taillabel="*", headlabel="1"]; -// gr.spinellis.basic.invoice.Invoice assoc gr.spinellis.basic.invoice.Customer -c318 -> c319 [arrowhead=none,weight=2,taillabel="*", headlabel="1"]; -// gr.spinellis.basic.invoice.Invoice composed gr.spinellis.basic.invoice.InvoiceItem -c318 -> c317 [arrowhead=none,arrowtail=diamond,dir=back,weight=6,taillabel="1", headlabel="*"]; -// gr.spinellis.basic.product.Product assoc gr.spinellis.basic.product.Category -c320 -> c321 [arrowhead=none,weight=2,taillabel="*", headlabel="1"]; +node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; +nodesep=0.25; +ranksep=0.5; +// gr.spinellis.basic.invoice.Customer +c403 [label=<
Customer
name : String
>]; +// gr.spinellis.basic.invoice.InvoiceItem +c404 [label=<
InvoiceItem
product : Product
quantity : int
>]; +// gr.spinellis.basic.invoice.Invoice +c405 [label=<
Invoice
total : double
items : InvoiceItem[]
customer : Customer
addItem(p : Product, quantity : int)
>]; +// gr.spinellis.basic.product.Product +c406 [label=<
Product
name : String
stock : int
price : double
category : Category
>]; +// gr.spinellis.basic.product.Category +c407 [label=<
Category
name : String
products : List<>
>]; +// gr.spinellis.basic.invoice.InvoiceItem assoc gr.spinellis.basic.product.Product +c404 -> c406 [arrowhead=none,weight=2,taillabel="*",headlabel="1"]; +// gr.spinellis.basic.invoice.Invoice composed gr.spinellis.basic.invoice.InvoiceItem +c405 -> c404 [arrowhead=none,arrowtail=diamond,dir=back,weight=6,taillabel="1",headlabel="*"]; +// gr.spinellis.basic.invoice.Invoice assoc gr.spinellis.basic.invoice.Customer +c405 -> c403 [arrowhead=none,weight=2,taillabel="*",headlabel="1"]; +// gr.spinellis.basic.product.Product assoc gr.spinellis.basic.product.Category +c406 -> c407 [arrowhead=none,weight=2,taillabel="*",headlabel="1"]; } - + diff --git a/testdata/dot-ref/ViewAtt.dot b/testdata/dot-ref/ViewAtt.dot index f7ea886..e34745e 100644 --- a/testdata/dot-ref/ViewAtt.dot +++ b/testdata/dot-ref/ViewAtt.dot @@ -1,32 +1,32 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UMLGraph version R5_6-9-g37cd34 (http://www.umlgraph.org/) +# Generated by UMLGraph version 281411 (http://www.spinellis.gr/umlgraph/) # digraph G { graph [fontnames="svg"] edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10,color="black"]; -node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; -nodesep=0.25; -ranksep=0.5; -// gr.spinellis.basic.invoice.InvoiceItem -c279 [label=<
InvoiceItem
product
quantity
>, fontname="Helvetica", fontcolor="black", fontsize=16.0]; -// gr.spinellis.basic.invoice.Invoice -c280 [label=<
Invoice
total
items
customer
>, fontname="Helvetica", fontcolor="black", fontsize=16.0]; -// gr.spinellis.basic.invoice.Customer -c281 [label=<
Customer
name
>, fontname="Helvetica", fontcolor="black", fontsize=16.0]; -// gr.spinellis.basic.product.Product -c282 [label=<
Product
name
stock
price
category
>, fontname="Helvetica", fontcolor="black", fontsize=16.0]; -// gr.spinellis.basic.product.Category -c283 [label=<
Category
name
products
>, fontname="Helvetica", fontcolor="black", fontsize=16.0]; -// gr.spinellis.basic.invoice.InvoiceItem assoc gr.spinellis.basic.product.Product -c279 -> c282 [arrowhead=none,weight=2,taillabel="*", headlabel="1"]; -// gr.spinellis.basic.invoice.Invoice assoc gr.spinellis.basic.invoice.Customer -c280 -> c281 [arrowhead=none,weight=2,taillabel="*", headlabel="1"]; -// gr.spinellis.basic.invoice.Invoice composed gr.spinellis.basic.invoice.InvoiceItem -c280 -> c279 [arrowhead=none,arrowtail=diamond,dir=back,weight=6,taillabel="1", headlabel="*"]; -// gr.spinellis.basic.product.Product assoc gr.spinellis.basic.product.Category -c282 -> c283 [arrowhead=none,weight=2,taillabel="*", headlabel="1"]; +node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; +nodesep=0.25; +ranksep=0.5; +// gr.spinellis.basic.invoice.Customer +c250 [label=<
Customer
name
>]; +// gr.spinellis.basic.invoice.InvoiceItem +c251 [label=<
InvoiceItem
product
quantity
>]; +// gr.spinellis.basic.invoice.Invoice +c252 [label=<
Invoice
total
items
customer
>]; +// gr.spinellis.basic.product.Product +c253 [label=<
Product
name
stock
price
category
>]; +// gr.spinellis.basic.product.Category +c254 [label=<
Category
name
products
>]; +// gr.spinellis.basic.invoice.InvoiceItem assoc gr.spinellis.basic.product.Product +c251 -> c253 [arrowhead=none,weight=2,taillabel="*",headlabel="1"]; +// gr.spinellis.basic.invoice.Invoice composed gr.spinellis.basic.invoice.InvoiceItem +c252 -> c251 [arrowhead=none,arrowtail=diamond,dir=back,weight=6,taillabel="1",headlabel="*"]; +// gr.spinellis.basic.invoice.Invoice assoc gr.spinellis.basic.invoice.Customer +c252 -> c250 [arrowhead=none,weight=2,taillabel="*",headlabel="1"]; +// gr.spinellis.basic.product.Product assoc gr.spinellis.basic.product.Category +c253 -> c254 [arrowhead=none,weight=2,taillabel="*",headlabel="1"]; } - + diff --git a/testdata/dot-ref/ViewChildEmpty.dot b/testdata/dot-ref/ViewChildEmpty.dot index ab25f23..6ed4cf9 100644 --- a/testdata/dot-ref/ViewChildEmpty.dot +++ b/testdata/dot-ref/ViewChildEmpty.dot @@ -1,20 +1,20 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UMLGraph version R5_6-9-g37cd34 (http://www.umlgraph.org/) +# Generated by UMLGraph version 281411 (http://www.spinellis.gr/umlgraph/) # digraph G { graph [fontnames="svg"] edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10,color="black"]; -node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; -nodesep=0.25; -ranksep=0.5; -// gr.spinellis.basic.product.Product -c244 [label=<
Product
>]; -// gr.spinellis.basic.product.Category -c245 [label=<
Category
>]; -// gr.spinellis.basic.product.Product assoc gr.spinellis.basic.product.Category -c244 -> c245 [arrowhead=none,weight=2,taillabel="*", headlabel="1"]; +node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; +nodesep=0.25; +ranksep=0.5; +// gr.spinellis.basic.product.Product +c215 [label=<
Product
>]; +// gr.spinellis.basic.product.Category +c216 [label=<
Category
>]; +// gr.spinellis.basic.product.Product assoc gr.spinellis.basic.product.Category +c215 -> c216 [arrowhead=none,weight=2,taillabel="*",headlabel="1"]; } - + diff --git a/testdata/dot-ref/ViewChildOverride.dot b/testdata/dot-ref/ViewChildOverride.dot index 4297729..07836b1 100644 --- a/testdata/dot-ref/ViewChildOverride.dot +++ b/testdata/dot-ref/ViewChildOverride.dot @@ -1,20 +1,20 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UMLGraph version R5_6-9-g37cd34 (http://www.umlgraph.org/) +# Generated by UMLGraph version 281411 (http://www.spinellis.gr/umlgraph/) # digraph G { graph [fontnames="svg"] edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10,color="black"]; -node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; -nodesep=0.25; -ranksep=0.5; -// gr.spinellis.basic.product.Product -c206 [label=<
Product
name
stock
price
category
>]; -// gr.spinellis.basic.product.Category -c207 [label=<
Category
>]; -// gr.spinellis.basic.product.Product assoc gr.spinellis.basic.product.Category -c206 -> c207 [arrowhead=none,weight=2,taillabel="*", headlabel="1"]; +node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; +nodesep=0.25; +ranksep=0.5; +// gr.spinellis.basic.product.Product +c368 [label=<
Product
name
stock
price
category
>]; +// gr.spinellis.basic.product.Category +c369 [label=<
Category
>]; +// gr.spinellis.basic.product.Product assoc gr.spinellis.basic.product.Category +c368 -> c369 [arrowhead=none,weight=2,taillabel="*",headlabel="1"]; } - + diff --git a/testdata/dot-ref/ViewColors.dot b/testdata/dot-ref/ViewColors.dot index 59e9cec..b132851 100644 --- a/testdata/dot-ref/ViewColors.dot +++ b/testdata/dot-ref/ViewColors.dot @@ -1,36 +1,36 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UMLGraph version R5_7_2-10-g442559 (http://www.umlgraph.org/) +# Generated by UMLGraph version 281411 (http://www.spinellis.gr/umlgraph/) # digraph G { graph [fontnames="svg"] edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10,color="black"]; -node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; -nodesep=0.25; -ranksep=0.5; -// gr.spinellis.basic.invoice.InvoiceItem -c164 [label=<
InvoiceItem
>]; -// gr.spinellis.basic.invoice.Invoice -c165 [label=<
Invoice
>]; -// gr.spinellis.basic.invoice.Customer -c166 [label=<
Customer
>]; -// gr.spinellis.basic.product.Product -c167 [label=<
Product
>]; -// gr.spinellis.basic.product.Category -c168 [label=<
Category
>]; -// gr.spinellis.basic.invoice.InvoiceItem assoc gr.spinellis.basic.product.Product -c164 -> c167 [arrowhead=none,weight=2,taillabel="*", headlabel="1"]; -// gr.spinellis.basic.invoice.Invoice assoc gr.spinellis.basic.invoice.Customer -c165 -> c166 [arrowhead=none,weight=2,taillabel="*", headlabel="1"]; -// gr.spinellis.basic.invoice.Invoice composed gr.spinellis.basic.invoice.InvoiceItem -c165 -> c164 [arrowhead=none,arrowtail=diamond,dir=back,weight=6,taillabel="1", headlabel="*"]; -// gr.spinellis.basic.product.Product assoc gr.spinellis.basic.product.Category -c167 -> c168 [arrowhead=none,weight=2,taillabel="*", headlabel="1"]; -// gr.spinellis.basic.product.Category depend java.util.List -c168 -> c202 [arrowhead=open,style=dashed,weight=0]; -// java.util.List -c202 [label=<
«interface»
List<E>
>, URL="http://docs.oracle.com/javase/7/docs/api/java/util/List.html"]; +node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; +nodesep=0.25; +ranksep=0.5; +// gr.spinellis.basic.invoice.Customer +c326 [label=<
Customer
>]; +// gr.spinellis.basic.invoice.InvoiceItem +c327 [label=<
InvoiceItem
>]; +// gr.spinellis.basic.invoice.Invoice +c328 [label=<
Invoice
>]; +// gr.spinellis.basic.product.Product +c329 [label=<
Product
>]; +// gr.spinellis.basic.product.Category +c330 [label=<
Category
>]; +// gr.spinellis.basic.invoice.InvoiceItem assoc gr.spinellis.basic.product.Product +c327 -> c329 [arrowhead=none,weight=2,taillabel="*",headlabel="1"]; +// gr.spinellis.basic.invoice.Invoice composed gr.spinellis.basic.invoice.InvoiceItem +c328 -> c327 [arrowhead=none,arrowtail=diamond,dir=back,weight=6,taillabel="1",headlabel="*"]; +// gr.spinellis.basic.invoice.Invoice assoc gr.spinellis.basic.invoice.Customer +c328 -> c326 [arrowhead=none,weight=2,taillabel="*",headlabel="1"]; +// gr.spinellis.basic.product.Product assoc gr.spinellis.basic.product.Category +c329 -> c330 [arrowhead=none,weight=2,taillabel="*",headlabel="1"]; +// gr.spinellis.basic.product.Category depend java.util.List +c330 -> c356 [arrowhead=open,style=dashed,weight=0]; +// java.util.List +c356 [label=<
«interface»
List<E>
>, URL="http://docs.oracle.com/javase/7/docs/api/java/util/List.html"]; } - + diff --git a/testdata/dot-ref/ViewContext.dot b/testdata/dot-ref/ViewContext.dot index a20006b..ff96819 100644 --- a/testdata/dot-ref/ViewContext.dot +++ b/testdata/dot-ref/ViewContext.dot @@ -1,7 +1,7 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UMLGraph version R5_7_2-10-g442559 (http://www.umlgraph.org/) +# Generated by UMLGraph version 281411 (http://www.spinellis.gr/umlgraph/) # digraph G { @@ -11,34 +11,34 @@ node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin= nodesep=0.25; ranksep=0.5; // gr.spinellis.context.classes.AClient -c424 [label=<
AClient
>]; +c523 [label=<
AClient
>]; // gr.spinellis.context.classes.ASubclass -c426 [label=<
ASubclass
>]; +c525 [label=<
ASubclass
>]; // gr.spinellis.context.classes.E -c427 [label=<
E
>]; +c526 [label=<
E
>]; // gr.spinellis.context.classes.D -c429 [label=<
D
>]; +c528 [label=<
D
>]; // gr.spinellis.context.classes.B -c432 [label=<
B
>]; +c531 [label=<
B
>]; // gr.spinellis.context.classes.ABaseClass -c433 [label=<
ABaseClass
>]; +c532 [label=<
ABaseClass
>]; // gr.spinellis.context.classes.A -c434 [label=<
A
>]; +c533 [label=<
A
>]; // gr.spinellis.context.classes.ASubclass extends gr.spinellis.context.classes.A -c434 -> c426 [arrowtail=empty,dir=back,weight=10]; +c533 -> c525 [arrowtail=empty,dir=back,weight=10]; // gr.spinellis.context.classes.A extends gr.spinellis.context.classes.ABaseClass -c433 -> c434 [arrowtail=empty,dir=back,weight=10]; +c532 -> c533 [arrowtail=empty,dir=back,weight=10]; // gr.spinellis.context.classes.D navassoc gr.spinellis.context.classes.A -c429 -> c434 [arrowhead=open,weight=1]; +c528 -> c533 [arrowhead=open,weight=1]; // gr.spinellis.context.classes.A navassoc gr.spinellis.context.classes.B -c434 -> c432 [arrowhead=open,weight=1]; +c533 -> c531 [arrowhead=open,weight=1]; // gr.spinellis.context.classes.A navassoc javax.swing.JComponent -c434 -> c509 [arrowhead=open,weight=1]; +c533 -> c587 [arrowhead=open,weight=1]; // gr.spinellis.context.classes.AClient depend gr.spinellis.context.classes.A -c424 -> c434 [arrowhead=open,style=dashed,weight=0]; +c523 -> c533 [arrowhead=open,style=dashed,weight=0]; // gr.spinellis.context.classes.A depend gr.spinellis.context.classes.E -c434 -> c427 [arrowhead=open,style=dashed,weight=0]; +c533 -> c526 [arrowhead=open,style=dashed,weight=0]; // javax.swing.JComponent -c509 [label=<
JComponent
>, URL="http://docs.oracle.com/javase/7/docs/api/javax/swing/JComponent.html"]; +c587 [label=<
JComponent
>, URL="http://docs.oracle.com/javase/7/docs/api/javax/swing/JComponent.html"]; } diff --git a/testdata/dot-ref/ViewInterfaces.dot b/testdata/dot-ref/ViewInterfaces.dot index 7e1938e..fe9e680 100644 --- a/testdata/dot-ref/ViewInterfaces.dot +++ b/testdata/dot-ref/ViewInterfaces.dot @@ -1,32 +1,32 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UMLGraph version R5_7_2-20-g09fab1 (http://www.umlgraph.org/) +# Generated by UMLGraph version 281411 (http://www.spinellis.gr/umlgraph/) # digraph G { graph [fontnames="svg"] edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10,color="black"]; -node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; -nodesep=0.25; -ranksep=0.5; -// gr.spinellis.iface.classes.FarImplementor -c534 [label=<
FarImplementor
>]; -// gr.spinellis.iface.classes.DirectImplementor -c535 [label=<
DirectImplementor
>]; -// gr.spinellis.iface.classes.SubSubFace -c537 [label=<
«interface»
SubSubFace
>]; -// gr.spinellis.iface.classes.SubFace -c538 [label=<
«interface»
SubFace
>]; -// gr.spinellis.iface.classes.Face -c539 [label=<
«interface»
Face
>]; +node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; +nodesep=0.25; +ranksep=0.5; +// gr.spinellis.iface.classes.FarImplementor +c129 [label=<
FarImplementor
>]; +// gr.spinellis.iface.classes.DirectImplementor +c130 [label=<
DirectImplementor
>]; +// gr.spinellis.iface.classes.SubSubFace +c132 [label=<
«interface»
SubSubFace
>]; +// gr.spinellis.iface.classes.SubFace +c133 [label=<
«interface»
SubFace
>]; +// gr.spinellis.iface.classes.Face +c134 [label=<
«interface»
Face
>]; // gr.spinellis.iface.classes.FarImplementor implements gr.spinellis.iface.classes.SubSubFace -c537 -> c534 [arrowtail=empty,style=dashed,dir=back,weight=9]; +c132 -> c129 [arrowtail=empty,style=dashed,dir=back,weight=9]; // gr.spinellis.iface.classes.DirectImplementor implements gr.spinellis.iface.classes.Face -c539 -> c535 [arrowtail=empty,style=dashed,dir=back,weight=9]; +c134 -> c130 [arrowtail=empty,style=dashed,dir=back,weight=9]; // gr.spinellis.iface.classes.SubSubFace implements gr.spinellis.iface.classes.SubFace -c538 -> c537 [arrowtail=empty,style=dashed,dir=back,weight=9]; +c133 -> c132 [arrowtail=empty,style=dashed,dir=back,weight=9]; // gr.spinellis.iface.classes.SubFace implements gr.spinellis.iface.classes.Face -c539 -> c538 [arrowtail=empty,style=dashed,dir=back,weight=9]; +c134 -> c133 [arrowtail=empty,style=dashed,dir=back,weight=9]; } - + diff --git a/testdata/dot-ref/ViewProduct.dot b/testdata/dot-ref/ViewProduct.dot index 8f2192a..246a382 100644 --- a/testdata/dot-ref/ViewProduct.dot +++ b/testdata/dot-ref/ViewProduct.dot @@ -1,20 +1,20 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UMLGraph version R5_6-9-g37cd34 (http://www.umlgraph.org/) +# Generated by UMLGraph version 281411 (http://www.spinellis.gr/umlgraph/) # digraph G { graph [fontnames="svg"] edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10,color="black"]; -node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; -nodesep=0.25; -ranksep=0.5; -// gr.spinellis.basic.product.Product -c129 [label=<
Product
name
stock
price
category
>]; -// gr.spinellis.basic.product.Category -c130 [label=<
Category
name
products
>]; -// gr.spinellis.basic.product.Product assoc gr.spinellis.basic.product.Category -c129 -> c130 [arrowhead=none,weight=2,taillabel="*", headlabel="1"]; +node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; +nodesep=0.25; +ranksep=0.5; +// gr.spinellis.basic.product.Product +c291 [label=<
Product
name
stock
price
category
>]; +// gr.spinellis.basic.product.Category +c292 [label=<
Category
name
products
>]; +// gr.spinellis.basic.product.Product assoc gr.spinellis.basic.product.Category +c291 -> c292 [arrowhead=none,weight=2,taillabel="*",headlabel="1"]; } - + diff --git a/testdata/dot-ref/ViewSubclasses.dot b/testdata/dot-ref/ViewSubclasses.dot index 0dc6c7f..d7e85be 100644 --- a/testdata/dot-ref/ViewSubclasses.dot +++ b/testdata/dot-ref/ViewSubclasses.dot @@ -1,7 +1,7 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UMLGraph version R5_7_2-20-g09fab1 (http://www.umlgraph.org/) +# Generated by UMLGraph version 281411 (http://www.spinellis.gr/umlgraph/) # digraph G { @@ -11,22 +11,22 @@ node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin= nodesep=0.25; ranksep=0.5; // gr.spinellis.subclass.classes.SubOneTwo -c580 [label=<
SubOneTwo
>]; +c455 [label=<
SubOneTwo
>]; // gr.spinellis.subclass.classes.SubOneOne -c581 [label=<
SubOneOne
>]; +c456 [label=<
SubOneOne
>]; // gr.spinellis.subclass.classes.SubTwo -c582 [label=<
SubTwo
>]; +c457 [label=<
SubTwo
>]; // gr.spinellis.subclass.classes.SubOne -c583 [label=<
SubOne
>]; +c458 [label=<
SubOne
>]; // gr.spinellis.subclass.classes.Super -c584 [label=<
Super
>]; +c459 [label=<
Super
>]; // gr.spinellis.subclass.classes.SubOneTwo extends gr.spinellis.subclass.classes.SubOne -c583 -> c580 [arrowtail=empty,dir=back,weight=10]; +c458 -> c455 [arrowtail=empty,dir=back,weight=10]; // gr.spinellis.subclass.classes.SubOneOne extends gr.spinellis.subclass.classes.SubOne -c583 -> c581 [arrowtail=empty,dir=back,weight=10]; +c458 -> c456 [arrowtail=empty,dir=back,weight=10]; // gr.spinellis.subclass.classes.SubTwo extends gr.spinellis.subclass.classes.Super -c584 -> c582 [arrowtail=empty,dir=back,weight=10]; +c459 -> c457 [arrowtail=empty,dir=back,weight=10]; // gr.spinellis.subclass.classes.SubOne extends gr.spinellis.subclass.classes.Super -c584 -> c583 [arrowtail=empty,dir=back,weight=10]; +c459 -> c458 [arrowtail=empty,dir=back,weight=10]; } diff --git a/testdata/dot-ref/active.dot b/testdata/dot-ref/active.dot index 02c5a4e..2390708 100644 --- a/testdata/dot-ref/active.dot +++ b/testdata/dot-ref/active.dot @@ -1,7 +1,7 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UMLGraph version R5_7_2-54-gbca0ce (http://www.spinellis.gr/umlgraph/) +# Generated by UMLGraph version 281411 (http://www.spinellis.gr/umlgraph/) # digraph G { @@ -11,6 +11,6 @@ node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin= nodesep=0.25; ranksep=0.5; // Active -c32 [label=<
Active
run()
>]; +c69 [label=<
Active
run()
>]; } diff --git a/testdata/dot-ref/advrel.dot b/testdata/dot-ref/advrel.dot index 2b21798..d962fa2 100644 --- a/testdata/dot-ref/advrel.dot +++ b/testdata/dot-ref/advrel.dot @@ -1,36 +1,36 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UMLGraph version R5_7_0-10-g786d98 (http://www.umlgraph.org/) +# Generated by UMLGraph version 281411 (http://www.spinellis.gr/umlgraph/) # digraph G { graph [fontnames="svg"] edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10,color="black"]; -node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; -nodesep=0.25; -ranksep=0.5; -// Controller -c5 [label=<
Controller
>]; -// EmbeddedAgent -c6 [label=<
EmbeddedAgent
>]; -// PowerManager -c7 [label=<
PowerManager
>]; -// SetTopController -c8 [label=<
SetTopController
authorizationLevel
startUp()
shutDown()
connect()
>]; -// ChannelIterator -c9 [label=<
ChannelIterator
>]; -// URLStreamHandler -c10 [label=<
«interface»
URLStreamHandler
OpenConnection()
parseURL()
setURL()
toExternalForm()
>]; +node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; +nodesep=0.25; +ranksep=0.5; +// Controller +c78 [label=<
Controller
>]; +// EmbeddedAgent +c79 [label=<
EmbeddedAgent
>]; +// PowerManager +c80 [label=<
PowerManager
>]; +// SetTopController +c81 [label=<
SetTopController
authorizationLevel
startUp()
shutDown()
connect()
>]; +// ChannelIterator +c82 [label=<
ChannelIterator
>]; +// URLStreamHandler +c83 [label=<
«interface»
URLStreamHandler
OpenConnection()
parseURL()
setURL()
toExternalForm()
>]; // SetTopController extends Controller -c5 -> c8 [arrowtail=empty,dir=back,weight=10]; +c78 -> c81 [arrowtail=empty,dir=back,weight=10]; // SetTopController extends EmbeddedAgent -c6 -> c8 [arrowtail=empty,dir=back,weight=10]; +c79 -> c81 [arrowtail=empty,dir=back,weight=10]; // SetTopController implements URLStreamHandler -c10 -> c8 [arrowtail=empty,style=dashed,dir=back,weight=9]; -// SetTopController navassoc PowerManager -c8 -> c7 [arrowhead=open,weight=1]; -// ChannelIterator depend SetTopController -c9 -> c8 [arrowhead=open,style=dashed,weight=0,label="«friend»"]; +c83 -> c81 [arrowtail=empty,style=dashed,dir=back,weight=9]; +// SetTopController navassoc PowerManager +c81 -> c80 [arrowhead=open,weight=1]; +// ChannelIterator depend SetTopController +c82 -> c81 [arrowhead=open,style=dashed,weight=0,label="«friend»"]; } - + diff --git a/testdata/dot-ref/assoc.dot b/testdata/dot-ref/assoc.dot index 29715e0..cfb5ec7 100644 --- a/testdata/dot-ref/assoc.dot +++ b/testdata/dot-ref/assoc.dot @@ -1,25 +1,25 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UMLGraph version R5_6-9-g37cd34 (http://www.umlgraph.org/) +# Generated by UMLGraph version 281411 (http://www.spinellis.gr/umlgraph/) # digraph G { graph [fontnames="svg"] edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10,color="black"]; -node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; -nodesep=0.25; -ranksep=0.5; -rankdir=LR; -// UserGroup -c12 [label=<
UserGroup
>]; -// User -c13 [label=<
User
>]; -// Password -c14 [label=<
Password
>]; -// UserGroup assoc User -c12 -> c13 [arrowhead=none,weight=2,taillabel="*", headlabel="*\n\n+user "]; -// User navassoc Password -c13 -> c14 [arrowhead=open,weight=1,taillabel="1\n\n+owner\r", headlabel="*\n\n+key"]; +node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; +nodesep=0.25; +ranksep=0.5; +rankdir=LR; +// UserGroup +c14 [label=<
UserGroup
>]; +// User +c15 [label=<
User
>]; +// Password +c16 [label=<
Password
>]; +// UserGroup assoc User +c14 -> c15 [arrowhead=none,weight=2,taillabel="*",headlabel="*\n\n+user "]; +// User navassoc Password +c15 -> c16 [arrowhead=open,weight=1,taillabel="1\n\n+owner\r",headlabel="*\n\n+key"]; } - + diff --git a/testdata/dot-ref/car.dot b/testdata/dot-ref/car.dot index 1b3b572..0362116 100644 --- a/testdata/dot-ref/car.dot +++ b/testdata/dot-ref/car.dot @@ -1,28 +1,28 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UMLGraph version R5_6-9-g37cd34 (http://www.umlgraph.org/) +# Generated by UMLGraph version 281411 (http://www.spinellis.gr/umlgraph/) # digraph G { graph [fontnames="svg"] edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10,color="black"]; -node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; -nodesep=0.25; -ranksep=0.5; -// Tyre -c15 [label=<
Tyre
>]; -// Engine -c16 [label=<
Engine
>]; -// Body -c17 [label=<
Body
>]; -// Car -c18 [label=<
Car
>]; -// Car composed Tyre -c18 -> c15 [arrowhead=none,arrowtail=diamond,dir=back,weight=6,taillabel="1", headlabel="4"]; -// Car composed Engine -c18 -> c16 [arrowhead=none,arrowtail=diamond,dir=back,weight=6,taillabel="1", headlabel="1"]; -// Car composed Body -c18 -> c17 [arrowhead=none,arrowtail=diamond,dir=back,weight=6,taillabel="1", headlabel="1"]; +node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; +nodesep=0.25; +ranksep=0.5; +// Tyre +c53 [label=<
Tyre
>]; +// Engine +c54 [label=<
Engine
>]; +// Body +c55 [label=<
Body
>]; +// Car +c56 [label=<
Car
>]; +// Car composed Tyre +c56 -> c53 [arrowhead=none,arrowtail=diamond,dir=back,weight=6,taillabel="1",headlabel="4"]; +// Car composed Engine +c56 -> c54 [arrowhead=none,arrowtail=diamond,dir=back,weight=6,taillabel="1",headlabel="1"]; +// Car composed Body +c56 -> c55 [arrowhead=none,arrowtail=diamond,dir=back,weight=6,taillabel="1",headlabel="1"]; } - + diff --git a/testdata/dot-ref/catalina.dot b/testdata/dot-ref/catalina.dot index b0b624a..6296835 100644 --- a/testdata/dot-ref/catalina.dot +++ b/testdata/dot-ref/catalina.dot @@ -1,58 +1,58 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UMLGraph version R5_6-9-g37cd34 (http://www.umlgraph.org/) +# Generated by UMLGraph version 281411 (http://www.spinellis.gr/umlgraph/) # digraph G { graph [fontnames="svg"] edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10,color="black"]; -node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; -nodesep=0.25; -ranksep=0.5; -// HttpResponseBase -c19 [label=<
HttpResponseBase
>]; -// HttpResponseWrapper -c20 [label=<
HttpResponseWrapper
>]; -// HttpResponseFacade -c21 [label=<
HttpResponseFacade
>]; -// ResponseWrapper -c22 [label=<
ResponseWrapper
>]; -// HttpResponse -c23 [label=<
«interface»
HttpResponse
>]; -// ResponseBase -c24 [label=<
ResponseBase
>]; -// HttpServletResponse -c25 [label=<
«interface»
HttpServletResponse
>]; -// ResponseFacade -c26 [label=<
ResponseFacade
>]; -// ServletResponse -c27 [label=<
«interface»
ServletResponse
>]; -// Response -c28 [label=<
«interface»
Response
>]; +node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; +nodesep=0.25; +ranksep=0.5; +// HttpResponseBase +c3 [label=<
HttpResponseBase
>]; +// HttpResponseWrapper +c4 [label=<
HttpResponseWrapper
>]; +// HttpResponseFacade +c5 [label=<
HttpResponseFacade
>]; +// ResponseWrapper +c6 [label=<
ResponseWrapper
>]; +// HttpResponse +c7 [label=<
«interface»
HttpResponse
>]; +// ResponseBase +c8 [label=<
ResponseBase
>]; +// HttpServletResponse +c9 [label=<
«interface»
HttpServletResponse
>]; +// ResponseFacade +c10 [label=<
ResponseFacade
>]; +// ServletResponse +c11 [label=<
«interface»
ServletResponse
>]; +// Response +c12 [label=<
«interface»
Response
>]; // HttpResponseBase extends ResponseBase -c24 -> c19 [arrowtail=empty,dir=back,weight=10]; +c8 -> c3 [arrowtail=empty,dir=back,weight=10]; // HttpResponseBase implements HttpResponse -c23 -> c19 [arrowtail=empty,style=dashed,dir=back,weight=9]; +c7 -> c3 [arrowtail=empty,style=dashed,dir=back,weight=9]; // HttpResponseBase implements HttpServletResponse -c25 -> c19 [arrowtail=empty,style=dashed,dir=back,weight=9]; +c9 -> c3 [arrowtail=empty,style=dashed,dir=back,weight=9]; // HttpResponseWrapper extends ResponseWrapper -c22 -> c20 [arrowtail=empty,dir=back,weight=10]; +c6 -> c4 [arrowtail=empty,dir=back,weight=10]; // HttpResponseWrapper implements HttpResponse -c23 -> c20 [arrowtail=empty,style=dashed,dir=back,weight=9]; +c7 -> c4 [arrowtail=empty,style=dashed,dir=back,weight=9]; // HttpResponseFacade extends ResponseFacade -c26 -> c21 [arrowtail=empty,dir=back,weight=10]; +c10 -> c5 [arrowtail=empty,dir=back,weight=10]; // HttpResponseFacade implements HttpServletResponse -c25 -> c21 [arrowtail=empty,style=dashed,dir=back,weight=9]; +c9 -> c5 [arrowtail=empty,style=dashed,dir=back,weight=9]; // ResponseWrapper implements Response -c28 -> c22 [arrowtail=empty,style=dashed,dir=back,weight=9]; +c12 -> c6 [arrowtail=empty,style=dashed,dir=back,weight=9]; // HttpResponse implements Response -c28 -> c23 [arrowtail=empty,style=dashed,dir=back,weight=9]; +c12 -> c7 [arrowtail=empty,style=dashed,dir=back,weight=9]; // ResponseBase implements Response -c28 -> c24 [arrowtail=empty,style=dashed,dir=back,weight=9]; +c12 -> c8 [arrowtail=empty,style=dashed,dir=back,weight=9]; // ResponseBase implements ServletResponse -c27 -> c24 [arrowtail=empty,style=dashed,dir=back,weight=9]; +c11 -> c8 [arrowtail=empty,style=dashed,dir=back,weight=9]; // ResponseFacade implements ServletResponse -c27 -> c26 [arrowtail=empty,style=dashed,dir=back,weight=9]; +c11 -> c10 [arrowtail=empty,style=dashed,dir=back,weight=9]; } - + diff --git a/testdata/dot-ref/class-eg.dot b/testdata/dot-ref/class-eg.dot index 3ac8d11..14e2a3c 100644 --- a/testdata/dot-ref/class-eg.dot +++ b/testdata/dot-ref/class-eg.dot @@ -1,24 +1,24 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UMLGraph version R5_6-9-g37cd34 (http://www.umlgraph.org/) +# Generated by UMLGraph version 281411 (http://www.spinellis.gr/umlgraph/) # digraph G { graph [fontnames="svg"] edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10,color="black"]; -node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; -nodesep=0.25; -ranksep=0.5; -// Person -c30 [label=<
Person
>]; -// Employee -c31 [label=<
Employee
>]; -// Client -c32 [label=<
Client
>]; +node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; +nodesep=0.25; +ranksep=0.5; +// Person +c120 [label=<
Person
>]; +// Employee +c121 [label=<
Employee
>]; +// Client +c122 [label=<
Client
>]; // Employee extends Person -c30 -> c31 [arrowtail=empty,dir=back,weight=10]; +c120 -> c121 [arrowtail=empty,dir=back,weight=10]; // Client extends Person -c30 -> c32 [arrowtail=empty,dir=back,weight=10]; +c120 -> c122 [arrowtail=empty,dir=back,weight=10]; } - + diff --git a/testdata/dot-ref/classadd.dot b/testdata/dot-ref/classadd.dot index acc4817..04d9de4 100644 --- a/testdata/dot-ref/classadd.dot +++ b/testdata/dot-ref/classadd.dot @@ -1,16 +1,16 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UMLGraph version R5_6-9-g37cd34 (http://www.umlgraph.org/) +# Generated by UMLGraph version 281411 (http://www.spinellis.gr/umlgraph/) # digraph G { graph [fontnames="svg"] edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10,color="black"]; -node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; -nodesep=0.25; -ranksep=0.5; -// ActionQueue -c35 [label=<
«container»
ActionQueue
{version = 3.2}
add(a : Action)
add(a : Action, n : int)
{version = 1.0}
remove(n : int)
«query»
length() : int
«helper functions»
reorder()
>]; +node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; +nodesep=0.25; +ranksep=0.5; +// ActionQueue +c72 [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()
>]; } - + diff --git a/testdata/dot-ref/color.dot b/testdata/dot-ref/color.dot index 32ccad6..706034d 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 R5_6-9-g37cd34 (http://www.umlgraph.org/) +# Generated by UMLGraph version 281411 (http://www.spinellis.gr/umlgraph/) # digraph G { @@ -13,18 +13,18 @@ ranksep=0.5; bgcolor=".7 .9 1"; // Pixel -c37 [label=<
Pixel
- x : int
- y : int
>]; +c48 [label=<
Pixel
- x : int
- y : int
>]; // Red -c38 [label=<
Red
>]; +c49 [label=<
Red
>]; // Green -c39 [label=<
Green
>]; +c50 [label=<
Green
>]; // Blue -c40 [label=<
Blue
>]; +c51 [label=<
Blue
>]; // Pixel composed Red -c37 -> c38 [arrowhead=none,arrowtail=diamond,dir=back,weight=6]; +c48 -> c49 [arrowhead=none,arrowtail=diamond,dir=back,weight=6]; // Pixel composed Green -c37 -> c39 [arrowhead=none,arrowtail=diamond,dir=back,weight=6]; +c48 -> c50 [arrowhead=none,arrowtail=diamond,dir=back,weight=6]; // Pixel composed Blue -c37 -> c40 [arrowhead=none,arrowtail=diamond,dir=back,weight=6]; +c48 -> c51 [arrowhead=none,arrowtail=diamond,dir=back,weight=6]; } diff --git a/testdata/dot-ref/ctor.dot b/testdata/dot-ref/ctor.dot index b35fe05..ecb45bd 100644 --- a/testdata/dot-ref/ctor.dot +++ b/testdata/dot-ref/ctor.dot @@ -1,16 +1,16 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UMLGraph version R5_6-9-g37cd34 (http://www.umlgraph.org/) +# Generated by UMLGraph version 281411 (http://www.spinellis.gr/umlgraph/) # digraph G { graph [fontnames="svg"] edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10,color="black"]; -node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; -nodesep=0.25; -ranksep=0.5; -// Junk -c43 [label=<
Junk
- value : int
+ Junk(val : int)
>]; +node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; +nodesep=0.25; +ranksep=0.5; +// Junk +c88 [label=<
Junk
- value : int
+ Junk(val : int)
>]; } - + diff --git a/testdata/dot-ref/disable.dot b/testdata/dot-ref/disable.dot index 7388fd1..4505901 100644 --- a/testdata/dot-ref/disable.dot +++ b/testdata/dot-ref/disable.dot @@ -1,20 +1,20 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UMLGraph version R5_6-9-g37cd34 (http://www.umlgraph.org/) +# Generated by UMLGraph version 281411 (http://www.spinellis.gr/umlgraph/) # digraph G { graph [fontnames="svg"] edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10,color="black"]; -node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; -nodesep=0.25; -ranksep=0.5; -// Person1 -c45 [label=<
Person1
~ address : String
~ name : String
>]; -// Person2 -c46 [label=<
Person2
~ displayName() : String
>]; -// Person3 -c47 [label=<
Person3
address : Address
name : String
displayName() : String
>]; +node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; +nodesep=0.25; +ranksep=0.5; +// Person1 +c74 [label=<
Person1
~ address : String
~ name : String
>]; +// Person2 +c75 [label=<
Person2
~ displayName() : String
>]; +// Person3 +c76 [label=<
Person3
address : Address
name : String
displayName() : String
>]; } - + diff --git a/testdata/dot-ref/extends.dot b/testdata/dot-ref/extends.dot index 6328183..440a3ca 100644 --- a/testdata/dot-ref/extends.dot +++ b/testdata/dot-ref/extends.dot @@ -1,18 +1,18 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UMLGraph version R5_6-9-g37cd34 (http://www.umlgraph.org/) +# Generated by UMLGraph version 281411 (http://www.spinellis.gr/umlgraph/) # digraph G { graph [fontnames="svg"] edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10,color="black"]; -node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; -nodesep=0.25; -ranksep=0.5; -// Base -c48 [label=<
Base
>]; -// Test2 -c49 [label=<
Test2<B extends Base>
>]; +node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; +nodesep=0.25; +ranksep=0.5; +// Base +c39 [label=<
Base
>]; +// Test2 +c40 [label=<
Test2<B extends Base>
>]; } - + diff --git a/testdata/dot-ref/foo.dot b/testdata/dot-ref/foo.dot index 21a8513..a49a397 100644 --- a/testdata/dot-ref/foo.dot +++ b/testdata/dot-ref/foo.dot @@ -1,26 +1,26 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UMLGraph version R5_6-9-g37cd34 (http://www.umlgraph.org/) +# Generated by UMLGraph version 281411 (http://www.spinellis.gr/umlgraph/) # digraph G { graph [fontnames="svg"] edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10,color="black"]; -node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; -nodesep=0.25; -ranksep=0.5; -// a.b.c.UMLOptions -c50 [label=<
UMLOptions
>]; -// a.b.c.UserGroup -c51 [label=<
UserGroup
>]; -// a.b.c.User -c52 [label=<
User
>]; -// a.b.c.Password -c53 [label=<
Password
>]; -// a.b.c.UserGroup assoc a.b.c.User -c51 -> c52 [arrowhead=none,weight=2,taillabel="*", headlabel="*\n\n+user "]; -// a.b.c.User navassoc a.b.c.Password -c52 -> c53 [arrowhead=open,weight=1,taillabel="1\n\n+owner\r", headlabel="*\n\n+key"]; +node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; +nodesep=0.25; +ranksep=0.5; +// a.b.c.UMLOptions +c60 [label=<
UMLOptions
>]; +// a.b.c.UserGroup +c61 [label=<
UserGroup
>]; +// a.b.c.User +c62 [label=<
User
>]; +// a.b.c.Password +c63 [label=<
Password
>]; +// a.b.c.UserGroup assoc a.b.c.User +c61 -> c62 [arrowhead=none,weight=2,taillabel="*",headlabel="*\n\n+user "]; +// a.b.c.User navassoc a.b.c.Password +c62 -> c63 [arrowhead=open,weight=1,taillabel="1\n\n+owner\r",headlabel="*\n\n+key"]; } - + diff --git a/testdata/dot-ref/general.dot b/testdata/dot-ref/general.dot index 85e9787..a349af1 100644 --- a/testdata/dot-ref/general.dot +++ b/testdata/dot-ref/general.dot @@ -1,54 +1,54 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UMLGraph version R5_6-9-g37cd34 (http://www.umlgraph.org/) +# Generated by UMLGraph version 281411 (http://www.spinellis.gr/umlgraph/) # digraph G { graph [fontnames="svg"] edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10,color="black"]; -node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; -nodesep=0.25; -ranksep=0.5; -// Asset -c55 [label=<
Asset
>]; -// InterestBearingItem -c56 [label=<
InterestBearingItem
>]; -// InsurableItem -c57 [label=<
InsurableItem
>]; -// BankAccount -c58 [label=<
BankAccount
>]; -// RealEstate -c59 [label=<
RealEstate
>]; -// Security -c60 [label=<
Security
>]; -// Stock -c61 [label=<
Stock
>]; -// Bond -c62 [label=<
Bond
>]; -// CheckingAccount -c63 [label=<
CheckingAccount
>]; -// SavingsAccount -c64 [label=<
SavingsAccount
>]; +node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; +nodesep=0.25; +ranksep=0.5; +// Asset +c29 [label=<
Asset
>]; +// InterestBearingItem +c30 [label=<
InterestBearingItem
>]; +// InsurableItem +c31 [label=<
InsurableItem
>]; +// BankAccount +c32 [label=<
BankAccount
>]; +// RealEstate +c33 [label=<
RealEstate
>]; +// Security +c34 [label=<
Security
>]; +// Stock +c35 [label=<
Stock
>]; +// Bond +c36 [label=<
Bond
>]; +// CheckingAccount +c37 [label=<
CheckingAccount
>]; +// SavingsAccount +c38 [label=<
SavingsAccount
>]; // BankAccount extends Asset -c55 -> c58 [arrowtail=empty,dir=back,weight=10]; +c29 -> c32 [arrowtail=empty,dir=back,weight=10]; // BankAccount extends InsurableItem -c57 -> c58 [arrowtail=empty,dir=back,weight=10]; +c31 -> c32 [arrowtail=empty,dir=back,weight=10]; // BankAccount extends InterestBearingItem -c56 -> c58 [arrowtail=empty,dir=back,weight=10]; +c30 -> c32 [arrowtail=empty,dir=back,weight=10]; // RealEstate extends Asset -c55 -> c59 [arrowtail=empty,dir=back,weight=10]; +c29 -> c33 [arrowtail=empty,dir=back,weight=10]; // RealEstate extends InsurableItem -c57 -> c59 [arrowtail=empty,dir=back,weight=10]; +c31 -> c33 [arrowtail=empty,dir=back,weight=10]; // Security extends Asset -c55 -> c60 [arrowtail=empty,dir=back,weight=10]; +c29 -> c34 [arrowtail=empty,dir=back,weight=10]; // Stock extends Security -c60 -> c61 [arrowtail=empty,dir=back,weight=10]; +c34 -> c35 [arrowtail=empty,dir=back,weight=10]; // Bond extends Security -c60 -> c62 [arrowtail=empty,dir=back,weight=10]; +c34 -> c36 [arrowtail=empty,dir=back,weight=10]; // CheckingAccount extends BankAccount -c58 -> c63 [arrowtail=empty,dir=back,weight=10]; +c32 -> c37 [arrowtail=empty,dir=back,weight=10]; // SavingsAccount extends BankAccount -c58 -> c64 [arrowtail=empty,dir=back,weight=10]; +c32 -> c38 [arrowtail=empty,dir=back,weight=10]; } - + diff --git a/testdata/dot-ref/java5.dot b/testdata/dot-ref/java5.dot index 18c40e7..2ee9d89 100644 --- a/testdata/dot-ref/java5.dot +++ b/testdata/dot-ref/java5.dot @@ -1,18 +1,18 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UMLGraph version R5_6-9-g37cd34 (http://www.umlgraph.org/) +# Generated by UMLGraph version 281411 (http://www.spinellis.gr/umlgraph/) # digraph G { graph [fontnames="svg"] edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10,color="black"]; -node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; -nodesep=0.25; -ranksep=0.5; -// Java5 -c78 [label=<
Java5
~ state : Java5.States
- specifiedPackages : Set<String>
+ printAll(args : String[])
>]; -// Java5.States -c79 [label=<
«enumeration»
States
start
dash
colon
space
open
w
close
>]; +node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; +nodesep=0.25; +ranksep=0.5; +// Java5 +c58 [label=<
Java5
~ state : Java5.States
- specifiedPackages : Set<String>
+ printAll(args : String[])
>]; +// Java5.States +c59 [label=<
«enumeration»
Java5.States
start
dash
colon
space
open
w
close
>]; } - + diff --git a/testdata/dot-ref/schema.dot b/testdata/dot-ref/schema.dot index 6d97162..b780194 100644 --- a/testdata/dot-ref/schema.dot +++ b/testdata/dot-ref/schema.dot @@ -1,38 +1,38 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UMLGraph version R5_6-9-g37cd34 (http://www.umlgraph.org/) +# Generated by UMLGraph version 281411 (http://www.spinellis.gr/umlgraph/) # digraph G { graph [fontnames="svg"] edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10,color="black"]; -node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; -nodesep=0.25; -ranksep=0.5; -// School -c103 [label=<
School
name : Name
address : String
phone : Number
addStudent()
removeStudent()
getStudent()
getAllStudents()
addDepartment()
removeDepartment()
getDepartment()
getAllDepartments()
>]; -// Department -c104 [label=<
Department
name : Name
addInstructor()
removeInstructor()
getInstructor()
getAllInstructors()
>]; -// Student -c105 [label=<
Student
name : Name
studentID : Number
>]; -// Course -c106 [label=<
Course
name : Name
courseID : Number
>]; -// Instructor -c107 [label=<
Instructor
name : Name
>]; -// School has Student -c103 -> c105 [arrowhead=none,arrowtail=ediamond,dir=back,weight=4,taillabel="1..*", label="Member", headlabel="*"]; -// School composed Department -c103 -> c104 [arrowhead=none,arrowtail=diamond,dir=back,weight=6,taillabel="1..*", label="Has", headlabel="1..*"]; -// Department assoc Course -c104 -> c106 [arrowhead=none,weight=2,taillabel="1..*", headlabel="1..*"]; -// Department assoc Instructor -c104 -> c107 [arrowhead=none,weight=2,taillabel="0..*", headlabel="0..1 chairperson"]; -// Department has Instructor -c104 -> c107 [arrowhead=none,arrowtail=ediamond,dir=back,weight=4,taillabel="1..*", label="AssignedTo", headlabel="1..*"]; -// Student assoc Course -c105 -> c106 [arrowhead=none,weight=2,taillabel="*", label="Attends", headlabel="*"]; -// Instructor assoc Course -c107 -> c106 [arrowhead=none,weight=2,taillabel="1..*", label="Teaches", headlabel="*"]; +node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; +nodesep=0.25; +ranksep=0.5; +// School +c20 [label=<
School
name : Name
address : String
phone : Number
addStudent()
removeStudent()
getStudent()
getAllStudents()
addDepartment()
removeDepartment()
getDepartment()
getAllDepartments()
>]; +// Department +c21 [label=<
Department
name : Name
addInstructor()
removeInstructor()
getInstructor()
getAllInstructors()
>]; +// Student +c22 [label=<
Student
name : Name
studentID : Number
>]; +// Course +c23 [label=<
Course
name : Name
courseID : Number
>]; +// Instructor +c24 [label=<
Instructor
name : Name
>]; +// School composed Department +c20 -> c21 [arrowhead=none,arrowtail=diamond,dir=back,weight=6,taillabel="1..*",label="Has",headlabel="1..*"]; +// School has Student +c20 -> c22 [arrowhead=none,arrowtail=ediamond,dir=back,weight=4,taillabel="1..*",label="Member",headlabel="*"]; +// Department has Instructor +c21 -> c24 [arrowhead=none,arrowtail=ediamond,dir=back,weight=4,taillabel="1..*",label="AssignedTo",headlabel="1..*"]; +// Department assoc Course +c21 -> c23 [arrowhead=none,weight=2,taillabel="1..*",headlabel="1..*"]; +// Department assoc Instructor +c21 -> c24 [arrowhead=none,weight=2,taillabel="0..*",headlabel="0..1 chairperson"]; +// Student assoc Course +c22 -> c23 [arrowhead=none,weight=2,taillabel="*",label="Attends",headlabel="*"]; +// Instructor assoc Course +c24 -> c23 [arrowhead=none,weight=2,taillabel="1..*",label="Teaches",headlabel="*"]; } - + diff --git a/testdata/dot-ref/strip.dot b/testdata/dot-ref/strip.dot index a40df9c..e6a11ad 100644 --- a/testdata/dot-ref/strip.dot +++ b/testdata/dot-ref/strip.dot @@ -1,18 +1,18 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UMLGraph version R5_6-9-g37cd34 (http://www.umlgraph.org/) +# Generated by UMLGraph version 281411 (http://www.spinellis.gr/umlgraph/) # digraph G { graph [fontnames="svg"] edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10,color="black"]; -node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; -nodesep=0.25; -ranksep=0.5; -// Java5 -c109 [label=<
Java5
~ state : Java5.States
+ specifiedPackages : Set<String>
+ printAll(args : String[])
>]; -// Java5.States -c110 [label=<
«enumeration»
States
start
dash
colon
space
open
w
close
>]; +node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; +nodesep=0.25; +ranksep=0.5; +// Java5 +c66 [label=<
Java5
~ state : Java5.States
+ specifiedPackages : Set<String>
+ printAll(args : String[])
>]; +// Java5.States +c67 [label=<
«enumeration»
Java5.States
start
dash
colon
space
open
w
close
>]; } - + diff --git a/testdata/dot-ref/vis.dot b/testdata/dot-ref/vis.dot index db7ad2b..6559dd9 100644 --- a/testdata/dot-ref/vis.dot +++ b/testdata/dot-ref/vis.dot @@ -1,16 +1,16 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UMLGraph version R5_6-9-g37cd34 (http://www.umlgraph.org/) +# Generated by UMLGraph version 281411 (http://www.spinellis.gr/umlgraph/) # digraph G { graph [fontnames="svg"] edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10,color="black"]; -node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; -nodesep=0.25; -ranksep=0.5; -// Toolbar -c120 [label=<
Toolbar
# currentSelection : Tool
# toolCount : Integer
+ pickItem(i : Integer)
+ addTool(t : Tool)
+ removeTool(i : Integer)
+ getTool() : Tool
# checkOrphans()
- compact()
>]; +node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; +nodesep=0.25; +ranksep=0.5; +// Toolbar +c86 [label=<
Toolbar
# currentSelection : Tool
# toolCount : Integer
+ pickItem(i : Integer)
+ addTool(t : Tool)
+ removeTool(i : Integer)
+ getTool() : Tool
# checkOrphans()
- compact()
>]; } - + diff --git a/testdata/umldoc-ref/allclasses-frame.html b/testdata/umldoc-ref/allclasses-frame.html index c947c3d..dafee06 100644 --- a/testdata/umldoc-ref/allclasses-frame.html +++ b/testdata/umldoc-ref/allclasses-frame.html @@ -1,23 +1,23 @@ - - - - - -All Classes - - - - - -

All Classes

-
- -
- - + + + + + +All Classes + + + + + +

All Classes

+
+ +
+ + diff --git a/testdata/umldoc-ref/allclasses-noframe.html b/testdata/umldoc-ref/allclasses-noframe.html index 4980e93..221a8c0 100644 --- a/testdata/umldoc-ref/allclasses-noframe.html +++ b/testdata/umldoc-ref/allclasses-noframe.html @@ -1,23 +1,23 @@ - - - - - -All Classes - - - - - -

All Classes

-
- -
- - + + + + + +All Classes + + + + + +

All Classes

+
+ +
+ + diff --git a/testdata/umldoc-ref/constant-values.html b/testdata/umldoc-ref/constant-values.html index 2853bc5..5a3a210 100644 --- a/testdata/umldoc-ref/constant-values.html +++ b/testdata/umldoc-ref/constant-values.html @@ -1,122 +1,122 @@ - - - - - -Constant Field Values - - - - - - - - -
- - -
Skip navigation links
- - - - -
-
-
    -
  • Prev
    • -
  • Next
    • -
- - -
- -
- - -
- -
-

Constant Field Values

-

Contents

-
- -
- - -
Skip navigation links
- - - - -
-
-
    -
  • Prev
    • -
  • Next
    • -
- - -
- -
- - -
- - - + + + + + +Constant Field Values + + + + + + + + +
+ + +
Skip navigation links
+ + + + +
+
+
    +
  • Prev
    • +
  • Next
    • +
+ + +
+ +
+ + +
+ +
+

Constant Field Values

+

Contents

+
+ +
+ + +
Skip navigation links
+ + + + +
+
+
    +
  • Prev
    • +
  • Next
    • +
+ + +
+ +
+ + +
+ + + diff --git a/testdata/umldoc-ref/deprecated-list.html b/testdata/umldoc-ref/deprecated-list.html index 566d2c4..eabc229 100644 --- a/testdata/umldoc-ref/deprecated-list.html +++ b/testdata/umldoc-ref/deprecated-list.html @@ -1,122 +1,122 @@ - - - - - -Deprecated List - - - - - - - - -
- - -
Skip navigation links
- - - - -
-
-
    -
  • Prev
    • -
  • Next
    • -
- - -
- -
- - -
- -
-

Deprecated API

-

Contents

-
- -
- - -
Skip navigation links
- - - - -
-
-
    -
  • Prev
    • -
  • Next
    • -
- - -
- -
- - -
- - - + + + + + +Deprecated List + + + + + + + + +
+ + +
Skip navigation links
+ + + + +
+
+
    +
  • Prev
    • +
  • Next
    • +
+ + +
+ +
+ + +
+ +
+

Deprecated API

+

Contents

+
+ +
+ + +
Skip navigation links
+ + + + +
+
+
    +
  • Prev
    • +
  • Next
    • +
+ + +
+ +
+ + +
+ + + diff --git a/testdata/umldoc-ref/gr/spinellis/invoice/Customer.dot b/testdata/umldoc-ref/gr/spinellis/invoice/Customer.dot index 995b9bb..bdcee53 100644 --- a/testdata/umldoc-ref/gr/spinellis/invoice/Customer.dot +++ b/testdata/umldoc-ref/gr/spinellis/invoice/Customer.dot @@ -1,23 +1,24 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UMLGraph version R5_7_2-11-g86574a (http://www.umlgraph.org/) +# Generated by UMLGraph version 281411 (http://www.spinellis.gr/umlgraph/) # digraph G { - edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; - node [fontname="Helvetica",fontsize=10,shape=plaintext]; - nodesep=0.25; - ranksep=0.5; - // gr.spinellis.invoice.Invoice - c33 [label=<
Invoice
>, URL="./Invoice.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; - // gr.spinellis.invoice.Customer - c34 [label=<
Customer
>, URL="./Customer.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; - // gr.spinellis.invoice.Invoice NAVASSOC gr.spinellis.invoice.Customer - c33:p -> c34:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open]; - // gr.spinellis.invoice.Customer NAVASSOC java.lang.String - c34:p -> c44:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open]; - // java.lang.String - c44 [label=<
String
java.lang
>, URL="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; +graph [fontnames="svg"] +edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10,color="black"]; +node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; +nodesep=0.25; +ranksep=0.5; +// gr.spinellis.invoice.Customer +c32 [label=<
Customer
>, URL="Customer.html"]; +// gr.spinellis.invoice.Invoice +c34 [label=<
Invoice
>, URL="Invoice.html"]; +// gr.spinellis.invoice.Customer navassoc java.lang.String +c32 -> c37 [arrowhead=open,weight=1]; +// gr.spinellis.invoice.Invoice navassoc gr.spinellis.invoice.Customer +c34 -> c32 [arrowhead=open,weight=1]; +// java.lang.String +c37 [label=<
String
java.lang
>, URL="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html"]; } - + diff --git a/testdata/umldoc-ref/gr/spinellis/invoice/Customer.html b/testdata/umldoc-ref/gr/spinellis/invoice/Customer.html index 959bfeb..7dd62b9 100644 --- a/testdata/umldoc-ref/gr/spinellis/invoice/Customer.html +++ b/testdata/umldoc-ref/gr/spinellis/invoice/Customer.html @@ -1,273 +1,273 @@ - - - - - -Customer - - - - - - - - -
- - -
Skip navigation links
- - - - -
-
- - - -
- -
-
- - -
- - -
- - -
-
gr.spinellis.invoice
-

Class Customer

- -
-
-
-
    -
  • java.lang.Object
    • -
  • -
      -
    • gr.spinellis.invoice.Customer
      • -
    -
    • -
-
-
    -
  • -
    -
    -
    public class Customer
-extends java.lang.Object
    -
    • -
-
-
-
    -
  • - -
      -
    • - - -

      Field Summary

      - - - - - - - - - - -
      Fields 
      Modifier and TypeField and Description
      (package private) java.lang.Stringname 
      -
      • -
    - -
      -
    • - - -

      Constructor Summary

      - - - - - - - - -
      Constructors 
      Constructor and Description
      Customer() 
      -
      • -
    - -
      -
    • - - -

      Method Summary

      -
        -
      • - - -

        Methods inherited from class java.lang.Object

        -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
        • -
      -
      • -
    -
    • -
-
-
-
    -
  • - -
      -
    • - - -

      Field Detail

      - - - -
        -
      • -

        name

        -
        java.lang.String name
        -
        • -
      -
      • -
    - -
      -
    • - - -

      Constructor Detail

      - - - -
        -
      • -

        Customer

        -
        public Customer()
        -
        • -
      -
      • -
    -
    • -
-
-
- - -
- - -
Skip navigation links
- - - - -
-
- - - -
- -
-
- - -
- - -
- - - + + + + + +Customer + + + + + + + + +
+ + +
Skip navigation links
+ + + + +
+
+ + + +
+ +
+
+ + +
+ + +
+ + +
+
gr.spinellis.invoice
+

Class Customer

+ +
+
+
+
    +
  • java.lang.Object
    • +
  • +
      +
    • gr.spinellis.invoice.Customer
      • +
    +
    • +
+
+
    +
  • +
    +
    +
    public class Customer
+extends java.lang.Object
    +
    • +
+
+
+
    +
  • + +
      +
    • + + +

      Field Summary

      + + + + + + + + + + +
      Fields 
      Modifier and TypeField and Description
      (package private) java.lang.Stringname 
      +
      • +
    + +
      +
    • + + +

      Constructor Summary

      + + + + + + + + +
      Constructors 
      Constructor and Description
      Customer() 
      +
      • +
    + +
      +
    • + + +

      Method Summary

      +
        +
      • + + +

        Methods inherited from class java.lang.Object

        +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
        • +
      +
      • +
    +
    • +
+
+
+
    +
  • + +
      +
    • + + +

      Field Detail

      + + + +
        +
      • +

        name

        +
        java.lang.String name
        +
        • +
      +
      • +
    + +
      +
    • + + +

      Constructor Detail

      + + + +
        +
      • +

        Customer

        +
        public Customer()
        +
        • +
      +
      • +
    +
    • +
+
+
+ + +
+ + +
Skip navigation links
+ + + + +
+
+ + + +
+ +
+
+ + +
+ + +
+ + + diff --git a/testdata/umldoc-ref/gr/spinellis/invoice/Invoice.dot b/testdata/umldoc-ref/gr/spinellis/invoice/Invoice.dot index 19d299b..b3ee00a 100644 --- a/testdata/umldoc-ref/gr/spinellis/invoice/Invoice.dot +++ b/testdata/umldoc-ref/gr/spinellis/invoice/Invoice.dot @@ -1,33 +1,34 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UMLGraph version R5_7_2-11-g86574a (http://www.umlgraph.org/) +# Generated by UMLGraph version 281411 (http://www.spinellis.gr/umlgraph/) # digraph G { - edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; - node [fontname="Helvetica",fontsize=10,shape=plaintext]; - nodesep=0.25; - ranksep=0.5; - // gr.spinellis.invoice.InvoiceItem - c45 [label=<
InvoiceItem
>, URL="./InvoiceItem.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; - // gr.spinellis.invoice.Invoice - c46 [label=<
Invoice
>, URL="./Invoice.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; - // gr.spinellis.invoice.Customer - c47 [label=<
Customer
>, URL="./Customer.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; - // gr.spinellis.product.Product - c48 [label=<
Product
gr.spinellis.product
>, URL="../product/Product.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; - // gr.spinellis.invoice.InvoiceItem NAVASSOC gr.spinellis.product.Product - c45:p -> c48:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open]; - // gr.spinellis.invoice.Invoice NAVASSOC gr.spinellis.invoice.InvoiceItem - c46:p -> c45:p [taillabel="", label="", headlabel="*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open]; - // gr.spinellis.invoice.Invoice NAVASSOC gr.spinellis.invoice.Customer - c46:p -> c47:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open]; - // gr.spinellis.invoice.Invoice NAVASSOC java.util.Date - c46:p -> c50:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open]; - // gr.spinellis.invoice.Invoice DEPEND gr.spinellis.product.Product - c46:p -> c48:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open, style=dashed]; - // java.util.Date - c50 [label=<
Date
java.util
>, URL="http://docs.oracle.com/javase/7/docs/api/java/util/Date.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; +graph [fontnames="svg"] +edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10,color="black"]; +node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; +nodesep=0.25; +ranksep=0.5; +// gr.spinellis.invoice.Customer +c45 [label=<
Customer
>, URL="Customer.html"]; +// gr.spinellis.invoice.InvoiceItem +c46 [label=<
InvoiceItem
>, URL="InvoiceItem.html"]; +// gr.spinellis.invoice.Invoice +c47 [label=<
Invoice
>, URL="Invoice.html"]; +// gr.spinellis.product.Product +c48 [label=<
Product
gr.spinellis.product
>, URL="../product/Product.html"]; +// gr.spinellis.invoice.InvoiceItem navassoc gr.spinellis.product.Product +c46 -> c48 [arrowhead=open,weight=1]; +// gr.spinellis.invoice.Invoice navassoc gr.spinellis.invoice.InvoiceItem +c47 -> c46 [arrowhead=open,weight=1,headlabel="*"]; +// gr.spinellis.invoice.Invoice navassoc gr.spinellis.invoice.Customer +c47 -> c45 [arrowhead=open,weight=1]; +// gr.spinellis.invoice.Invoice navassoc java.util.Date +c47 -> c50 [arrowhead=open,weight=1]; +// gr.spinellis.invoice.Invoice depend gr.spinellis.product.Product +c47 -> c48 [arrowhead=open,style=dashed,weight=0]; +// java.util.Date +c50 [label=<
Date
java.util
>, URL="http://docs.oracle.com/javase/7/docs/api/java/util/Date.html"]; } - + diff --git a/testdata/umldoc-ref/gr/spinellis/invoice/Invoice.html b/testdata/umldoc-ref/gr/spinellis/invoice/Invoice.html index 1d6e890..3a2c50e 100644 --- a/testdata/umldoc-ref/gr/spinellis/invoice/Invoice.html +++ b/testdata/umldoc-ref/gr/spinellis/invoice/Invoice.html @@ -1,348 +1,348 @@ - - - - - -Invoice - - - - - - - - -
- - -
Skip navigation links
- - - - -
-
- - - -
- -
-
- - -
- - -
- - -
-
gr.spinellis.invoice
-

Class Invoice

- -
-
-
-
    -
  • java.lang.Object
    • -
  • -
      -
    • gr.spinellis.invoice.Invoice
      • -
    -
    • -
-
-
    -
  • -
    -
    -
    public class Invoice
-extends java.lang.Object
    -
    • -
-
-
-
    -
  • - - - -
      -
    • - - -

      Constructor Summary

      - - - - - - - - -
      Constructors 
      Constructor and Description
      Invoice() 
      -
      • -
    - -
      -
    • - - -

      Method Summary

      - - - - - - - - - - -
      All Methods Instance Methods Concrete Methods 
      Modifier and TypeMethod and Description
      voidaddItem(Product p, - int quantity) 
      -
        -
      • - - -

        Methods inherited from class java.lang.Object

        -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
        • -
      -
      • -
    -
    • -
-
-
-
    -
  • - -
      -
    • - - -

      Field Detail

      - - - -
        -
      • -

        total

        -
        public double total
        -
        • -
      - - - - - - - -
        -
      • -

        customer

        -
        public Customer customer
        -
        • -
      - - - -
        -
      • -

        invoiceDate

        -
        public java.util.Date invoiceDate
        -
        • -
      -
      • -
    - -
      -
    • - - -

      Constructor Detail

      - - - -
        -
      • -

        Invoice

        -
        public Invoice()
        -
        • -
      -
      • -
    - -
      -
    • - - -

      Method Detail

      - - - -
        -
      • -

        addItem

        -
        public void addItem(Product p,
-                    int quantity)
        -
        • -
      -
      • -
    -
    • -
-
-
- - -
- - -
Skip navigation links
- - - - -
-
- - - -
- -
-
- - -
- - -
- - - + + + + + +Invoice + + + + + + + + +
+ + +
Skip navigation links
+ + + + +
+
+ + + +
+ +
+
+ + +
+ + +
+ + +
+
gr.spinellis.invoice
+

Class Invoice

+ +
+
+
+
    +
  • java.lang.Object
    • +
  • +
      +
    • gr.spinellis.invoice.Invoice
      • +
    +
    • +
+
+
    +
  • +
    +
    +
    public class Invoice
+extends java.lang.Object
    +
    • +
+
+
+
    +
  • + + + +
      +
    • + + +

      Constructor Summary

      + + + + + + + + +
      Constructors 
      Constructor and Description
      Invoice() 
      +
      • +
    + +
      +
    • + + +

      Method Summary

      + + + + + + + + + + +
      All Methods Instance Methods Concrete Methods 
      Modifier and TypeMethod and Description
      voidaddItem(Product p, + int quantity) 
      +
        +
      • + + +

        Methods inherited from class java.lang.Object

        +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
        • +
      +
      • +
    +
    • +
+
+
+
    +
  • + +
      +
    • + + +

      Field Detail

      + + + +
        +
      • +

        total

        +
        public double total
        +
        • +
      + + + + + + + +
        +
      • +

        customer

        +
        public Customer customer
        +
        • +
      + + + +
        +
      • +

        invoiceDate

        +
        public java.util.Date invoiceDate
        +
        • +
      +
      • +
    + +
      +
    • + + +

      Constructor Detail

      + + + +
        +
      • +

        Invoice

        +
        public Invoice()
        +
        • +
      +
      • +
    + +
      +
    • + + +

      Method Detail

      + + + +
        +
      • +

        addItem

        +
        public void addItem(Product p,
+                    int quantity)
        +
        • +
      +
      • +
    +
    • +
+
+
+ + +
+ + +
Skip navigation links
+ + + + +
+
+ + + +
+ +
+
+ + +
+ + +
+ + + diff --git a/testdata/umldoc-ref/gr/spinellis/invoice/InvoiceItem.dot b/testdata/umldoc-ref/gr/spinellis/invoice/InvoiceItem.dot index e55613f..03af3e8 100644 --- a/testdata/umldoc-ref/gr/spinellis/invoice/InvoiceItem.dot +++ b/testdata/umldoc-ref/gr/spinellis/invoice/InvoiceItem.dot @@ -1,25 +1,26 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UMLGraph version R5_7_2-11-g86574a (http://www.umlgraph.org/) +# Generated by UMLGraph version 281411 (http://www.spinellis.gr/umlgraph/) # digraph G { - edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; - node [fontname="Helvetica",fontsize=10,shape=plaintext]; - nodesep=0.25; - ranksep=0.5; - // gr.spinellis.invoice.InvoiceItem - c51 [label=<
InvoiceItem
>, URL="./InvoiceItem.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; - // gr.spinellis.invoice.Invoice - c52 [label=<
Invoice
>, URL="./Invoice.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; - // gr.spinellis.product.Product - c54 [label=<
Product
gr.spinellis.product
>, URL="../product/Product.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; - // gr.spinellis.invoice.InvoiceItem NAVASSOC gr.spinellis.product.Product - c51:p -> c54:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open]; - // gr.spinellis.invoice.Invoice NAVASSOC gr.spinellis.invoice.InvoiceItem - c52:p -> c51:p [taillabel="", label="", headlabel="*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open]; - // gr.spinellis.invoice.Invoice DEPEND gr.spinellis.product.Product - c52:p -> c54:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open, style=dashed]; +graph [fontnames="svg"] +edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10,color="black"]; +node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; +nodesep=0.25; +ranksep=0.5; +// gr.spinellis.invoice.InvoiceItem +c52 [label=<
InvoiceItem
>, URL="InvoiceItem.html"]; +// gr.spinellis.invoice.Invoice +c53 [label=<
Invoice
>, URL="Invoice.html"]; +// gr.spinellis.product.Product +c54 [label=<
Product
gr.spinellis.product
>, URL="../product/Product.html"]; +// gr.spinellis.invoice.InvoiceItem navassoc gr.spinellis.product.Product +c52 -> c54 [arrowhead=open,weight=1]; +// gr.spinellis.invoice.Invoice navassoc gr.spinellis.invoice.InvoiceItem +c53 -> c52 [arrowhead=open,weight=1,headlabel="*"]; +// gr.spinellis.invoice.Invoice depend gr.spinellis.product.Product +c53 -> c54 [arrowhead=open,style=dashed,weight=0]; } - + diff --git a/testdata/umldoc-ref/gr/spinellis/invoice/InvoiceItem.html b/testdata/umldoc-ref/gr/spinellis/invoice/InvoiceItem.html index fe26859..0058dda 100644 --- a/testdata/umldoc-ref/gr/spinellis/invoice/InvoiceItem.html +++ b/testdata/umldoc-ref/gr/spinellis/invoice/InvoiceItem.html @@ -1,286 +1,286 @@ - - - - - -InvoiceItem - - - - - - - - -
- - -
Skip navigation links
- - - - -
-
- - - -
- -
-
- - -
- - -
- - -
-
gr.spinellis.invoice
-

Class InvoiceItem

- -
-
-
-
    -
  • java.lang.Object
    • -
  • -
      -
    • gr.spinellis.invoice.InvoiceItem
      • -
    -
    • -
-
-
    -
  • -
    -
    -
    public class InvoiceItem
-extends java.lang.Object
    -
    • -
-
-
-
    -
  • - -
      -
    • - - -

      Field Summary

      - - - - - - - - - - - - - - -
      Fields 
      Modifier and TypeField and Description
      Productproduct 
      intquantity 
      -
      • -
    - -
      -
    • - - -

      Constructor Summary

      - - - - - - - - -
      Constructors 
      Constructor and Description
      InvoiceItem() 
      -
      • -
    - -
      -
    • - - -

      Method Summary

      -
        -
      • - - -

        Methods inherited from class java.lang.Object

        -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
        • -
      -
      • -
    -
    • -
-
-
-
    -
  • - -
      -
    • - - -

      Field Detail

      - - - -
        -
      • -

        product

        -
        public Product product
        -
        • -
      - - - -
        -
      • -

        quantity

        -
        public int quantity
        -
        • -
      -
      • -
    - -
      -
    • - - -

      Constructor Detail

      - - - -
        -
      • -

        InvoiceItem

        -
        public InvoiceItem()
        -
        • -
      -
      • -
    -
    • -
-
-
- - -
- - -
Skip navigation links
- - - - -
-
- - - -
- -
-
- - -
- - -
- - - + + + + + +InvoiceItem + + + + + + + + +
+ + +
Skip navigation links
+ + + + +
+
+ + + +
+ +
+
+ + +
+ + +
+ + +
+
gr.spinellis.invoice
+

Class InvoiceItem

+ +
+
+
+
    +
  • java.lang.Object
    • +
  • +
      +
    • gr.spinellis.invoice.InvoiceItem
      • +
    +
    • +
+
+
    +
  • +
    +
    +
    public class InvoiceItem
+extends java.lang.Object
    +
    • +
+
+
+
    +
  • + +
      +
    • + + +

      Field Summary

      + + + + + + + + + + + + + + +
      Fields 
      Modifier and TypeField and Description
      Productproduct 
      intquantity 
      +
      • +
    + +
      +
    • + + +

      Constructor Summary

      + + + + + + + + +
      Constructors 
      Constructor and Description
      InvoiceItem() 
      +
      • +
    + +
      +
    • + + +

      Method Summary

      +
        +
      • + + +

        Methods inherited from class java.lang.Object

        +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
        • +
      +
      • +
    +
    • +
+
+
+
    +
  • + +
      +
    • + + +

      Field Detail

      + + + +
        +
      • +

        product

        +
        public Product product
        +
        • +
      + + + +
        +
      • +

        quantity

        +
        public int quantity
        +
        • +
      +
      • +
    + +
      +
    • + + +

      Constructor Detail

      + + + +
        +
      • +

        InvoiceItem

        +
        public InvoiceItem()
        +
        • +
      +
      • +
    +
    • +
+
+
+ + +
+ + +
Skip navigation links
+ + + + +
+
+ + + +
+ +
+
+ + +
+ + +
+ + + 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 a2ad5de..6005726 100644 --- a/testdata/umldoc-ref/gr/spinellis/invoice/gr.spinellis.invoice.dot +++ b/testdata/umldoc-ref/gr/spinellis/invoice/gr.spinellis.invoice.dot @@ -1,23 +1,24 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UMLGraph version R5_7_2-11-g86574a (http://www.umlgraph.org/) +# Generated by UMLGraph version 281411 (http://www.spinellis.gr/umlgraph/) # digraph G { - edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; - node [fontname="Helvetica",fontsize=10,shape=plaintext]; - nodesep=0.25; - ranksep=0.5; - // gr.spinellis.invoice.InvoiceItem - c0 [label=<
InvoiceItem
>, URL="./InvoiceItem.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; - // gr.spinellis.invoice.Invoice - c1 [label=<
Invoice
>, URL="./Invoice.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; - // gr.spinellis.invoice.Customer - c2 [label=<
Customer
>, URL="./Customer.html", 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 - c1:p -> c2:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open]; +graph [fontnames="svg"] +edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10,color="black"]; +node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; +nodesep=0.25; +ranksep=0.5; +// gr.spinellis.invoice.Customer +c0 [label=<
Customer
>, URL="Customer.html"]; +// gr.spinellis.invoice.InvoiceItem +c1 [label=<
InvoiceItem
>, URL="InvoiceItem.html"]; +// gr.spinellis.invoice.Invoice +c2 [label=<
Invoice
>, URL="Invoice.html"]; +// gr.spinellis.invoice.Invoice navassoc gr.spinellis.invoice.InvoiceItem +c2 -> c1 [arrowhead=open,weight=1,headlabel="*"]; +// gr.spinellis.invoice.Invoice navassoc gr.spinellis.invoice.Customer +c2 -> c0 [arrowhead=open,weight=1]; } - + diff --git a/testdata/umldoc-ref/gr/spinellis/invoice/package-frame.html b/testdata/umldoc-ref/gr/spinellis/invoice/package-frame.html index d5b4092..aba2954 100644 --- a/testdata/umldoc-ref/gr/spinellis/invoice/package-frame.html +++ b/testdata/umldoc-ref/gr/spinellis/invoice/package-frame.html @@ -1,22 +1,22 @@ - - - - - -gr.spinellis.invoice - - - - - -

gr.spinellis.invoice

-
-

Classes

- -
- - + + + + + +gr.spinellis.invoice + + + + + +

gr.spinellis.invoice

+
+

Classes

+ +
+ + diff --git a/testdata/umldoc-ref/gr/spinellis/invoice/package-summary.html b/testdata/umldoc-ref/gr/spinellis/invoice/package-summary.html index 2ee10ac..0b23ed8 100644 --- a/testdata/umldoc-ref/gr/spinellis/invoice/package-summary.html +++ b/testdata/umldoc-ref/gr/spinellis/invoice/package-summary.html @@ -1,150 +1,150 @@ - - - - - -gr.spinellis.invoice - - - - - - - - -
- - -
Skip navigation links
- - - - -
-
- - - -
- -
- - -
- -
-

Package gr.spinellis.invoice

- -
-
-
- -
- -
- - -
Skip navigation links
- - - - -
-
- - - -
- -
- - -
- - - + + + + + +gr.spinellis.invoice + + + + + + + + +
+ + +
Skip navigation links
+ + + + +
+
+ + + +
+ +
+ + +
+ +
+

Package gr.spinellis.invoice

+ +
+
+
+ +
+ +
+ + +
Skip navigation links
+ + + + +
+
+ + + +
+ +
+ + +
+ + + diff --git a/testdata/umldoc-ref/gr/spinellis/invoice/package-tree.html b/testdata/umldoc-ref/gr/spinellis/invoice/package-tree.html index cac2ec7..fc66c1a 100644 --- a/testdata/umldoc-ref/gr/spinellis/invoice/package-tree.html +++ b/testdata/umldoc-ref/gr/spinellis/invoice/package-tree.html @@ -1,137 +1,137 @@ - - - - - -gr.spinellis.invoice Class Hierarchy - - - - - - - - -
- - -
Skip navigation links
- - - - -
-
- - - -
- -
- - -
- -
-

Hierarchy For Package gr.spinellis.invoice

-Package Hierarchies: - -
-
-

Class Hierarchy

- -
- -
- - -
Skip navigation links
- - - - -
-
- - - -
- -
- - -
- - - + + + + + +gr.spinellis.invoice Class Hierarchy + + + + + + + + +
+ + +
Skip navigation links
+ + + + +
+
+ + + +
+ +
+ + +
+ +
+

Hierarchy For Package gr.spinellis.invoice

+Package Hierarchies: + +
+
+

Class Hierarchy

+ +
+ +
+ + +
Skip navigation links
+ + + + +
+
+ + + +
+ +
+ + +
+ + + diff --git a/testdata/umldoc-ref/gr/spinellis/product/Category.dot b/testdata/umldoc-ref/gr/spinellis/product/Category.dot index 94aa1d1..59a1980 100644 --- a/testdata/umldoc-ref/gr/spinellis/product/Category.dot +++ b/testdata/umldoc-ref/gr/spinellis/product/Category.dot @@ -1,25 +1,26 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UMLGraph version R5_7_2-11-g86574a (http://www.umlgraph.org/) +# Generated by UMLGraph version 281411 (http://www.spinellis.gr/umlgraph/) # digraph G { - edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; - node [fontname="Helvetica",fontsize=10,shape=plaintext]; - nodesep=0.25; - ranksep=0.5; - // gr.spinellis.product.Product - c20 [label=<
Product
>, URL="./Product.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; - // gr.spinellis.product.Category - c21 [label=<
Category
>, URL="./Category.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; - // gr.spinellis.product.Product NAVASSOC java.lang.String - c20:p -> c27:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open]; - // gr.spinellis.product.Product NAVASSOC gr.spinellis.product.Category - c20:p -> c21:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open]; - // gr.spinellis.product.Category NAVASSOC java.lang.String - c21:p -> c27:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open]; - // java.lang.String - c27 [label=<
String
java.lang
>, URL="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; +graph [fontnames="svg"] +edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10,color="black"]; +node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; +nodesep=0.25; +ranksep=0.5; +// gr.spinellis.product.Product +c20 [label=<
Product
>, URL="Product.html"]; +// gr.spinellis.product.Category +c21 [label=<
Category
>, URL="Category.html"]; +// gr.spinellis.product.Product navassoc java.lang.String +c20 -> c27 [arrowhead=open,weight=1]; +// gr.spinellis.product.Product navassoc gr.spinellis.product.Category +c20 -> c21 [arrowhead=open,weight=1]; +// gr.spinellis.product.Category navassoc java.lang.String +c21 -> c27 [arrowhead=open,weight=1]; +// java.lang.String +c27 [label=<
String
java.lang
>, URL="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html"]; } - + diff --git a/testdata/umldoc-ref/gr/spinellis/product/Category.html b/testdata/umldoc-ref/gr/spinellis/product/Category.html index 1e5c227..de44e83 100644 --- a/testdata/umldoc-ref/gr/spinellis/product/Category.html +++ b/testdata/umldoc-ref/gr/spinellis/product/Category.html @@ -1,286 +1,286 @@ - - - - - -Category - - - - - - - - -
- - -
Skip navigation links
- - - - -
-
- - - -
- -
-
- - -
- - -
- - -
-
gr.spinellis.product
-

Class Category

- -
-
-
-
    -
  • java.lang.Object
    • -
  • -
      -
    • gr.spinellis.product.Category
      • -
    -
    • -
-
-
    -
  • -
    -
    -
    public class Category
-extends java.lang.Object
    -
    • -
-
-
-
    -
  • - -
      -
    • - - -

      Field Summary

      - - - - - - - - - - - - - - -
      Fields 
      Modifier and TypeField and Description
      java.lang.Stringname 
      (package private) java.util.List<Product>products 
      -
      • -
    - -
      -
    • - - -

      Constructor Summary

      - - - - - - - - -
      Constructors 
      Constructor and Description
      Category() 
      -
      • -
    - -
      -
    • - - -

      Method Summary

      -
        -
      • - - -

        Methods inherited from class java.lang.Object

        -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
        • -
      -
      • -
    -
    • -
-
-
-
    -
  • - -
      -
    • - - -

      Field Detail

      - - - -
        -
      • -

        name

        -
        public java.lang.String name
        -
        • -
      - - - -
        -
      • -

        products

        -
        java.util.List<Product> products
        -
        • -
      -
      • -
    - -
      -
    • - - -

      Constructor Detail

      - - - -
        -
      • -

        Category

        -
        public Category()
        -
        • -
      -
      • -
    -
    • -
-
-
- - -
- - -
Skip navigation links
- - - - -
-
- - - -
- -
-
- - -
- - -
- - - + + + + + +Category + + + + + + + + +
+ + +
Skip navigation links
+ + + + +
+
+ + + +
+ +
+
+ + +
+ + +
+ + +
+
gr.spinellis.product
+

Class Category

+ +
+
+
+
    +
  • java.lang.Object
    • +
  • +
      +
    • gr.spinellis.product.Category
      • +
    +
    • +
+
+
    +
  • +
    +
    +
    public class Category
+extends java.lang.Object
    +
    • +
+
+
+
    +
  • + +
      +
    • + + +

      Field Summary

      + + + + + + + + + + + + + + +
      Fields 
      Modifier and TypeField and Description
      java.lang.Stringname 
      (package private) java.util.List<Product>products 
      +
      • +
    + +
      +
    • + + +

      Constructor Summary

      + + + + + + + + +
      Constructors 
      Constructor and Description
      Category() 
      +
      • +
    + +
      +
    • + + +

      Method Summary

      +
        +
      • + + +

        Methods inherited from class java.lang.Object

        +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
        • +
      +
      • +
    +
    • +
+
+
+
    +
  • + +
      +
    • + + +

      Field Detail

      + + + +
        +
      • +

        name

        +
        public java.lang.String name
        +
        • +
      + + + +
        +
      • +

        products

        +
        java.util.List<Product> products
        +
        • +
      +
      • +
    + +
      +
    • + + +

      Constructor Detail

      + + + +
        +
      • +

        Category

        +
        public Category()
        +
        • +
      +
      • +
    +
    • +
+
+
+ + +
+ + +
Skip navigation links
+ + + + +
+
+ + + +
+ +
+
+ + +
+ + +
+ + + diff --git a/testdata/umldoc-ref/gr/spinellis/product/Product.dot b/testdata/umldoc-ref/gr/spinellis/product/Product.dot index e34b4d9..e4e5d0f 100644 --- a/testdata/umldoc-ref/gr/spinellis/product/Product.dot +++ b/testdata/umldoc-ref/gr/spinellis/product/Product.dot @@ -1,35 +1,36 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UMLGraph version R5_7_2-11-g86574a (http://www.umlgraph.org/) +# Generated by UMLGraph version 281411 (http://www.spinellis.gr/umlgraph/) # digraph G { - edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; - node [fontname="Helvetica",fontsize=10,shape=plaintext]; - nodesep=0.25; - ranksep=0.5; - // gr.spinellis.invoice.InvoiceItem - c56 [label=<
InvoiceItem
gr.spinellis.invoice
>, URL="../invoice/InvoiceItem.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; - // gr.spinellis.invoice.Invoice - c57 [label=<
Invoice
gr.spinellis.invoice
>, URL="../invoice/Invoice.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; - // gr.spinellis.product.Product - c59 [label=<
Product
>, URL="./Product.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; - // gr.spinellis.product.Category - c60 [label=<
Category
>, URL="./Category.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; - // gr.spinellis.invoice.InvoiceItem NAVASSOC gr.spinellis.product.Product - c56:p -> c59:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open]; - // gr.spinellis.invoice.Invoice NAVASSOC gr.spinellis.invoice.InvoiceItem - c57:p -> c56:p [taillabel="", label="", headlabel="*", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open]; - // 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.invoice.Invoice DEPEND gr.spinellis.product.Product - c57:p -> c59:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open, style=dashed]; - // java.lang.String - c61 [label=<
String
java.lang
>, URL="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; +graph [fontnames="svg"] +edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10,color="black"]; +node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; +nodesep=0.25; +ranksep=0.5; +// gr.spinellis.invoice.InvoiceItem +c57 [label=<
InvoiceItem
gr.spinellis.invoice
>, URL="../invoice/InvoiceItem.html"]; +// gr.spinellis.invoice.Invoice +c58 [label=<
Invoice
gr.spinellis.invoice
>, URL="../invoice/Invoice.html"]; +// gr.spinellis.product.Product +c59 [label=<
Product
>, URL="Product.html"]; +// gr.spinellis.product.Category +c60 [label=<
Category
>, URL="Category.html"]; +// gr.spinellis.invoice.InvoiceItem navassoc gr.spinellis.product.Product +c57 -> c59 [arrowhead=open,weight=1]; +// gr.spinellis.invoice.Invoice navassoc gr.spinellis.invoice.InvoiceItem +c58 -> c57 [arrowhead=open,weight=1,headlabel="*"]; +// gr.spinellis.product.Product navassoc java.lang.String +c59 -> c61 [arrowhead=open,weight=1]; +// gr.spinellis.product.Product navassoc gr.spinellis.product.Category +c59 -> c60 [arrowhead=open,weight=1]; +// gr.spinellis.product.Category navassoc java.lang.String +c60 -> c61 [arrowhead=open,weight=1]; +// gr.spinellis.invoice.Invoice depend gr.spinellis.product.Product +c58 -> c59 [arrowhead=open,style=dashed,weight=0]; +// java.lang.String +c61 [label=<
String
java.lang
>, URL="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html"]; } - + diff --git a/testdata/umldoc-ref/gr/spinellis/product/Product.html b/testdata/umldoc-ref/gr/spinellis/product/Product.html index 47ffa0f..7e021a0 100644 --- a/testdata/umldoc-ref/gr/spinellis/product/Product.html +++ b/testdata/umldoc-ref/gr/spinellis/product/Product.html @@ -1,312 +1,312 @@ - - - - - -Product - - - - - - - - -
- - -
Skip navigation links
- - - - -
-
- - - -
- -
-
- - -
- - -
- - -
-
gr.spinellis.product
-

Class Product

- -
-
-
-
    -
  • java.lang.Object
    • -
  • -
      -
    • gr.spinellis.product.Product
      • -
    -
    • -
-
-
    -
  • -
    -
    -
    public class Product
-extends java.lang.Object
    -
    • -
-
-
-
    -
  • - -
      -
    • - - -

      Field Summary

      - - - - - - - - - - - - - - - - - - - - - - -
      Fields 
      Modifier and TypeField and Description
      Categorycategory 
      java.lang.Stringname 
      doubleprice 
      intstock 
      -
      • -
    - -
      -
    • - - -

      Constructor Summary

      - - - - - - - - -
      Constructors 
      Constructor and Description
      Product() 
      -
      • -
    - -
      -
    • - - -

      Method Summary

      -
        -
      • - - -

        Methods inherited from class java.lang.Object

        -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
        • -
      -
      • -
    -
    • -
-
-
-
    -
  • - -
      -
    • - - -

      Field Detail

      - - - -
        -
      • -

        name

        -
        public java.lang.String name
        -
        • -
      - - - -
        -
      • -

        stock

        -
        public int stock
        -
        • -
      - - - -
        -
      • -

        price

        -
        public double price
        -
        • -
      - - - -
        -
      • -

        category

        -
        public Category category
        -
        • -
      -
      • -
    - -
      -
    • - - -

      Constructor Detail

      - - - -
        -
      • -

        Product

        -
        public Product()
        -
        • -
      -
      • -
    -
    • -
-
-
- - -
- - -
Skip navigation links
- - - - -
-
- - - -
- -
-
- - -
- - -
- - - + + + + + +Product + + + + + + + + +
+ + +
Skip navigation links
+ + + + +
+
+ + + +
+ +
+
+ + +
+ + +
+ + +
+
gr.spinellis.product
+

Class Product

+ +
+
+
+
    +
  • java.lang.Object
    • +
  • +
      +
    • gr.spinellis.product.Product
      • +
    +
    • +
+
+
    +
  • +
    +
    +
    public class Product
+extends java.lang.Object
    +
    • +
+
+
+
    +
  • + +
      +
    • + + +

      Field Summary

      + + + + + + + + + + + + + + + + + + + + + + +
      Fields 
      Modifier and TypeField and Description
      Categorycategory 
      java.lang.Stringname 
      doubleprice 
      intstock 
      +
      • +
    + +
      +
    • + + +

      Constructor Summary

      + + + + + + + + +
      Constructors 
      Constructor and Description
      Product() 
      +
      • +
    + +
      +
    • + + +

      Method Summary

      +
        +
      • + + +

        Methods inherited from class java.lang.Object

        +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
        • +
      +
      • +
    +
    • +
+
+
+
    +
  • + +
      +
    • + + +

      Field Detail

      + + + +
        +
      • +

        name

        +
        public java.lang.String name
        +
        • +
      + + + +
        +
      • +

        stock

        +
        public int stock
        +
        • +
      + + + +
        +
      • +

        price

        +
        public double price
        +
        • +
      + + + +
        +
      • +

        category

        +
        public Category category
        +
        • +
      +
      • +
    + +
      +
    • + + +

      Constructor Detail

      + + + +
        +
      • +

        Product

        +
        public Product()
        +
        • +
      +
      • +
    +
    • +
+
+
+ + +
+ + +
Skip navigation links
+ + + + +
+
+ + + +
+ +
+
+ + +
+ + +
+ + + 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 04606aa..d3cff7b 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,20 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UMLGraph version R5_7_2-11-g86574a (http://www.umlgraph.org/) +# Generated by UMLGraph version 281411 (http://www.spinellis.gr/umlgraph/) # digraph G { - edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; - node [fontname="Helvetica",fontsize=10,shape=plaintext]; - nodesep=0.25; - ranksep=0.5; - // gr.spinellis.product.Product - c8 [label=<
Product
>, URL="./Product.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; - // gr.spinellis.product.Category - c9 [label=<
Category
>, URL="./Category.html", 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]; +graph [fontnames="svg"] +edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10,color="black"]; +node [fontname="Helvetica",fontcolor="black",fontsize=10,shape=plaintext,margin=0,width=0,height=0]; +nodesep=0.25; +ranksep=0.5; +// gr.spinellis.product.Product +c8 [label=<
Product
>, URL="Product.html"]; +// gr.spinellis.product.Category +c9 [label=<
Category
>, URL="Category.html"]; +// gr.spinellis.product.Product navassoc gr.spinellis.product.Category +c8 -> c9 [arrowhead=open,weight=1]; } - + diff --git a/testdata/umldoc-ref/gr/spinellis/product/package-frame.html b/testdata/umldoc-ref/gr/spinellis/product/package-frame.html index 1704070..941a8c4 100644 --- a/testdata/umldoc-ref/gr/spinellis/product/package-frame.html +++ b/testdata/umldoc-ref/gr/spinellis/product/package-frame.html @@ -1,21 +1,21 @@ - - - - - -gr.spinellis.product - - - - - -

gr.spinellis.product

-
-

Classes

- -
- - + + + + + +gr.spinellis.product + + + + + +

gr.spinellis.product

+
+

Classes

+ +
+ + diff --git a/testdata/umldoc-ref/gr/spinellis/product/package-summary.html b/testdata/umldoc-ref/gr/spinellis/product/package-summary.html index 3c33e0c..4ee8091 100644 --- a/testdata/umldoc-ref/gr/spinellis/product/package-summary.html +++ b/testdata/umldoc-ref/gr/spinellis/product/package-summary.html @@ -1,146 +1,146 @@ - - - - - -gr.spinellis.product - - - - - - - - -
- - -
Skip navigation links
- - - - -
-
- - - -
- -
- - -
- -
-

Package gr.spinellis.product

- -
-
-
-
    -
  • - - - - - - - - - - - - - - - - -
    Class Summary 
    ClassDescription
    Category 
    Product 
    -
    • -
-
- -
- - -
Skip navigation links
- - - - -
-
- - - -
- -
- - -
- - - + + + + + +gr.spinellis.product + + + + + + + + +
+ + +
Skip navigation links
+ + + + +
+
+ + + +
+ +
+ + +
+ +
+

Package gr.spinellis.product

+ +
+
+
+
    +
  • + + + + + + + + + + + + + + + + +
    Class Summary 
    ClassDescription
    Category 
    Product 
    +
    • +
+
+ +
+ + +
Skip navigation links
+ + + + +
+
+ + + +
+ +
+ + +
+ + + diff --git a/testdata/umldoc-ref/gr/spinellis/product/package-tree.html b/testdata/umldoc-ref/gr/spinellis/product/package-tree.html index ac6f159..311da77 100644 --- a/testdata/umldoc-ref/gr/spinellis/product/package-tree.html +++ b/testdata/umldoc-ref/gr/spinellis/product/package-tree.html @@ -1,136 +1,136 @@ - - - - - -gr.spinellis.product Class Hierarchy - - - - - - - - -
- - -
Skip navigation links
- - - - -
-
- - - -
- -
- - -
- -
-

Hierarchy For Package gr.spinellis.product

-Package Hierarchies: - -
-
-

Class Hierarchy

-
    -
  • java.lang.Object - -
    • -
-
- -
- - -
Skip navigation links
- - - - -
-
- - - -
- -
- - -
- - - + + + + + +gr.spinellis.product Class Hierarchy + + + + + + + + +
+ + +
Skip navigation links
+ + + + +
+
+ + + +
+ +
+ + +
+ +
+

Hierarchy For Package gr.spinellis.product

+Package Hierarchies: + +
+
+

Class Hierarchy

+
    +
  • java.lang.Object + +
    • +
+
+ +
+ + +
Skip navigation links
+ + + + +
+
+ + + +
+ +
+ + +
+ + + diff --git a/testdata/umldoc-ref/help-doc.html b/testdata/umldoc-ref/help-doc.html index 101fc14..c6e0afc 100644 --- a/testdata/umldoc-ref/help-doc.html +++ b/testdata/umldoc-ref/help-doc.html @@ -1,223 +1,223 @@ - - - - - -API Help - - - - - - - - -
- - -
Skip navigation links
- - - - -
-
-
    -
  • Prev
    • -
  • Next
    • -
- - -
- -
- - -
- -
-

How This API Document Is Organized

-
This API (Application Programming Interface) document has pages corresponding to the items in the navigation bar, described as follows.
-
-
-
    -
  • -

    Overview

    -

    The Overview page is the front page of this API document and provides a list of all packages with a summary for each. This page can also contain an overall description of the set of packages.

    -
    • -
  • -

    Package

    -

    Each package has a page that contains a list of its classes and interfaces, with a summary for each. This page can contain six categories:

    -
      -
    • Interfaces (italic)
      • -
    • Classes
      • -
    • Enums
      • -
    • Exceptions
      • -
    • Errors
      • -
    • Annotation Types
      • -
    -
    • -
  • -

    Class/Interface

    -

    Each class, interface, nested class and nested interface has its own separate page. Each of these pages has three sections consisting of a class/interface description, summary tables, and detailed member descriptions:

    -
      -
    • Class inheritance diagram
      • -
    • Direct Subclasses
      • -
    • All Known Subinterfaces
      • -
    • All Known Implementing Classes
      • -
    • Class/interface declaration
      • -
    • Class/interface description
      • -
    -
      -
    • Nested Class Summary
      • -
    • Field Summary
      • -
    • Constructor Summary
      • -
    • Method Summary
      • -
    -
      -
    • Field Detail
      • -
    • Constructor Detail
      • -
    • Method Detail
      • -
    -

    Each summary entry contains the first sentence from the detailed description for that item. The summary entries are alphabetical, while the detailed descriptions are in the order they appear in the source code. This preserves the logical groupings established by the programmer.

    -
    • -
  • -

    Annotation Type

    -

    Each annotation type has its own separate page with the following sections:

    -
      -
    • Annotation Type declaration
      • -
    • Annotation Type description
      • -
    • Required Element Summary
      • -
    • Optional Element Summary
      • -
    • Element Detail
      • -
    -
    • -
  • -

    Enum

    -

    Each enum has its own separate page with the following sections:

    -
      -
    • Enum declaration
      • -
    • Enum description
      • -
    • Enum Constant Summary
      • -
    • Enum Constant Detail
      • -
    -
    • -
  • -

    Tree (Class Hierarchy)

    -

    There is a Class Hierarchy page for all packages, plus a hierarchy for each package. Each hierarchy page contains a list of classes and a list of interfaces. The classes are organized by inheritance structure starting with java.lang.Object. The interfaces do not inherit from java.lang.Object.

    -
      -
    • When viewing the Overview page, clicking on "Tree" displays the hierarchy for all packages.
      • -
    • When viewing a particular package, class or interface page, clicking "Tree" displays the hierarchy for only that package.
      • -
    -
    • -
  • -

    Deprecated API

    -

    The Deprecated API page lists all of the API that have been deprecated. A deprecated API is not recommended for use, generally due to improvements, and a replacement API is usually given. Deprecated APIs may be removed in future implementations.

    -
    • -
  • -

    Index

    -

    The Index contains an alphabetic list of all classes, interfaces, constructors, methods, and fields.

    -
    • -
  • -

    Prev/Next

    -

    These links take you to the next or previous class, interface, package, or related page.

    -
    • -
  • -

    Frames/No Frames

    -

    These links show and hide the HTML frames. All pages are available with or without frames.

    -
    • -
  • -

    All Classes

    -

    The All Classes link shows all classes and interfaces except non-static nested types.

    -
    • -
  • -

    Serialized Form

    -

    Each serializable or externalizable class has a description of its serialization fields and methods. This information is of interest to re-implementors, not to developers using the API. While there is no link in the navigation bar, you can get to this information by going to any serialized class and clicking "Serialized Form" in the "See also" section of the class description.

    -
    • -
  • -

    Constant Field Values

    -

    The Constant Field Values page lists the static final fields and their values.

    -
    • -
-This help file applies to API documentation generated using the standard doclet.
- -
- - -
Skip navigation links
- - - - -
-
-
    -
  • Prev
    • -
  • Next
    • -
- - -
- -
- - -
- - - + + + + + +API Help + + + + + + + + +
+ + +
Skip navigation links
+ + + + +
+
+
    +
  • Prev
    • +
  • Next
    • +
+ + +
+ +
+ + +
+ +
+

How This API Document Is Organized

+
This API (Application Programming Interface) document has pages corresponding to the items in the navigation bar, described as follows.
+
+
+
    +
  • +

    Overview

    +

    The Overview page is the front page of this API document and provides a list of all packages with a summary for each. This page can also contain an overall description of the set of packages.

    +
    • +
  • +

    Package

    +

    Each package has a page that contains a list of its classes and interfaces, with a summary for each. This page can contain six categories:

    +
      +
    • Interfaces (italic)
      • +
    • Classes
      • +
    • Enums
      • +
    • Exceptions
      • +
    • Errors
      • +
    • Annotation Types
      • +
    +
    • +
  • +

    Class/Interface

    +

    Each class, interface, nested class and nested interface has its own separate page. Each of these pages has three sections consisting of a class/interface description, summary tables, and detailed member descriptions:

    +
      +
    • Class inheritance diagram
      • +
    • Direct Subclasses
      • +
    • All Known Subinterfaces
      • +
    • All Known Implementing Classes
      • +
    • Class/interface declaration
      • +
    • Class/interface description
      • +
    +
      +
    • Nested Class Summary
      • +
    • Field Summary
      • +
    • Constructor Summary
      • +
    • Method Summary
      • +
    +
      +
    • Field Detail
      • +
    • Constructor Detail
      • +
    • Method Detail
      • +
    +

    Each summary entry contains the first sentence from the detailed description for that item. The summary entries are alphabetical, while the detailed descriptions are in the order they appear in the source code. This preserves the logical groupings established by the programmer.

    +
    • +
  • +

    Annotation Type

    +

    Each annotation type has its own separate page with the following sections:

    +
      +
    • Annotation Type declaration
      • +
    • Annotation Type description
      • +
    • Required Element Summary
      • +
    • Optional Element Summary
      • +
    • Element Detail
      • +
    +
    • +
  • +

    Enum

    +

    Each enum has its own separate page with the following sections:

    +
      +
    • Enum declaration
      • +
    • Enum description
      • +
    • Enum Constant Summary
      • +
    • Enum Constant Detail
      • +
    +
    • +
  • +

    Tree (Class Hierarchy)

    +

    There is a Class Hierarchy page for all packages, plus a hierarchy for each package. Each hierarchy page contains a list of classes and a list of interfaces. The classes are organized by inheritance structure starting with java.lang.Object. The interfaces do not inherit from java.lang.Object.

    +
      +
    • When viewing the Overview page, clicking on "Tree" displays the hierarchy for all packages.
      • +
    • When viewing a particular package, class or interface page, clicking "Tree" displays the hierarchy for only that package.
      • +
    +
    • +
  • +

    Deprecated API

    +

    The Deprecated API page lists all of the API that have been deprecated. A deprecated API is not recommended for use, generally due to improvements, and a replacement API is usually given. Deprecated APIs may be removed in future implementations.

    +
    • +
  • +

    Index

    +

    The Index contains an alphabetic list of all classes, interfaces, constructors, methods, and fields.

    +
    • +
  • +

    Prev/Next

    +

    These links take you to the next or previous class, interface, package, or related page.

    +
    • +
  • +

    Frames/No Frames

    +

    These links show and hide the HTML frames. All pages are available with or without frames.

    +
    • +
  • +

    All Classes

    +

    The All Classes link shows all classes and interfaces except non-static nested types.

    +
    • +
  • +

    Serialized Form

    +

    Each serializable or externalizable class has a description of its serialization fields and methods. This information is of interest to re-implementors, not to developers using the API. While there is no link in the navigation bar, you can get to this information by going to any serialized class and clicking "Serialized Form" in the "See also" section of the class description.

    +
    • +
  • +

    Constant Field Values

    +

    The Constant Field Values page lists the static final fields and their values.

    +
    • +
+This help file applies to API documentation generated using the standard doclet.
+ +
+ + +
Skip navigation links
+ + + + +
+
+
    +
  • Prev
    • +
  • Next
    • +
+ + +
+ +
+ + +
+ + + diff --git a/testdata/umldoc-ref/index-all.html b/testdata/umldoc-ref/index-all.html index 09fed8e..6019fcb 100644 --- a/testdata/umldoc-ref/index-all.html +++ b/testdata/umldoc-ref/index-all.html @@ -1,225 +1,225 @@ - - - - - -Index - - - - - - - - -
- - -
Skip navigation links
- - - - -
-
-
    -
  • Prev
    • -
  • Next
    • -
- - -
- -
- - -
- -
A C G I N P Q S T  - - -

A

-
-
addItem(Product, int) - Method in class gr.spinellis.invoice.Invoice
-
 
-
- - - -

C

-
-
Category - Class in gr.spinellis.product
-
 
-
Category() - Constructor for class gr.spinellis.product.Category
-
 
-
category - Variable in class gr.spinellis.product.Product
-
 
-
Customer - Class in gr.spinellis.invoice
-
 
-
Customer() - Constructor for class gr.spinellis.invoice.Customer
-
 
-
customer - Variable in class gr.spinellis.invoice.Invoice
-
 
-
- - - -

G

-
-
gr.spinellis.invoice - package gr.spinellis.invoice
-
 
-
gr.spinellis.product - package gr.spinellis.product
-
 
-
- - - -

I

-
-
Invoice - Class in gr.spinellis.invoice
-
 
-
Invoice() - Constructor for class gr.spinellis.invoice.Invoice
-
 
-
invoiceDate - Variable in class gr.spinellis.invoice.Invoice
-
 
-
InvoiceItem - Class in gr.spinellis.invoice
-
 
-
InvoiceItem() - Constructor for class gr.spinellis.invoice.InvoiceItem
-
 
-
items - Variable in class gr.spinellis.invoice.Invoice
-
 
-
- - - -

N

-
-
name - Variable in class gr.spinellis.invoice.Customer
-
 
-
name - Variable in class gr.spinellis.product.Category
-
 
-
name - Variable in class gr.spinellis.product.Product
-
 
-
- - - -

P

-
-
price - Variable in class gr.spinellis.product.Product
-
 
-
product - Variable in class gr.spinellis.invoice.InvoiceItem
-
 
-
Product - Class in gr.spinellis.product
-
 
-
Product() - Constructor for class gr.spinellis.product.Product
-
 
-
products - Variable in class gr.spinellis.product.Category
-
 
-
- - - -

Q

-
-
quantity - Variable in class gr.spinellis.invoice.InvoiceItem
-
 
-
- - - -

S

-
-
stock - Variable in class gr.spinellis.product.Product
-
 
-
- - - -

T

-
-
total - Variable in class gr.spinellis.invoice.Invoice
-
 
-
-A C G I N P Q S T 
- -
- - -
Skip navigation links
- - - - -
-
-
    -
  • Prev
    • -
  • Next
    • -
- - -
- -
- - -
- - - + + + + + +Index + + + + + + + + +
+ + +
Skip navigation links
+ + + + +
+
+
    +
  • Prev
    • +
  • Next
    • +
+ + +
+ +
+ + +
+ +
A C G I N P Q S T  + + +

A

+
+
addItem(Product, int) - Method in class gr.spinellis.invoice.Invoice
+
 
+
+ + + +

C

+
+
Category - Class in gr.spinellis.product
+
 
+
Category() - Constructor for class gr.spinellis.product.Category
+
 
+
category - Variable in class gr.spinellis.product.Product
+
 
+
Customer - Class in gr.spinellis.invoice
+
 
+
Customer() - Constructor for class gr.spinellis.invoice.Customer
+
 
+
customer - Variable in class gr.spinellis.invoice.Invoice
+
 
+
+ + + +

G

+
+
gr.spinellis.invoice - package gr.spinellis.invoice
+
 
+
gr.spinellis.product - package gr.spinellis.product
+
 
+
+ + + +

I

+
+
Invoice - Class in gr.spinellis.invoice
+
 
+
Invoice() - Constructor for class gr.spinellis.invoice.Invoice
+
 
+
invoiceDate - Variable in class gr.spinellis.invoice.Invoice
+
 
+
InvoiceItem - Class in gr.spinellis.invoice
+
 
+
InvoiceItem() - Constructor for class gr.spinellis.invoice.InvoiceItem
+
 
+
items - Variable in class gr.spinellis.invoice.Invoice
+
 
+
+ + + +

N

+
+
name - Variable in class gr.spinellis.invoice.Customer
+
 
+
name - Variable in class gr.spinellis.product.Category
+
 
+
name - Variable in class gr.spinellis.product.Product
+
 
+
+ + + +

P

+
+
price - Variable in class gr.spinellis.product.Product
+
 
+
product - Variable in class gr.spinellis.invoice.InvoiceItem
+
 
+
Product - Class in gr.spinellis.product
+
 
+
Product() - Constructor for class gr.spinellis.product.Product
+
 
+
products - Variable in class gr.spinellis.product.Category
+
 
+
+ + + +

Q

+
+
quantity - Variable in class gr.spinellis.invoice.InvoiceItem
+
 
+
+ + + +

S

+
+
stock - Variable in class gr.spinellis.product.Product
+
 
+
+ + + +

T

+
+
total - Variable in class gr.spinellis.invoice.Invoice
+
 
+
+A C G I N P Q S T 
+ +
+ + +
Skip navigation links
+ + + + +
+
+
    +
  • Prev
    • +
  • Next
    • +
+ + +
+ +
+ + +
+ + + diff --git a/testdata/umldoc-ref/index.html b/testdata/umldoc-ref/index.html index fd41127..074c89c 100644 --- a/testdata/umldoc-ref/index.html +++ b/testdata/umldoc-ref/index.html @@ -1,75 +1,75 @@ - - - - - -Generated Documentation (Untitled) - - - - - - - - - -<noscript> -<div>JavaScript is disabled on your browser.</div> -</noscript> -<h2>Frame Alert</h2> -<p>This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client. Link to <a href="overview-summary.html">Non-frame version</a>.</p> - - - + + + + + +Generated Documentation (Untitled) + + + + + + + + + +<noscript> +<div>JavaScript is disabled on your browser.</div> +</noscript> +<h2>Frame Alert</h2> +<p>This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client. Link to <a href="overview-summary.html">Non-frame version</a>.</p> + + + diff --git a/testdata/umldoc-ref/overview-frame.html b/testdata/umldoc-ref/overview-frame.html index 209a139..0c35ca8 100644 --- a/testdata/umldoc-ref/overview-frame.html +++ b/testdata/umldoc-ref/overview-frame.html @@ -1,22 +1,22 @@ - - - - - -Overview List - - - - - -
All Classes
-
-

Packages

- -
-

 

- - + + + + + +Overview List + + + + + +
All Classes
+
+

Packages

+ +
+

 

+ + diff --git a/testdata/umldoc-ref/overview-summary.html b/testdata/umldoc-ref/overview-summary.html index 6128cde..10a14d4 100644 --- a/testdata/umldoc-ref/overview-summary.html +++ b/testdata/umldoc-ref/overview-summary.html @@ -1,137 +1,137 @@ - - - - - -Overview - - - - - - - - -
- - -
Skip navigation links
- - - - -
-
-
    -
  • Prev
    • -
  • Next
    • -
- - -
- -
- - -
- -
- - - - - - - - - - - - - - - - -
Packages 
PackageDescription
gr.spinellis.invoice 
gr.spinellis.product 
-
- -
- - -
Skip navigation links
- - - - -
-
-
    -
  • Prev
    • -
  • Next
    • -
- - -
- -
- - -
- - - + + + + + +Overview + + + + + + + + +
+ + +
Skip navigation links
+ + + + +
+
+
    +
  • Prev
    • +
  • Next
    • +
+ + +
+ +
+ + +
+ +
+ + + + + + + + + + + + + + + + +
Packages 
PackageDescription
gr.spinellis.invoice 
gr.spinellis.product 
+
+ +
+ + +
Skip navigation links
+ + + + +
+
+
    +
  • Prev
    • +
  • Next
    • +
+ + +
+ +
+ + +
+ + + diff --git a/testdata/umldoc-ref/overview-tree.html b/testdata/umldoc-ref/overview-tree.html index d3a767b..eaa0388 100644 --- a/testdata/umldoc-ref/overview-tree.html +++ b/testdata/umldoc-ref/overview-tree.html @@ -1,140 +1,140 @@ - - - - - -Class Hierarchy - - - - - - - - -
- - -
Skip navigation links
- - - - -
-
-
    -
  • Prev
    • -
  • Next
    • -
- - -
- -
- - -
- -
-

Hierarchy For All Packages

-Package Hierarchies: - -
-
-

Class Hierarchy

- -
- -
- - -
Skip navigation links
- - - - -
-
-
    -
  • Prev
    • -
  • Next
    • -
- - -
- -
- - -
- - - + + + + + +Class Hierarchy + + + + + + + + +
+ + +
Skip navigation links
+ + + + +
+
+
    +
  • Prev
    • +
  • Next
    • +
+ + +
+ +
+ + +
+ +
+

Hierarchy For All Packages

+Package Hierarchies: + +
+
+

Class Hierarchy

+ +
+ +
+ + +
Skip navigation links
+ + + + +
+
+
    +
  • Prev
    • +
  • Next
    • +
+ + +
+ +
+ + +
+ + + diff --git a/testdata/umldoc-ref/package-list b/testdata/umldoc-ref/package-list index d4a3575..b1373f2 100644 --- a/testdata/umldoc-ref/package-list +++ b/testdata/umldoc-ref/package-list @@ -1,2 +1,2 @@ -gr.spinellis.invoice -gr.spinellis.product +gr.spinellis.invoice +gr.spinellis.product