From 93e69a4e2498589204bc6320726501e9026e552f Mon Sep 17 00:00:00 2001 From: Diomidis Spinellis Date: Mon, 5 Oct 2015 14:23:19 +0300 Subject: [PATCH 01/64] Make umlgraph shell script work under Cygwin --- src/main/java/org/umlgraph/doclet/Version.java | 2 +- umlgraph | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/umlgraph/doclet/Version.java b/src/main/java/org/umlgraph/doclet/Version.java index 3a25f61..641f0a4 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-1-g9039a0";} +class Version { public static String VERSION = "R5_7_2-3-gee82a7";} \ No newline at end of file diff --git a/umlgraph b/umlgraph index 2119ace..71794b0 100755 --- a/umlgraph +++ b/umlgraph @@ -8,6 +8,13 @@ UMLGRAPH_HOME=lib +# Obtain a classpath path separator that works for Unix and Cygwin +if expr "$JAVA_HOME" : '.*:' >/dev/null ; then + CPS=';' +else + CPS=':' +fi + if [ x$2 = x ] then echo usage: umlgraph base_file_name filetype [umlgraph arguments] 1>&2 @@ -18,7 +25,7 @@ else BASE=$1 FILETYPE=$2 shift 2 - java -classpath "$UMLGRAPH_HOME/UmlGraph.jar:$JAVA_HOME/lib/tools.jar" \ + java -classpath "$UMLGRAPH_HOME/UmlGraph.jar${CPS}$JAVA_HOME/lib/tools.jar" \ org.umlgraph.doclet.UmlGraph -package $* -output - $BASE.java | dot -T$FILETYPE -o$BASE.$FILETYPE fi From 49a3f570bf04ea3c81129257f2818d0d5a812ddc Mon Sep 17 00:00:00 2001 From: Diomidis Spinellis Date: Mon, 5 Oct 2015 15:14:30 +0300 Subject: [PATCH 02/64] Document package diagram generation --- doc/cd-oper.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/doc/cd-oper.xml b/doc/cd-oper.xml index 5fdbe3c..e0c1bf1 100644 --- a/doc/cd-oper.xml +++ b/doc/cd-oper.xml @@ -72,6 +72,14 @@ Example: java -jar /usr/jvm/java-1.5.0/lib/UmlGraph.jar -private Simple.java

+To generate a diagram of all classes in the package specify as arguments +to the Java invocation the name of the package and the directory where +it resides. +The following example generates a diagram of all UMLGraph classes. + +java -classpath ... org.umlgraph.doclet.UmlGraph -sourcepath src/main/java org.umlgraph.doclet + +

Specifying some packages before the list of source files will designate those packages as local. When you specify a package list, From 9f2516788009fbe04670bae2b830f832240071f7 Mon Sep 17 00:00:00 2001 From: ayman abdelghany Date: Tue, 7 Jun 2016 14:04:11 +0200 Subject: [PATCH 03/64] [squid:S1161] "@Override" annotation should be used on any method overriding (since Java 5) or implementing (since Java 6) another one --- src/main/java/org/umlgraph/doclet/ContextMatcher.java | 5 +++++ src/main/java/org/umlgraph/doclet/Options.java | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/umlgraph/doclet/ContextMatcher.java b/src/main/java/org/umlgraph/doclet/ContextMatcher.java index 47895af..ce2658a 100644 --- a/src/main/java/org/umlgraph/doclet/ContextMatcher.java +++ b/src/main/java/org/umlgraph/doclet/ContextMatcher.java @@ -168,6 +168,8 @@ public class ContextMatcher implements ClassMatcher { prologue(); } + @Override + @Override public void prologue() throws IOException { w = new PrintWriter(new DevNullWriter()); } @@ -180,14 +182,17 @@ public class ContextMatcher implements ClassMatcher { */ private static class DevNullWriter extends Writer { + @Override public void write(char[] cbuf, int off, int len) throws IOException { // nothing to do } + @Override public void flush() throws IOException { // nothing to do } + @Override public void close() throws IOException { // nothing to do } diff --git a/src/main/java/org/umlgraph/doclet/Options.java b/src/main/java/org/umlgraph/doclet/Options.java index b33a329..68225bd 100644 --- a/src/main/java/org/umlgraph/doclet/Options.java +++ b/src/main/java/org/umlgraph/doclet/Options.java @@ -189,7 +189,8 @@ public class Options implements Cloneable, OptionProvider { dotExecutable = "dot"; } - public Object clone() { + @Override + public Object clone() { Options clone = null; try { clone = (Options) super.clone(); From 105db10e1aa80d3604cab113a9c37d641c592ca5 Mon Sep 17 00:00:00 2001 From: ayman abdelghany Date: Tue, 7 Jun 2016 14:07:16 +0200 Subject: [PATCH 04/64] [squid:S1854] Dead stores should be removed --- src/main/java/org/umlgraph/doclet/ClassGraph.java | 14 +++++++------- src/main/java/org/umlgraph/doclet/Options.java | 4 ++-- src/main/java/org/umlgraph/doclet/UmlGraphDoc.java | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/umlgraph/doclet/ClassGraph.java b/src/main/java/org/umlgraph/doclet/ClassGraph.java index 7d2d1a1..1a3e4de 100644 --- a/src/main/java/org/umlgraph/doclet/ClassGraph.java +++ b/src/main/java/org/umlgraph/doclet/ClassGraph.java @@ -264,7 +264,7 @@ class ClassGraph { /** Print a a basic type t */ private String type(Options opt, Type t) { - String type = ""; + String type; if (opt.showQualified) type = t.qualifiedTypeName(); else @@ -305,7 +305,7 @@ class ClassGraph { for (FieldDoc f : fd) { if (hidden(f)) continue; - String att = ""; + String att; stereotype(opt, f, Align.LEFT); att = visibility(opt, f) + f.name(); if (opt.showType) @@ -506,7 +506,7 @@ class ClassGraph { Font font = c.isAbstract() && !c.isInterface() ? Font.CLASS_ABSTRACT : Font.CLASS; String qualifiedName = qualifiedName(opt, r); int startTemplate = qualifiedName.indexOf('<'); - int idx = 0; + int idx; if(startTemplate < 0) idx = qualifiedName.lastIndexOf('.'); else @@ -1022,7 +1022,7 @@ class ClassGraph { // building relative path for context and package diagrams if(contextDoc != null && rootClass) { // determine the context path, relative to the root - String packageName = null; + String packageName; if (contextDoc instanceof ClassDoc) { packageName = ((ClassDoc) contextDoc).containingPackage().name(); } else if (contextDoc instanceof PackageDoc) { @@ -1101,7 +1101,7 @@ class ClassGraph { * the final diagram to the associated JavaDoc page. */ private String mapApiDocRoot(String className) { - String root = null; + String root; /* If no packages are specified, we use apiDocRoot for all of them. */ if (rootClasses.contains(className)) { root = optionProvider.getGlobalOptions().apiDocRoot; @@ -1117,14 +1117,14 @@ class ClassGraph { * @throws IOException */ public void prologue() throws IOException { Options opt = optionProvider.getGlobalOptions(); - OutputStream os = null; + OutputStream os; if (opt.outputFileName.equals("-")) os = System.out; else { // prepare output file. Use the output file name as a full path unless the output // directory is specified - File file = null; + File file; if (opt.outputDirectory != null) file = new File(opt.outputDirectory, opt.outputFileName); else diff --git a/src/main/java/org/umlgraph/doclet/Options.java b/src/main/java/org/umlgraph/doclet/Options.java index b33a329..6031d66 100644 --- a/src/main/java/org/umlgraph/doclet/Options.java +++ b/src/main/java/org/umlgraph/doclet/Options.java @@ -556,7 +556,7 @@ public class Options implements Cloneable, OptionProvider { try { URL url = new URL(packageListUrl + "/package-list"); br = new BufferedReader(new InputStreamReader(url.openStream())); - String line = null; + String line; while((line = br.readLine()) != null) { line = line + "."; Pattern pattern = Pattern.compile(line.replace(".", "\\.") + "[^\\.]*"); @@ -586,7 +586,7 @@ public class Options implements Cloneable, OptionProvider { try { URL url = new URL(packageListUrl + "/package-list"); br = new BufferedReader(new InputStreamReader(url.openStream())); - String line = null; + String line; while((line = br.readLine()) != null) { line = line + "."; Pattern pattern = Pattern.compile(line.replace(".", "\\.") + "[^\\.]*"); diff --git a/src/main/java/org/umlgraph/doclet/UmlGraphDoc.java b/src/main/java/org/umlgraph/doclet/UmlGraphDoc.java index 6dda3a2..d0946d6 100644 --- a/src/main/java/org/umlgraph/doclet/UmlGraphDoc.java +++ b/src/main/java/org/umlgraph/doclet/UmlGraphDoc.java @@ -147,7 +147,7 @@ public class UmlGraphDoc { dotFile.getAbsolutePath() }); BufferedReader reader = new BufferedReader(new InputStreamReader(p.getErrorStream())); - String line = null; + String line; while((line = reader.readLine()) != null) root.printWarning(line); int result = p.waitFor(); From 1ec3be2f98dab5ef06e614ce71edf963c70a2677 Mon Sep 17 00:00:00 2001 From: ayman abdelghany Date: Tue, 7 Jun 2016 14:12:05 +0200 Subject: [PATCH 05/64] [squid:S1149] Synchronized classes Vector, Hashtable, Stack and StringBuffer should not be used --- src/main/java/org/umlgraph/doclet/ClassGraph.java | 10 +++++----- src/main/java/org/umlgraph/doclet/Options.java | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/umlgraph/doclet/ClassGraph.java b/src/main/java/org/umlgraph/doclet/ClassGraph.java index 7d2d1a1..9c800ef 100644 --- a/src/main/java/org/umlgraph/doclet/ClassGraph.java +++ b/src/main/java/org/umlgraph/doclet/ClassGraph.java @@ -157,7 +157,7 @@ class ClassGraph { final Pattern toEscape = Pattern.compile("[&<>]"); if (toEscape.matcher(s).find()) { - StringBuffer sb = new StringBuffer(s); + StringBuilder sb = new StringBuilder(s); for (int i = 0; i < sb.length();) { switch (sb.charAt(i)) { case '&': @@ -188,7 +188,7 @@ class ClassGraph { if (s.indexOf('\n') == -1) return (s); - StringBuffer sb = new StringBuffer(s); + StringBuilder sb = new StringBuilder(s); for (int i = 0; i < sb.length();) { if (sb.charAt(i) == '\n') { sb.replace(i, i + 1, "
"); @@ -204,7 +204,7 @@ class ClassGraph { * Convert < and > characters in the string to the respective guillemot characters. */ private String guillemize(Options opt, String s) { - StringBuffer r = new StringBuffer(s); + StringBuilder r = new StringBuilder(s); for (int i = 0; i < r.length();) switch (r.charAt(i)) { case '<': @@ -1048,7 +1048,7 @@ class ClassGraph { && contextClassPath[i].equals(currClassPath[i])) i++; // ... go up with ".." to reach the common root - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); if (i == contextClassPath.length) { buf.append(".").append(FILE_SEPARATOR); } else { @@ -1085,7 +1085,7 @@ class ClassGraph { public String classToUrl(String className) { String docRoot = mapApiDocRoot(className); if (docRoot != null) { - StringBuffer buf = new StringBuffer(docRoot); + StringBuilder buf = new StringBuilder(docRoot); buf.append(getPackageName(className).replace('.', FILE_SEPARATOR) + FILE_SEPARATOR); buf.append(getUnqualifiedName(className)); buf.append(".html"); diff --git a/src/main/java/org/umlgraph/doclet/Options.java b/src/main/java/org/umlgraph/doclet/Options.java index b33a329..c648d0d 100644 --- a/src/main/java/org/umlgraph/doclet/Options.java +++ b/src/main/java/org/umlgraph/doclet/Options.java @@ -764,7 +764,7 @@ public class Options implements Cloneable, OptionProvider { } public String toString() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append("UMLGRAPH OPTIONS\n"); for(Field f : this.getClass().getDeclaredFields()) { if(!Modifier.isStatic(f.getModifiers())) { From 86574a7824ddd404b1472c836fbee84df984c9a0 Mon Sep 17 00:00:00 2001 From: Diomidis Spinellis Date: Tue, 7 Jun 2016 16:41:55 +0300 Subject: [PATCH 06/64] Update Sun to Oracle URLs --- testdata/dot-ref/Inference.dot | 6 +++--- testdata/dot-ref/MyVector.dot | 10 +++++----- testdata/dot-ref/RunnableRef.dot | 4 ++-- testdata/dot-ref/Style.dot | 4 ++-- testdata/dot-ref/ViewColors.dot | 4 ++-- testdata/dot-ref/ViewContext.dot | 6 +++--- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/testdata/dot-ref/Inference.dot b/testdata/dot-ref/Inference.dot index fd0b978..4158b30 100644 --- a/testdata/dot-ref/Inference.dot +++ b/testdata/dot-ref/Inference.dot @@ -1,7 +1,7 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UMLGraph version R5_7_0-10-g786d98 (http://www.umlgraph.org/) +# Generated by UMLGraph version R5_7_2-10-g442559 (http://www.umlgraph.org/) # digraph G { @@ -42,8 +42,8 @@ digraph G { // B DEPEND A c67:p -> c66:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open, style=dashed]; // java.util.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://java.sun.com/j2se/1.4.2/docs/api/java/util/List.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c73 [label=<
«interface»
List<E>
size() : int
isEmpty() : boolean
contains(arg0 : Object) : boolean
iterator() : Iterator<E>
toArray() : Object[]
toArray(arg0 : T[]) : T[]
add(arg0 : E) : boolean
remove(arg0 : Object) : boolean
containsAll(arg0 : Collection<?>) : boolean
addAll(arg0 : Collection<?>) : boolean
addAll(arg0 : int, arg1 : Collection<?>) : boolean
removeAll(arg0 : Collection<?>) : boolean
retainAll(arg0 : Collection<?>) : boolean
replaceAll(arg0 : UnaryOperator<E>)
sort(arg0 : Comparator<?>)
clear()
equals(arg0 : Object) : boolean
hashCode() : int
get(arg0 : int) : E
set(arg0 : int, arg1 : E) : E
add(arg0 : int, arg1 : E)
remove(arg0 : int) : E
indexOf(arg0 : Object) : int
lastIndexOf(arg0 : Object) : int
listIterator() : ListIterator<E>
listIterator(arg0 : int) : ListIterator<E>
subList(arg0 : int, arg1 : int) : List<E>
spliterator() : Spliterator<E>
>, URL="http://docs.oracle.com/javase/7/docs/api/java/util/List.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; // java.util.ArrayList - c72 [label=<
ArrayList<E>
serialVersionUID : long
DEFAULT_CAPACITY : int
EMPTY_ELEMENTDATA : Object[]
DEFAULTCAPACITY_EMPTY_ELEMENTDATA : Object[]
elementData : Object[]
size : int
MAX_ARRAY_SIZE : int
trimToSize()
ensureCapacity(arg0 : int)
ensureCapacityInternal(arg0 : int)
ensureExplicitCapacity(arg0 : int)
grow(arg0 : int)
hugeCapacity(arg0 : int) : int
size() : int
isEmpty() : boolean
contains(arg0 : Object) : boolean
indexOf(arg0 : Object) : int
lastIndexOf(arg0 : Object) : int
clone() : Object
toArray() : Object[]
toArray(arg0 : T[]) : T[]
elementData(arg0 : int) : E
get(arg0 : int) : E
set(arg0 : int, arg1 : E) : E
add(arg0 : E) : boolean
add(arg0 : int, arg1 : E)
remove(arg0 : int) : E
remove(arg0 : Object) : boolean
fastRemove(arg0 : int)
clear()
addAll(arg0 : Collection<?>) : boolean
addAll(arg0 : int, arg1 : Collection<?>) : boolean
removeRange(arg0 : int, arg1 : int)
rangeCheck(arg0 : int)
rangeCheckForAdd(arg0 : int)
outOfBoundsMsg(arg0 : int) : String
removeAll(arg0 : Collection<?>) : boolean
retainAll(arg0 : Collection<?>) : boolean
batchRemove(arg0 : Collection<?>, arg1 : boolean) : boolean
writeObject(arg0 : ObjectOutputStream)
readObject(arg0 : ObjectInputStream)
listIterator(arg0 : int) : ListIterator<E>
listIterator() : ListIterator<E>
iterator() : Iterator<E>
subList(arg0 : int, arg1 : int) : List<E>
subListRangeCheck(arg0 : int, arg1 : int, arg2 : int)
forEach(arg0 : Consumer<?>)
spliterator() : Spliterator<E>
removeIf(arg0 : Predicate<?>) : boolean
replaceAll(arg0 : UnaryOperator<E>)
sort(arg0 : Comparator<?>)
>, URL="http://java.sun.com/j2se/1.4.2/docs/api/java/util/ArrayList.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + 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", fontname="Helvetica", fontcolor="black", fontsize=10.0]; } diff --git a/testdata/dot-ref/MyVector.dot b/testdata/dot-ref/MyVector.dot index e3aeb8a..ce2b411 100644 --- a/testdata/dot-ref/MyVector.dot +++ b/testdata/dot-ref/MyVector.dot @@ -1,7 +1,7 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UMLGraph version R5_7_0-10-g786d98 (http://www.umlgraph.org/) +# Generated by UMLGraph version R5_7_2-10-g442559 (http://www.umlgraph.org/) # digraph G { @@ -20,12 +20,12 @@ digraph G { //MyVector implements java.lang.Cloneable c89:p -> c85:p [dir=back,arrowtail=empty,style=dashed]; // java.util.RandomAccess - c88 [label=<
«interface»
RandomAccess
>, URL="http://java.sun.com/j2se/1.4.2/docs/api/java/util/RandomAccess.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c88 [label=<
«interface»
RandomAccess
>, URL="http://docs.oracle.com/javase/7/docs/api/java/util/RandomAccess.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; // java.util.List - c87 [label=<
«interface»
List<E>
+ size() : int
+ isEmpty() : boolean
+ contains(arg0 : Object) : boolean
+ iterator() : Iterator<E>
+ toArray() : Object[]
+ toArray(arg0 : T[]) : T[]
+ add(arg0 : E) : boolean
+ remove(arg0 : Object) : boolean
+ containsAll(arg0 : Collection<?>) : boolean
+ addAll(arg0 : Collection<?>) : boolean
+ addAll(arg0 : int, arg1 : Collection<?>) : boolean
+ removeAll(arg0 : Collection<?>) : boolean
+ retainAll(arg0 : Collection<?>) : boolean
+ replaceAll(arg0 : UnaryOperator<E>)
+ sort(arg0 : Comparator<?>)
+ clear()
+ equals(arg0 : Object) : boolean
+ hashCode() : int
+ get(arg0 : int) : E
+ set(arg0 : int, arg1 : E) : E
+ add(arg0 : int, arg1 : E)
+ remove(arg0 : int) : E
+ indexOf(arg0 : Object) : int
+ lastIndexOf(arg0 : Object) : int
+ listIterator() : ListIterator<E>
+ listIterator(arg0 : int) : ListIterator<E>
+ subList(arg0 : int, arg1 : int) : List<E>
+ spliterator() : Spliterator<E>
>, URL="http://java.sun.com/j2se/1.4.2/docs/api/java/util/List.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + 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", fontname="Helvetica", fontcolor="black", fontsize=10.0]; // java.lang.Cloneable - c89 [label=<
«interface»
Cloneable
>, URL="http://java.sun.com/j2se/1.4.2/docs/api/java/lang/Cloneable.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c89 [label=<
«interface»
Cloneable
>, URL="http://docs.oracle.com/javase/7/docs/api/java/lang/Cloneable.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; // java.util.Vector - c86 [label=<
Vector<E>
# elementData : Object[]
# elementCount : int
# capacityIncrement : int
- serialVersionUID : long
- MAX_ARRAY_SIZE : int
+ copyInto(arg0 : Object[])
+ trimToSize()
+ ensureCapacity(arg0 : int)
- ensureCapacityHelper(arg0 : int)
- grow(arg0 : int)
- hugeCapacity(arg0 : int) : int
+ setSize(arg0 : int)
+ capacity() : int
+ size() : int
+ isEmpty() : boolean
+ elements() : Enumeration<E>
+ contains(arg0 : Object) : boolean
+ indexOf(arg0 : Object) : int
+ indexOf(arg0 : Object, arg1 : int) : int
+ lastIndexOf(arg0 : Object) : int
+ lastIndexOf(arg0 : Object, arg1 : int) : int
+ elementAt(arg0 : int) : E
+ firstElement() : E
+ lastElement() : E
+ setElementAt(arg0 : E, arg1 : int)
+ removeElementAt(arg0 : int)
+ insertElementAt(arg0 : E, arg1 : int)
+ addElement(arg0 : E)
+ removeElement(arg0 : Object) : boolean
+ removeAllElements()
+ clone() : Object
+ toArray() : Object[]
+ toArray(arg0 : T[]) : T[]
~ elementData(arg0 : int) : E
+ get(arg0 : int) : E
+ set(arg0 : int, arg1 : E) : E
+ add(arg0 : E) : boolean
+ remove(arg0 : Object) : boolean
+ add(arg0 : int, arg1 : E)
+ remove(arg0 : int) : E
+ clear()
+ containsAll(arg0 : Collection<?>) : boolean
+ addAll(arg0 : Collection<?>) : boolean
+ removeAll(arg0 : Collection<?>) : boolean
+ retainAll(arg0 : Collection<?>) : boolean
+ addAll(arg0 : int, arg1 : Collection<?>) : boolean
+ equals(arg0 : Object) : boolean
+ hashCode() : int
+ toString() : String
+ subList(arg0 : int, arg1 : int) : List<E>
# removeRange(arg0 : int, arg1 : int)
- writeObject(arg0 : ObjectOutputStream)
+ listIterator(arg0 : int) : ListIterator<E>
+ listIterator() : ListIterator<E>
+ iterator() : Iterator<E>
+ forEach(arg0 : Consumer<?>)
+ removeIf(arg0 : Predicate<?>) : boolean
+ replaceAll(arg0 : UnaryOperator<E>)
+ sort(arg0 : Comparator<?>)
+ spliterator() : Spliterator<E>
>, URL="http://java.sun.com/j2se/1.4.2/docs/api/java/util/Vector.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + 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", fontname="Helvetica", fontcolor="black", fontsize=10.0]; } diff --git a/testdata/dot-ref/RunnableRef.dot b/testdata/dot-ref/RunnableRef.dot index d83d2af..27b145d 100644 --- a/testdata/dot-ref/RunnableRef.dot +++ b/testdata/dot-ref/RunnableRef.dot @@ -1,7 +1,7 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UMLGraph version R5_6-9-g37cd34 (http://www.umlgraph.org/) +# Generated by UMLGraph version R5_7_2-10-g442559 (http://www.umlgraph.org/) # digraph G { @@ -14,6 +14,6 @@ digraph G { // test.RunnableRef DEPEND java.lang.Runnable c98:p -> c99:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open, style=dashed]; // java.lang.Runnable - c99 [label=<
«interface»
Runnable
>, URL="http://java.sun.com/j2se/1.4.2/docs/api/java/lang/Runnable.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c99 [label=<
«interface»
Runnable
>, URL="http://docs.oracle.com/javase/7/docs/api/java/lang/Runnable.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; } diff --git a/testdata/dot-ref/Style.dot b/testdata/dot-ref/Style.dot index 104c5b5..320d5cc 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_6-9-g37cd34 (http://www.umlgraph.org/) +# Generated by UMLGraph version R5_7_2-10-g442559 (http://www.umlgraph.org/) # digraph G { @@ -22,6 +22,6 @@ digraph G { //net.sf.whatever.test.Style extends net.sf.whatever.test.AbstractBase c112:p -> c114:p [dir=back,arrowtail=empty]; // from.Outer.Space.AlienClass - c115[label=<
AlienClass
from.Outer.Space
>, fontname="arial", fontcolor="black", fontsize=9.0]; + c115[label=<
AlienClass
from.Outer.Space
>, fontname="arial", fontcolor="black", fontsize=9.0]; } diff --git a/testdata/dot-ref/ViewColors.dot b/testdata/dot-ref/ViewColors.dot index 8ab5825..2cb9a5a 100644 --- a/testdata/dot-ref/ViewColors.dot +++ b/testdata/dot-ref/ViewColors.dot @@ -1,7 +1,7 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UMLGraph version R5_6-9-g37cd34 (http://www.umlgraph.org/) +# Generated by UMLGraph version R5_7_2-10-g442559 (http://www.umlgraph.org/) # digraph G { @@ -30,6 +30,6 @@ digraph G { // gr.spinellis.basic.product.Category DEPEND java.util.List c168:p -> c202:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open, style=dashed]; // java.util.List - c202 [label=<
«interface»
List<E>
>, URL="http://java.sun.com/j2se/1.4.2/docs/api/java/util/List.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c202 [label=<
«interface»
List<E>
>, URL="http://docs.oracle.com/javase/7/docs/api/java/util/List.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; } diff --git a/testdata/dot-ref/ViewContext.dot b/testdata/dot-ref/ViewContext.dot index 30f4127..45ee6f6 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_0-10-g786d98 (http://www.umlgraph.org/) +# Generated by UMLGraph version R5_7_2-10-g442559 (http://www.umlgraph.org/) # digraph G { @@ -32,12 +32,12 @@ digraph G { // gr.spinellis.context.classes.A NAVASSOC gr.spinellis.context.classes.B c434:p -> c432:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open]; // gr.spinellis.context.classes.A NAVASSOC javax.swing.JComponent - c434:p -> c508:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open]; + c434:p -> c509:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open]; // gr.spinellis.context.classes.AClient DEPEND gr.spinellis.context.classes.A c424:p -> c434:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open, style=dashed]; // gr.spinellis.context.classes.A DEPEND gr.spinellis.context.classes.E c434:p -> c427:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open, style=dashed]; // javax.swing.JComponent - c508 [label=<
JComponent
>, URL="http://java.sun.com/j2se/1.4.2/docs/api/javax/swing/JComponent.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c509 [label=<
JComponent
>, URL="http://docs.oracle.com/javase/7/docs/api/javax/swing/JComponent.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; } From c4f32a5a741c5b2dd49465be8b6c725d37104f36 Mon Sep 17 00:00:00 2001 From: Diomidis Spinellis Date: Tue, 7 Jun 2016 17:20:48 +0300 Subject: [PATCH 07/64] Update test reference files --- .../java/org/umlgraph/doclet/UmlGraphDoc.java | 2 +- .../java/org/umlgraph/doclet/Version.java | 2 +- .../gr/spinellis/invoice/Customer.dot | 8 ++--- .../gr/spinellis/invoice/Customer.html | 16 +++------- .../gr/spinellis/invoice/Invoice.dot | 12 ++++---- .../gr/spinellis/invoice/Invoice.html | 20 +++---------- .../gr/spinellis/invoice/InvoiceItem.dot | 8 ++--- .../gr/spinellis/invoice/InvoiceItem.html | 16 +++------- .../invoice/gr.spinellis.invoice.dot | 30 +++++++++---------- .../gr/spinellis/invoice/package-frame.html | 4 +-- .../gr/spinellis/invoice/package-summary.html | 16 +++------- .../gr/spinellis/invoice/package-tree.html | 4 +-- .../gr/spinellis/product/Category.dot | 8 ++--- .../gr/spinellis/product/Category.html | 16 +++------- .../gr/spinellis/product/Product.dot | 12 ++++---- .../gr/spinellis/product/Product.html | 20 +++---------- .../product/gr.spinellis.product.dot | 6 ++-- .../gr/spinellis/product/package-frame.html | 4 +-- .../gr/spinellis/product/package-summary.html | 14 +++------ .../gr/spinellis/product/package-tree.html | 4 +-- 20 files changed, 80 insertions(+), 142 deletions(-) diff --git a/src/main/java/org/umlgraph/doclet/UmlGraphDoc.java b/src/main/java/org/umlgraph/doclet/UmlGraphDoc.java index 6dda3a2..4c829eb 100644 --- a/src/main/java/org/umlgraph/doclet/UmlGraphDoc.java +++ b/src/main/java/org/umlgraph/doclet/UmlGraphDoc.java @@ -162,7 +162,7 @@ public class UmlGraphDoc { //Format string for the uml image div tag. private static final String UML_DIV_TAG = "

" + - "" + + "" + "
"; private static final String EXPANDABLE_UML_STYLE = "font-family: Arial,Helvetica,sans-serif;font-size: 1.5em; display: block; width: 250px; height: 20px; background: #009933; padding: 5px; text-align: center; border-radius: 8px; color: white; font-weight: bold;"; diff --git a/src/main/java/org/umlgraph/doclet/Version.java b/src/main/java/org/umlgraph/doclet/Version.java index 641f0a4..6759301 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-3-gee82a7";} +class Version { public static String VERSION = "R5_7_2-11-g86574a";} \ No newline at end of file diff --git a/testdata/umldoc-ref/gr/spinellis/invoice/Customer.dot b/testdata/umldoc-ref/gr/spinellis/invoice/Customer.dot index bbe2826..995b9bb 100644 --- a/testdata/umldoc-ref/gr/spinellis/invoice/Customer.dot +++ b/testdata/umldoc-ref/gr/spinellis/invoice/Customer.dot @@ -1,7 +1,7 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UMLGraph version R5_7_0-10-g786d98 (http://www.umlgraph.org/) +# Generated by UMLGraph version R5_7_2-11-g86574a (http://www.umlgraph.org/) # digraph G { @@ -10,14 +10,14 @@ digraph G { nodesep=0.25; ranksep=0.5; // gr.spinellis.invoice.Invoice - c33 [label=<
Invoice
>, URL="./Invoice.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + 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]; + c34 [label=<
Customer
>, URL="./Customer.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.invoice.Invoice NAVASSOC gr.spinellis.invoice.Customer c33:p -> c34:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open]; // gr.spinellis.invoice.Customer NAVASSOC java.lang.String c34:p -> c44:p [taillabel="", label="", headlabel="", fontname="Helvetica", fontcolor="black", fontsize=10.0, color="black", arrowhead=open]; // java.lang.String - c44 [label=<
String
java.lang
>, URL="http://java.sun.com/j2se/1.4.2/docs/api/java/lang/String.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + 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]; } diff --git a/testdata/umldoc-ref/gr/spinellis/invoice/Customer.html b/testdata/umldoc-ref/gr/spinellis/invoice/Customer.html index d866a92..2617014 100644 --- a/testdata/umldoc-ref/gr/spinellis/invoice/Customer.html +++ b/testdata/umldoc-ref/gr/spinellis/invoice/Customer.html @@ -2,9 +2,9 @@ - + Customer - + @@ -87,16 +87,8 @@
gr.spinellis.invoice

Class Customer

- - - - - - - - - -
Package class diagram package Customer
+ +
    diff --git a/testdata/umldoc-ref/gr/spinellis/invoice/Invoice.dot b/testdata/umldoc-ref/gr/spinellis/invoice/Invoice.dot index 0139895..19d299b 100644 --- a/testdata/umldoc-ref/gr/spinellis/invoice/Invoice.dot +++ b/testdata/umldoc-ref/gr/spinellis/invoice/Invoice.dot @@ -1,7 +1,7 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UMLGraph version R5_7_0-10-g786d98 (http://www.umlgraph.org/) +# Generated by UMLGraph version R5_7_2-11-g86574a (http://www.umlgraph.org/) # digraph G { @@ -10,13 +10,13 @@ digraph G { nodesep=0.25; ranksep=0.5; // gr.spinellis.invoice.InvoiceItem - c45 [label=<
    InvoiceItem
    >, URL="./InvoiceItem.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + 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]; + 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]; + 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]; + 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 @@ -28,6 +28,6 @@ digraph G { // 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://java.sun.com/j2se/1.4.2/docs/api/java/util/Date.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + 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]; } diff --git a/testdata/umldoc-ref/gr/spinellis/invoice/Invoice.html b/testdata/umldoc-ref/gr/spinellis/invoice/Invoice.html index 2ceec08..c40f240 100644 --- a/testdata/umldoc-ref/gr/spinellis/invoice/Invoice.html +++ b/testdata/umldoc-ref/gr/spinellis/invoice/Invoice.html @@ -2,9 +2,9 @@ - + Invoice - + @@ -93,20 +93,8 @@ var activeTableTab = "activeTableTab";
    gr.spinellis.invoice

    Class Invoice

    - - - - - - - - - - - - - -
    Package class diagram package Invoice
    + +
      diff --git a/testdata/umldoc-ref/gr/spinellis/invoice/InvoiceItem.dot b/testdata/umldoc-ref/gr/spinellis/invoice/InvoiceItem.dot index 7bb3910..e55613f 100644 --- a/testdata/umldoc-ref/gr/spinellis/invoice/InvoiceItem.dot +++ b/testdata/umldoc-ref/gr/spinellis/invoice/InvoiceItem.dot @@ -1,7 +1,7 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UMLGraph version R5_7_0-10-g786d98 (http://www.umlgraph.org/) +# Generated by UMLGraph version R5_7_2-11-g86574a (http://www.umlgraph.org/) # digraph G { @@ -10,11 +10,11 @@ digraph G { nodesep=0.25; ranksep=0.5; // gr.spinellis.invoice.InvoiceItem - c51 [label=<
      InvoiceItem
      >, URL="./InvoiceItem.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + 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]; + 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]; + 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 diff --git a/testdata/umldoc-ref/gr/spinellis/invoice/InvoiceItem.html b/testdata/umldoc-ref/gr/spinellis/invoice/InvoiceItem.html index e4bc5c7..f85a4a0 100644 --- a/testdata/umldoc-ref/gr/spinellis/invoice/InvoiceItem.html +++ b/testdata/umldoc-ref/gr/spinellis/invoice/InvoiceItem.html @@ -2,9 +2,9 @@ - + InvoiceItem - + @@ -87,16 +87,8 @@
      gr.spinellis.invoice

      Class InvoiceItem

      - - - - - - - - - -
      Package class diagram package InvoiceItem
      + +
        diff --git a/testdata/umldoc-ref/gr/spinellis/invoice/gr.spinellis.invoice.dot b/testdata/umldoc-ref/gr/spinellis/invoice/gr.spinellis.invoice.dot index 44e8280..a2ad5de 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,23 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UMLGraph version 5.4 (http://www.umlgraph.org/) +# Generated by UMLGraph version R5_7_2-11-g86574a (http://www.umlgraph.org/) # digraph G { edge [fontname="Helvetica",fontsize=10,labelfontname="Helvetica",labelfontsize=10]; - node [fontname="Helvetica",fontsize=10,shape=plaintext]; - nodesep=0.25; - ranksep=0.5; - // gr.spinellis.invoice.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]; + 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]; } - + diff --git a/testdata/umldoc-ref/gr/spinellis/invoice/package-frame.html b/testdata/umldoc-ref/gr/spinellis/invoice/package-frame.html index 921b144..11cb12b 100644 --- a/testdata/umldoc-ref/gr/spinellis/invoice/package-frame.html +++ b/testdata/umldoc-ref/gr/spinellis/invoice/package-frame.html @@ -2,9 +2,9 @@ - + gr.spinellis.invoice - + diff --git a/testdata/umldoc-ref/gr/spinellis/invoice/package-summary.html b/testdata/umldoc-ref/gr/spinellis/invoice/package-summary.html index cdd36ba..a6e6f41 100644 --- a/testdata/umldoc-ref/gr/spinellis/invoice/package-summary.html +++ b/testdata/umldoc-ref/gr/spinellis/invoice/package-summary.html @@ -2,9 +2,9 @@ - + gr.spinellis.invoice - + @@ -70,16 +70,8 @@

        Package gr.spinellis.invoice

        - - - - - - - - - -
        Package class diagram package gr.spinellis.invoice
        + +
          diff --git a/testdata/umldoc-ref/gr/spinellis/invoice/package-tree.html b/testdata/umldoc-ref/gr/spinellis/invoice/package-tree.html index c9b4ea9..d1baca1 100644 --- a/testdata/umldoc-ref/gr/spinellis/invoice/package-tree.html +++ b/testdata/umldoc-ref/gr/spinellis/invoice/package-tree.html @@ -2,9 +2,9 @@ - + gr.spinellis.invoice Class Hierarchy - + diff --git a/testdata/umldoc-ref/gr/spinellis/product/Category.dot b/testdata/umldoc-ref/gr/spinellis/product/Category.dot index 0e45cb1..94aa1d1 100644 --- a/testdata/umldoc-ref/gr/spinellis/product/Category.dot +++ b/testdata/umldoc-ref/gr/spinellis/product/Category.dot @@ -1,7 +1,7 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UMLGraph version R5_7_0-10-g786d98 (http://www.umlgraph.org/) +# Generated by UMLGraph version R5_7_2-11-g86574a (http://www.umlgraph.org/) # digraph G { @@ -10,9 +10,9 @@ digraph G { nodesep=0.25; ranksep=0.5; // gr.spinellis.product.Product - c20 [label=<
          Product
          >, URL="./Product.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + 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]; + 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 @@ -20,6 +20,6 @@ digraph G { // 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://java.sun.com/j2se/1.4.2/docs/api/java/lang/String.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + 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]; } diff --git a/testdata/umldoc-ref/gr/spinellis/product/Category.html b/testdata/umldoc-ref/gr/spinellis/product/Category.html index 63c034a..69da1b9 100644 --- a/testdata/umldoc-ref/gr/spinellis/product/Category.html +++ b/testdata/umldoc-ref/gr/spinellis/product/Category.html @@ -2,9 +2,9 @@ - + Category - + @@ -87,16 +87,8 @@
          gr.spinellis.product

          Class Category

          - - - - - - - - - -
          Package class diagram package Category
          + +
            diff --git a/testdata/umldoc-ref/gr/spinellis/product/Product.dot b/testdata/umldoc-ref/gr/spinellis/product/Product.dot index 0f756b1..e34b4d9 100644 --- a/testdata/umldoc-ref/gr/spinellis/product/Product.dot +++ b/testdata/umldoc-ref/gr/spinellis/product/Product.dot @@ -1,7 +1,7 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UMLGraph version R5_7_0-10-g786d98 (http://www.umlgraph.org/) +# Generated by UMLGraph version R5_7_2-11-g86574a (http://www.umlgraph.org/) # digraph G { @@ -10,13 +10,13 @@ digraph G { 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]; + 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]; + 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]; + 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]; + 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 @@ -30,6 +30,6 @@ digraph G { // 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://java.sun.com/j2se/1.4.2/docs/api/java/lang/String.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + 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]; } diff --git a/testdata/umldoc-ref/gr/spinellis/product/Product.html b/testdata/umldoc-ref/gr/spinellis/product/Product.html index 42dbb65..5319c4b 100644 --- a/testdata/umldoc-ref/gr/spinellis/product/Product.html +++ b/testdata/umldoc-ref/gr/spinellis/product/Product.html @@ -2,9 +2,9 @@ - + Product - + @@ -87,20 +87,8 @@
            gr.spinellis.product

            Class Product

            - - - - - - - - - - - - - -
            Package class diagram package Product
            + +
              diff --git a/testdata/umldoc-ref/gr/spinellis/product/gr.spinellis.product.dot b/testdata/umldoc-ref/gr/spinellis/product/gr.spinellis.product.dot index a1e9f6d..04606aa 100644 --- a/testdata/umldoc-ref/gr/spinellis/product/gr.spinellis.product.dot +++ b/testdata/umldoc-ref/gr/spinellis/product/gr.spinellis.product.dot @@ -1,7 +1,7 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UMLGraph version R5_7_0-10-g786d98 (http://www.umlgraph.org/) +# Generated by UMLGraph version R5_7_2-11-g86574a (http://www.umlgraph.org/) # digraph G { @@ -10,9 +10,9 @@ digraph G { nodesep=0.25; ranksep=0.5; // gr.spinellis.product.Product - c8 [label=<
              Product
              >, URL="./Product.html", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + 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]; + 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]; } diff --git a/testdata/umldoc-ref/gr/spinellis/product/package-frame.html b/testdata/umldoc-ref/gr/spinellis/product/package-frame.html index ac90d4e..7c2f904 100644 --- a/testdata/umldoc-ref/gr/spinellis/product/package-frame.html +++ b/testdata/umldoc-ref/gr/spinellis/product/package-frame.html @@ -2,9 +2,9 @@ - + gr.spinellis.product - + diff --git a/testdata/umldoc-ref/gr/spinellis/product/package-summary.html b/testdata/umldoc-ref/gr/spinellis/product/package-summary.html index 38a8409..06156cb 100644 --- a/testdata/umldoc-ref/gr/spinellis/product/package-summary.html +++ b/testdata/umldoc-ref/gr/spinellis/product/package-summary.html @@ -2,9 +2,9 @@ - + gr.spinellis.product - + @@ -70,14 +70,8 @@

              Package gr.spinellis.product

              - - - - - - - -
              Package class diagram package gr.spinellis.product
              + +
                diff --git a/testdata/umldoc-ref/gr/spinellis/product/package-tree.html b/testdata/umldoc-ref/gr/spinellis/product/package-tree.html index 8fcbdce..ba79b80 100644 --- a/testdata/umldoc-ref/gr/spinellis/product/package-tree.html +++ b/testdata/umldoc-ref/gr/spinellis/product/package-tree.html @@ -2,9 +2,9 @@ - + gr.spinellis.product Class Hierarchy - + From db1a918e16a9c6f45bfd99bdbd31632dd1d37363 Mon Sep 17 00:00:00 2001 From: Diomidis Spinellis Date: Tue, 7 Jun 2016 17:23:40 +0300 Subject: [PATCH 08/64] Remove repeated @override --- src/main/java/org/umlgraph/doclet/ContextMatcher.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/org/umlgraph/doclet/ContextMatcher.java b/src/main/java/org/umlgraph/doclet/ContextMatcher.java index ce2658a..e1fe4db 100644 --- a/src/main/java/org/umlgraph/doclet/ContextMatcher.java +++ b/src/main/java/org/umlgraph/doclet/ContextMatcher.java @@ -168,7 +168,6 @@ public class ContextMatcher implements ClassMatcher { prologue(); } - @Override @Override public void prologue() throws IOException { w = new PrintWriter(new DevNullWriter()); From 09fab1724df8d4567c4b6aace2dba5a01f7488b6 Mon Sep 17 00:00:00 2001 From: Diomidis Spinellis Date: Thu, 9 Jun 2016 08:10:13 +0300 Subject: [PATCH 09/64] Add reference to textual UML tool survey --- doc/bib.bib | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/doc/bib.bib b/doc/bib.bib index bf14c2c..9d6f40b 100644 --- a/doc/bib.bib +++ b/doc/bib.bib @@ -110,3 +110,14 @@ Note="Available online \url{http://java.dzone.com/articles/reverse-engineer-source-code-u}", Author="Meera Subbarao" } + +@CONFERENCE{SG16, + author={Seifermann, S. and Groenda, H.}, + title={Survey on textual notations for the Unified Modeling Language}, + journal={MODELSWARD 2016 - Proceedings of the 4th International Conference on Model-Driven Engineering and Software Development}, + year={2016}, + pages={28--39}, + note={cited By 0}, + url={https://www.cooperate-project.de/images/publications/MODELSWARD2016.pdf}, + document_type={Conference Paper}, +} From a72c88fb701a2423318ed894ba4d7cb06741507d Mon Sep 17 00:00:00 2001 From: Diomidis Spinellis Date: Fri, 16 Sep 2016 23:33:15 +0300 Subject: [PATCH 10/64] Running testupdate requires bash --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a44ec41..3226bdc 100644 --- a/Makefile +++ b/Makefile @@ -65,7 +65,7 @@ test: ant test testupdate: - sh tools/testupdate.sh + bash tools/testupdate.sh # Create only the static HTML pages static-web: From 30a611ec9178bd1da3440248a7562737203a225e Mon Sep 17 00:00:00 2001 From: Diomidis Spinellis Date: Fri, 16 Sep 2016 23:30:36 +0300 Subject: [PATCH 11/64] Update project web page location --- Makefile | 2 +- README.mediawiki | 8 ++++---- README.txt | 4 ++-- doc/Makefile | 2 +- pom.template.xml | 2 +- pom.xml | 2 +- .../java/org/umlgraph/doclet/ClassGraph.java | 2 +- .../java/org/umlgraph/doclet/UmlGraphDoc.java | 2 +- .../java/org/umlgraph/doclet/Version.java | 2 +- testdata/dot-ref/ViewInterfaces.dot | 20 +++++++++---------- testdata/dot-ref/ViewSubclasses.dot | 20 +++++++++---------- testdata/umldoc-ref/allclasses-frame.html | 4 ++-- testdata/umldoc-ref/allclasses-noframe.html | 4 ++-- testdata/umldoc-ref/constant-values.html | 4 ++-- testdata/umldoc-ref/deprecated-list.html | 4 ++-- .../gr/spinellis/invoice/Customer.html | 6 +++--- .../gr/spinellis/invoice/Invoice.html | 6 +++--- .../gr/spinellis/invoice/InvoiceItem.html | 6 +++--- .../gr/spinellis/invoice/package-frame.html | 4 ++-- .../gr/spinellis/invoice/package-summary.html | 6 +++--- .../gr/spinellis/invoice/package-tree.html | 4 ++-- .../gr/spinellis/product/Category.html | 6 +++--- .../gr/spinellis/product/Product.html | 6 +++--- .../gr/spinellis/product/package-frame.html | 4 ++-- .../gr/spinellis/product/package-summary.html | 6 +++--- .../gr/spinellis/product/package-tree.html | 4 ++-- testdata/umldoc-ref/help-doc.html | 4 ++-- testdata/umldoc-ref/index-all.html | 4 ++-- testdata/umldoc-ref/overview-frame.html | 4 ++-- testdata/umldoc-ref/overview-summary.html | 4 ++-- testdata/umldoc-ref/overview-tree.html | 4 ++-- 31 files changed, 80 insertions(+), 80 deletions(-) diff --git a/Makefile b/Makefile index 3226bdc..3fdccf6 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ VERSION:=$(shell git describe --abbrev=6 HEAD | sed 's/R//;s/_/./;s/-/./;s/-.*$$ BALL_TAR_GZ=UMLGraph-$(VERSION).tar.gz ZIPBALL=UMLGraph-$(VERSION).zip DISTDIR=UMLGraph-$(VERSION) -WEBDIR=$(UH)/dds/pubs/web/home/sw/umlgraph-mirror +WEBDIR=$(UH)/dds/pubs/web/home/umlgraph DOCLETSRCPATH=src/main/java/org/umlgraph/doclet DOCLETSRC= \ $(DOCLETSRCPATH)/ClassGraph.java \ diff --git a/README.mediawiki b/README.mediawiki index ecd836b..a26cb1f 100644 --- a/README.mediawiki +++ b/README.mediawiki @@ -3,8 +3,8 @@ ''UMLGraph'' allows the declarative specification and drawing of UML diagrams. You can browse the system's documentation -through [http://umlgraph.org/doc/index.html this link], -or print it through [http://umlgraph.org/doc/indexw.html this link]. +through [http://spinellis.gr/umlgraph/doc/index.html this link], +or print it through [http://spinellis.gr/umlgraph/doc/indexw.html this link]. To install the elements required to run ''UMLGraph'', simply copy the contents of the ''lib'' directory to a location consistent with @@ -16,8 +16,8 @@ To compile the Java doclet from the source code run ''ant'' on the If you change the source code, you can run regression tests by executing ''ant test''. -Visit the project's [http://www.umlgraph.org home page] for more information. +Visit the project's [http://www.spinellis.gr/umlgraph home page] for more information. ---- -Diomidis Spinellis - November 2005, August 2008, April 2012 +Diomidis Spinellis - November 2005, August 2008, April 2012, September 2016 diff --git a/README.txt b/README.txt index f675266..ad3b91a 100644 --- a/README.txt +++ b/README.txt @@ -15,7 +15,7 @@ build.xml file. If you change the source code, you can run regression tests by executing "ant test". -Project home page: http://www.umlgraph.org +Project home page: http://www.spinellis.gr/umlgraph GitHub page: git@github.com:dspinellis/UMLGraph.git -Diomidis Spinellis - November 2005, August 2008, April 2012 +Diomidis Spinellis - November 2005, August 2008, April 2012, September 2016 diff --git a/doc/Makefile b/doc/Makefile index 9dd11d0..2611a20 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -4,7 +4,7 @@ ROOT=/cygdrive/c PIC2PLOT=pic2plot GS=gs -DESTDIR=/dds/pubs/web/home/sw/umlgraph-mirror +DESTDIR=/dds/pubs/web/home/umlgraph NOTETOOLS=/dds/pubs/Courses/tools GIF := $(shell sed -n 's/.*UMLGraph ${version} Declarative Drawing of UML Diagrams - http://www.umlgraph.org + http://www.spinellis.gr/umlgraph diff --git a/pom.xml b/pom.xml index 1e0e4d0..bbb7c9e 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ UMLGraph 5.7.3-SNAPSHOT Declarative Drawing of UML Diagrams - http://www.umlgraph.org + http://www.spinellis.gr/umlgraph diff --git a/src/main/java/org/umlgraph/doclet/ClassGraph.java b/src/main/java/org/umlgraph/doclet/ClassGraph.java index f8a038c..aa5b02a 100644 --- a/src/main/java/org/umlgraph/doclet/ClassGraph.java +++ b/src/main/java/org/umlgraph/doclet/ClassGraph.java @@ -1143,7 +1143,7 @@ class ClassGraph { "#\n" + "# Class diagram \n" + "# Generated by UMLGraph version " + - Version.VERSION + " (http://www.umlgraph.org/)\n" + + Version.VERSION + " (http://www.spinellis.gr/umlgraph/)\n" + "#\n\n" + "digraph G {\n" + "\tedge [fontname=\"" + opt.edgeFontName + diff --git a/src/main/java/org/umlgraph/doclet/UmlGraphDoc.java b/src/main/java/org/umlgraph/doclet/UmlGraphDoc.java index 5cef476..0f9a00f 100644 --- a/src/main/java/org/umlgraph/doclet/UmlGraphDoc.java +++ b/src/main/java/org/umlgraph/doclet/UmlGraphDoc.java @@ -222,7 +222,7 @@ public class UmlGraphDoc { tag = String.format(EXPANDABLE_UML, tag, "Show UML class diagram", "Hide UML class diagram"); writer.write(""); + " (http://www.spinellis.gr/umlgraph/) -->"); writer.newLine(); writer.write(tag); writer.newLine(); diff --git a/src/main/java/org/umlgraph/doclet/Version.java b/src/main/java/org/umlgraph/doclet/Version.java index 6759301..626e9f8 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-11-g86574a";} +class Version { public static String VERSION = "R5_7_2-22-g58087c";} \ No newline at end of file diff --git a/testdata/dot-ref/ViewInterfaces.dot b/testdata/dot-ref/ViewInterfaces.dot index c6f8f17..f7d2b69 100644 --- a/testdata/dot-ref/ViewInterfaces.dot +++ b/testdata/dot-ref/ViewInterfaces.dot @@ -1,7 +1,7 @@ #!/usr/local/bin/dot # # Class diagram -# Generated by UMLGraph version R5_7_0-10-g786d98 (http://www.umlgraph.org/) +# Generated by UMLGraph version R5_7_2-20-g09fab1 (http://www.umlgraph.org/) # digraph G { @@ -10,22 +10,22 @@ digraph G { nodesep=0.25; ranksep=0.5; // gr.spinellis.iface.classes.FarImplementor - c533 [label=<
                FarImplementor
                >, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c534 [label=<
                FarImplementor
                >, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.iface.classes.DirectImplementor - c534 [label=<
                DirectImplementor
                >, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c535 [label=<
                DirectImplementor
                >, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.iface.classes.SubSubFace - c536 [label=<
                «interface»
                SubSubFace
                >, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c537 [label=<
                «interface»
                SubSubFace
                >, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.iface.classes.SubFace - c537 [label=<
                «interface»
                SubFace
                >, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c538 [label=<
                «interface»
                SubFace
                >, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.iface.classes.Face - c538 [label=<
                «interface»
                Face
                >, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c539 [label=<
                «interface»
                Face
                >, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0]; //gr.spinellis.iface.classes.FarImplementor implements gr.spinellis.iface.classes.SubSubFace - c536:p -> c533:p [dir=back,arrowtail=empty,style=dashed]; + c537:p -> c534:p [dir=back,arrowtail=empty,style=dashed]; //gr.spinellis.iface.classes.DirectImplementor implements gr.spinellis.iface.classes.Face - c538:p -> c534:p [dir=back,arrowtail=empty,style=dashed]; + c539:p -> c535:p [dir=back,arrowtail=empty,style=dashed]; //gr.spinellis.iface.classes.SubSubFace implements gr.spinellis.iface.classes.SubFace - c537:p -> c536:p [dir=back,arrowtail=empty,style=dashed]; - //gr.spinellis.iface.classes.SubFace implements gr.spinellis.iface.classes.Face c538:p -> c537:p [dir=back,arrowtail=empty,style=dashed]; + //gr.spinellis.iface.classes.SubFace implements gr.spinellis.iface.classes.Face + c539:p -> c538:p [dir=back,arrowtail=empty,style=dashed]; } diff --git a/testdata/dot-ref/ViewSubclasses.dot b/testdata/dot-ref/ViewSubclasses.dot index 965eaad..a4034a4 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_0-10-g786d98 (http://www.umlgraph.org/) +# Generated by UMLGraph version R5_7_2-20-g09fab1 (http://www.umlgraph.org/) # digraph G { @@ -10,22 +10,22 @@ digraph G { nodesep=0.25; ranksep=0.5; // gr.spinellis.subclass.classes.SubOneTwo - c579 [label=<
                SubOneTwo
                >, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c580 [label=<
                SubOneTwo
                >, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.subclass.classes.SubOneOne - c580 [label=<
                SubOneOne
                >, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c581 [label=<
                SubOneOne
                >, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.subclass.classes.SubTwo - c581 [label=<
                SubTwo
                >, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c582 [label=<
                SubTwo
                >, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.subclass.classes.SubOne - c582 [label=<
                SubOne
                >, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c583 [label=<
                SubOne
                >, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0]; // gr.spinellis.subclass.classes.Super - c583 [label=<
                Super
                >, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0]; + c584 [label=<
                Super
                >, URL="null", fontname="Helvetica", fontcolor="black", fontsize=10.0]; //gr.spinellis.subclass.classes.SubOneTwo extends gr.spinellis.subclass.classes.SubOne - c582:p -> c579:p [dir=back,arrowtail=empty]; + c583:p -> c580:p [dir=back,arrowtail=empty]; //gr.spinellis.subclass.classes.SubOneOne extends gr.spinellis.subclass.classes.SubOne - c582:p -> c580:p [dir=back,arrowtail=empty]; - //gr.spinellis.subclass.classes.SubTwo extends gr.spinellis.subclass.classes.Super c583:p -> c581:p [dir=back,arrowtail=empty]; + //gr.spinellis.subclass.classes.SubTwo extends gr.spinellis.subclass.classes.Super + c584:p -> c582:p [dir=back,arrowtail=empty]; //gr.spinellis.subclass.classes.SubOne extends gr.spinellis.subclass.classes.Super - c583:p -> c582:p [dir=back,arrowtail=empty]; + c584:p -> c583:p [dir=back,arrowtail=empty]; } diff --git a/testdata/umldoc-ref/allclasses-frame.html b/testdata/umldoc-ref/allclasses-frame.html index 9846d5f..28f5e4c 100644 --- a/testdata/umldoc-ref/allclasses-frame.html +++ b/testdata/umldoc-ref/allclasses-frame.html @@ -2,9 +2,9 @@ - + All Classes - + diff --git a/testdata/umldoc-ref/allclasses-noframe.html b/testdata/umldoc-ref/allclasses-noframe.html index e0eaff6..146049b 100644 --- a/testdata/umldoc-ref/allclasses-noframe.html +++ b/testdata/umldoc-ref/allclasses-noframe.html @@ -2,9 +2,9 @@ - + All Classes - + diff --git a/testdata/umldoc-ref/constant-values.html b/testdata/umldoc-ref/constant-values.html index a014f71..8420a09 100644 --- a/testdata/umldoc-ref/constant-values.html +++ b/testdata/umldoc-ref/constant-values.html @@ -2,9 +2,9 @@ - + Constant Field Values - + diff --git a/testdata/umldoc-ref/deprecated-list.html b/testdata/umldoc-ref/deprecated-list.html index 83cd591..b0a26cb 100644 --- a/testdata/umldoc-ref/deprecated-list.html +++ b/testdata/umldoc-ref/deprecated-list.html @@ -2,9 +2,9 @@ - + Deprecated List - + diff --git a/testdata/umldoc-ref/gr/spinellis/invoice/Customer.html b/testdata/umldoc-ref/gr/spinellis/invoice/Customer.html index 2617014..ba23451 100644 --- a/testdata/umldoc-ref/gr/spinellis/invoice/Customer.html +++ b/testdata/umldoc-ref/gr/spinellis/invoice/Customer.html @@ -2,9 +2,9 @@ - + Customer - + @@ -87,7 +87,7 @@
                gr.spinellis.invoice

                Class Customer

                - +
                diff --git a/testdata/umldoc-ref/gr/spinellis/invoice/Invoice.html b/testdata/umldoc-ref/gr/spinellis/invoice/Invoice.html index c40f240..5f61204 100644 --- a/testdata/umldoc-ref/gr/spinellis/invoice/Invoice.html +++ b/testdata/umldoc-ref/gr/spinellis/invoice/Invoice.html @@ -2,9 +2,9 @@ - + Invoice - + @@ -93,7 +93,7 @@ var activeTableTab = "activeTableTab";
                gr.spinellis.invoice

                Class Invoice

                - +
                diff --git a/testdata/umldoc-ref/gr/spinellis/invoice/InvoiceItem.html b/testdata/umldoc-ref/gr/spinellis/invoice/InvoiceItem.html index f85a4a0..17c264f 100644 --- a/testdata/umldoc-ref/gr/spinellis/invoice/InvoiceItem.html +++ b/testdata/umldoc-ref/gr/spinellis/invoice/InvoiceItem.html @@ -2,9 +2,9 @@ - + InvoiceItem - + @@ -87,7 +87,7 @@
                gr.spinellis.invoice

                Class InvoiceItem

                - +
                diff --git a/testdata/umldoc-ref/gr/spinellis/invoice/package-frame.html b/testdata/umldoc-ref/gr/spinellis/invoice/package-frame.html index 11cb12b..411921d 100644 --- a/testdata/umldoc-ref/gr/spinellis/invoice/package-frame.html +++ b/testdata/umldoc-ref/gr/spinellis/invoice/package-frame.html @@ -2,9 +2,9 @@ - + gr.spinellis.invoice - + diff --git a/testdata/umldoc-ref/gr/spinellis/invoice/package-summary.html b/testdata/umldoc-ref/gr/spinellis/invoice/package-summary.html index a6e6f41..d483dd8 100644 --- a/testdata/umldoc-ref/gr/spinellis/invoice/package-summary.html +++ b/testdata/umldoc-ref/gr/spinellis/invoice/package-summary.html @@ -2,9 +2,9 @@ - + gr.spinellis.invoice - + @@ -70,7 +70,7 @@

                Package gr.spinellis.invoice

                - +
                diff --git a/testdata/umldoc-ref/gr/spinellis/invoice/package-tree.html b/testdata/umldoc-ref/gr/spinellis/invoice/package-tree.html index d1baca1..6962278 100644 --- a/testdata/umldoc-ref/gr/spinellis/invoice/package-tree.html +++ b/testdata/umldoc-ref/gr/spinellis/invoice/package-tree.html @@ -2,9 +2,9 @@ - + gr.spinellis.invoice Class Hierarchy - + diff --git a/testdata/umldoc-ref/gr/spinellis/product/Category.html b/testdata/umldoc-ref/gr/spinellis/product/Category.html index 69da1b9..6aa7fdc 100644 --- a/testdata/umldoc-ref/gr/spinellis/product/Category.html +++ b/testdata/umldoc-ref/gr/spinellis/product/Category.html @@ -2,9 +2,9 @@ - + Category - + @@ -87,7 +87,7 @@
                gr.spinellis.product

                Class Category

                - +
                diff --git a/testdata/umldoc-ref/gr/spinellis/product/Product.html b/testdata/umldoc-ref/gr/spinellis/product/Product.html index 5319c4b..10898ea 100644 --- a/testdata/umldoc-ref/gr/spinellis/product/Product.html +++ b/testdata/umldoc-ref/gr/spinellis/product/Product.html @@ -2,9 +2,9 @@ - + Product - + @@ -87,7 +87,7 @@
                gr.spinellis.product

                Class Product

                - +
                diff --git a/testdata/umldoc-ref/gr/spinellis/product/package-frame.html b/testdata/umldoc-ref/gr/spinellis/product/package-frame.html index 7c2f904..662a0b7 100644 --- a/testdata/umldoc-ref/gr/spinellis/product/package-frame.html +++ b/testdata/umldoc-ref/gr/spinellis/product/package-frame.html @@ -2,9 +2,9 @@ - + gr.spinellis.product - + diff --git a/testdata/umldoc-ref/gr/spinellis/product/package-summary.html b/testdata/umldoc-ref/gr/spinellis/product/package-summary.html index 06156cb..35ba92b 100644 --- a/testdata/umldoc-ref/gr/spinellis/product/package-summary.html +++ b/testdata/umldoc-ref/gr/spinellis/product/package-summary.html @@ -2,9 +2,9 @@ - + gr.spinellis.product - + @@ -70,7 +70,7 @@

                Package gr.spinellis.product

                - +
                diff --git a/testdata/umldoc-ref/gr/spinellis/product/package-tree.html b/testdata/umldoc-ref/gr/spinellis/product/package-tree.html index ba79b80..274f24f 100644 --- a/testdata/umldoc-ref/gr/spinellis/product/package-tree.html +++ b/testdata/umldoc-ref/gr/spinellis/product/package-tree.html @@ -2,9 +2,9 @@ - + gr.spinellis.product Class Hierarchy - + diff --git a/testdata/umldoc-ref/help-doc.html b/testdata/umldoc-ref/help-doc.html index c56e4a1..1c49f83 100644 --- a/testdata/umldoc-ref/help-doc.html +++ b/testdata/umldoc-ref/help-doc.html @@ -2,9 +2,9 @@ - + API Help - + diff --git a/testdata/umldoc-ref/index-all.html b/testdata/umldoc-ref/index-all.html index ab1cb74..1363a3d 100644 --- a/testdata/umldoc-ref/index-all.html +++ b/testdata/umldoc-ref/index-all.html @@ -2,9 +2,9 @@ - + Index - + diff --git a/testdata/umldoc-ref/overview-frame.html b/testdata/umldoc-ref/overview-frame.html index f5135cf..2c1f324 100644 --- a/testdata/umldoc-ref/overview-frame.html +++ b/testdata/umldoc-ref/overview-frame.html @@ -2,9 +2,9 @@ - + Overview List - + diff --git a/testdata/umldoc-ref/overview-summary.html b/testdata/umldoc-ref/overview-summary.html index 442672b..dc7ece5 100644 --- a/testdata/umldoc-ref/overview-summary.html +++ b/testdata/umldoc-ref/overview-summary.html @@ -2,9 +2,9 @@ - + Overview - + diff --git a/testdata/umldoc-ref/overview-tree.html b/testdata/umldoc-ref/overview-tree.html index f40f7bc..1ed9cff 100644 --- a/testdata/umldoc-ref/overview-tree.html +++ b/testdata/umldoc-ref/overview-tree.html @@ -2,9 +2,9 @@ - + Class Hierarchy - + From d0ede46da8aaff13bccd1f2b3fd201bb383d68f9 Mon Sep 17 00:00:00 2001 From: Diomidis Spinellis Date: Fri, 16 Sep 2016 23:47:03 +0300 Subject: [PATCH 12/64] Correct URL --- README.mediawiki | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.mediawiki b/README.mediawiki index a26cb1f..e181953 100644 --- a/README.mediawiki +++ b/README.mediawiki @@ -3,8 +3,8 @@ ''UMLGraph'' allows the declarative specification and drawing of UML diagrams. You can browse the system's documentation -through [http://spinellis.gr/umlgraph/doc/index.html this link], -or print it through [http://spinellis.gr/umlgraph/doc/indexw.html this link]. +through [http://www.spinellis.gr/umlgraph/doc/index.html this link], +or print it through [http://www.spinellis.gr/umlgraph/doc/indexw.html this link]. To install the elements required to run ''UMLGraph'', simply copy the contents of the ''lib'' directory to a location consistent with From 37dc189a29a4c2973de12d5568220d1159bbe944 Mon Sep 17 00:00:00 2001 From: Georgios Gousios Date: Tue, 20 Sep 2016 15:05:14 +0200 Subject: [PATCH 13/64] s/SQO-OSS/Alitheia Core/ Also, add link to the annotated source code. --- doc/ceg-er.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/ceg-er.xml b/doc/ceg-er.xml index 19ab1c4..16783ec 100644 --- a/doc/ceg-er.xml +++ b/doc/ceg-er.xml @@ -1,11 +1,12 @@ -The following was generated by annotating the source code of the -SQO-OSS project. +The following was generated by annotating the +source code of the +Alitheia Core project. Georgios Gousios, who created it, wrote:

                -I've used UMLgraph to generate an E-R diagram out of the DAOs we use in SQO-OSS. I've just annotated a few classes with @assoc tags, removed the super class DAObject from all entities with sed, did some tweaking by hand in the .dot output, et voila, an E-R depicting almost 30 classes in less than 30 minutes! +I've used UMLgraph to generate an E-R diagram out of the DAOs we use in Alitheia Core. I've just annotated a few classes with @assoc tags, removed the super class DAObject from all entities with sed, did some tweaking by hand in the .dot output, et voila, an E-R depicting almost 30 classes in less than 30 minutes!

                From e307530d8e828c6ec1993a24cd501f45db5f7d8e Mon Sep 17 00:00:00 2001 From: Diomidis Spinellis Date: Mon, 24 Oct 2016 20:38:25 +0300 Subject: [PATCH 14/64] Correct UMLGraph location --- doc/ceg-mv.xml | 2 +- src/main/java/org/umlgraph/doclet/Version.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/ceg-mv.xml b/doc/ceg-mv.xml index 4e59ab6..7eb9d79 100644 --- a/doc/ceg-mv.xml +++ b/doc/ceg-mv.xml @@ -61,7 +61,7 @@ class DataOperation extends Element {} # Author: Vadim Nasardinov (vadimn@redhat.com) # Since: 2004-05-26 -# See: http://www.spinellis.gr/sw/umlgraph/doc/ceg-mv.html +# See: http://www.spinellis.gr/umlgraph/doc/ceg-mv.html # Requires: graphviz # Requires: javadoc diff --git a/src/main/java/org/umlgraph/doclet/Version.java b/src/main/java/org/umlgraph/doclet/Version.java index 626e9f8..b835016 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-22-g58087c";} +class Version { public static String VERSION = "R5_7_2-23-gd0ede4";} \ No newline at end of file From 962ad5af72abaf277a4ce93a7eb40c77dcaed0f3 Mon Sep 17 00:00:00 2001 From: Adrian Neumann Date: Wed, 15 Mar 2017 16:46:24 +0100 Subject: [PATCH 15/64] Update index.html fix typo --- web/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/index.html b/web/index.html index 21d4e8d..1956959 100644 --- a/web/index.html +++ b/web/index.html @@ -10,7 +10,7 @@ all types UML diagrams. An IEEE Software article titled On the declarative specification of models explains the rationale behind this approach. -The tehnology behind UMLGraph was used to draw many of the diagrams +The technology behind UMLGraph was used to draw many of the diagrams appearing in the award-winning books Code Quality: The Open Source Perspective (Addison Wesley, 2006) and Code Reading: The Open Source Perspective (Addison Wesley, 2003). From 160a7db3a7391c280ad85dc2e5494416733aea97 Mon Sep 17 00:00:00 2001 From: Robert Ross Date: Tue, 21 Mar 2017 13:20:15 -0400 Subject: [PATCH 16/64] Added "-autosize" parameter and fixed parameter matching bug with "!" --- .classpath | 16 ++++++----- build.xml | 1 + doc/cd-opt.xml | 5 ++-- pom.xml | 1 + .../java/org/umlgraph/doclet/Options.java | 27 ++++++++++++------- .../java/org/umlgraph/doclet/UmlGraphDoc.java | 13 +++++++-- .../java/org/umlgraph/doclet/Version.java | 2 +- 7 files changed, 43 insertions(+), 22 deletions(-) diff --git a/.classpath b/.classpath index 4e00818..0c326bc 100644 --- a/.classpath +++ b/.classpath @@ -1,7 +1,9 @@ - - - - - - - + + + + + + + + + diff --git a/build.xml b/build.xml index ebf912c..7074049 100644 --- a/build.xml +++ b/build.xml @@ -156,6 +156,7 @@ class Version { public static String VERSION = "${VERSION}";} + diff --git a/doc/cd-opt.xml b/doc/cd-opt.xml index 836f8b9..dfe583b 100644 --- a/doc/cd-opt.xml +++ b/doc/cd-opt.xml @@ -39,6 +39,7 @@ be specified through javadoc tags within the diagram, affecting all or some elem

                Visual Appearance

                -bgcolor
                Specify the graph's background color.
                +
                -autosize
                Fits generated graph to the width of the page/window. Defaults to true.
                -collapsible
                Enhance the javadoc HTML files containing UML diagrams with Javascript that provides a link for showing the (initially collapsed) diagrams.
                -edgecolor
                Specify the color for drawing edges.
                -edgefontcolor
                Specify the font color to use for edge labels.
                @@ -77,9 +78,9 @@ be specified through javadoc tags within the diagram, affecting all or some elem

                All colors can be either a symbolic name (e.g. blue), -a tripple specifying hue-saturation-brightness as values 0-1 +a triple specifying hue-saturation-brightness as values 0-1 (e.g. ".13 0.9 1"), -or a tripple specifying red-green-blue values as hexadecimal +or a triple specifying red-green-blue values as hexadecimal digits prefixed by a # (e.g. "#ff8020"). The symbolic color names are derived from the X Windows System; you can find a complete list in the diff --git a/pom.xml b/pom.xml index bbb7c9e..6c9edd3 100644 --- a/pom.xml +++ b/pom.xml @@ -128,6 +128,7 @@ ${project.build.directory}${file.separator}${project.build.finalName}.jar -inferrel -inferdep + -autosize -collapsible -hide java.* -collpackages diff --git a/src/main/java/org/umlgraph/doclet/Options.java b/src/main/java/org/umlgraph/doclet/Options.java index 22cb359..3bca4a8 100644 --- a/src/main/java/org/umlgraph/doclet/Options.java +++ b/src/main/java/org/umlgraph/doclet/Options.java @@ -77,6 +77,7 @@ public class Options implements Cloneable, OptionProvider { boolean horizontal; boolean showType; boolean showComment; + boolean autoSize; String edgeFontName; String edgeFontColor; String edgeColor; @@ -144,6 +145,7 @@ public class Options implements Cloneable, OptionProvider { showEnumerations = false; showConstructors = false; showType = false; + autoSize = true; showComment = false; edgeFontName = defaultFont; edgeFontColor = "black"; @@ -221,19 +223,20 @@ public class Options implements Cloneable, OptionProvider { * Will return 0 if the option is not supported. */ public static int optionLength(String option) { - if(option.equals("-qualify") || - option.equals("-horizontal") || - option.equals("-attributes") || - option.equals("-operations") || - option.equals("-constructors") || - option.equals("-visibility") || - option.equals("-types") || - option.equals("-commentname") || + if(option.equals("-qualify") || option.equals("-!qualify") || + option.equals("-horizontal") || option.equals("-!horizontal") || + option.equals("-attributes") || option.equals("-!attributes") || + option.equals("-enumconstants") || option.equals("-!enumconstants") || + option.equals("-operations") || option.equals("-!operations") || + option.equals("-enumerations") || option.equals("-!enumerations") || + option.equals("-constructors") || option.equals("-!constructors") || + option.equals("-visibility") || option.equals("-!visibility") || + option.equals("-types") || option.equals("-!types") || + option.equals("-autosize") || option.equals("-!autosize") || + option.equals("-commentname") || option.equals("-!commentname") || option.equals("-all") || option.equals("-postfixpackage") || option.equals("-noguillemot") || - option.equals("-enumconstants") || - option.equals("-enumerations") || option.equals("-views") || option.equals("-inferrel") || option.equals("-useimports") || @@ -326,6 +329,10 @@ public class Options implements Cloneable, OptionProvider { showType = true; } else if (opt[0].equals("-!types")) { showType = false; + } else if(opt[0].equals("-autoSize")) { + autoSize = true; + } else if (opt[0].equals("-!autoSize")) { + autoSize = false; } else if(opt[0].equals("-commentname")) { showComment = true; } else if (opt[0].equals("-!commentname")) { diff --git a/src/main/java/org/umlgraph/doclet/UmlGraphDoc.java b/src/main/java/org/umlgraph/doclet/UmlGraphDoc.java index 0f9a00f..fe6bbf1 100644 --- a/src/main/java/org/umlgraph/doclet/UmlGraphDoc.java +++ b/src/main/java/org/umlgraph/doclet/UmlGraphDoc.java @@ -162,9 +162,14 @@ public class UmlGraphDoc { //Format string for the uml image div tag. private static final String UML_DIV_TAG = "

                " + - "" + + "" + "
                "; + private static final String UML_AUTO_SIZED_DIV_TAG = + "
                " + + "" + + "
                "; + private static final String EXPANDABLE_UML_STYLE = "font-family: Arial,Helvetica,sans-serif;font-size: 1.5em; display: block; width: 250px; height: 20px; background: #009933; padding: 5px; text-align: center; border-radius: 8px; color: white; font-weight: bold;"; //Format string for the java script tag. @@ -217,7 +222,11 @@ public class UmlGraphDoc { if (!matched && insertPointPattern.matcher(line).matches()) { matched = true; - String tag = String.format(UML_DIV_TAG, className); + String tag; + if (opt.autoSize) + tag = String.format(UML_AUTO_SIZED_DIV_TAG, className); + else + tag = String.format(UML_DIV_TAG, className); if (opt.collapsibleDiagrams) tag = String.format(EXPANDABLE_UML, tag, "Show UML class diagram", "Hide UML class diagram"); writer.write(" - + Generated Documentation (Untitled)