From a463b627fb0e26322879656f39273c9c063ccbe7 Mon Sep 17 00:00:00 2001 From: Daniel TISCHER Date: Sun, 9 Feb 2014 11:18:57 +0100 Subject: [PATCH 1/3] check if source and dest are not already linked --- src/main/java/org/umlgraph/doclet/ClassGraph.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/umlgraph/doclet/ClassGraph.java b/src/main/java/org/umlgraph/doclet/ClassGraph.java index 8afe663..9ef19c4 100644 --- a/src/main/java/org/umlgraph/doclet/ClassGraph.java +++ b/src/main/java/org/umlgraph/doclet/ClassGraph.java @@ -841,8 +841,12 @@ class ClassGraph { if (hidden(fri.cd)) continue; - String destAdornment = fri.multiple ? "*" : ""; - relation(opt, opt.inferRelationshipType, c, fri.cd, "", "", destAdornment); + // if source and dest are not already linked, add a dependency + RelationPattern rp = getClassInfo(c.toString()).getRelation(fri.cd.toString()); + if (rp == null) { + String destAdornment = fri.multiple ? "*" : ""; + relation(opt, opt.inferRelationshipType, c, fri.cd, "", "", destAdornment); + } } } From 8d77597da533a35421e448f24cd150b9f65d7948 Mon Sep 17 00:00:00 2001 From: Daniel TISCHER Date: Sun, 9 Feb 2014 11:50:05 +0100 Subject: [PATCH 2/3] workaround for http://www.graphviz.org/mantisbt/view.php?id=2421 --- src/main/java/org/umlgraph/doclet/ClassGraph.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/umlgraph/doclet/ClassGraph.java b/src/main/java/org/umlgraph/doclet/ClassGraph.java index 9ef19c4..06631c2 100644 --- a/src/main/java/org/umlgraph/doclet/ClassGraph.java +++ b/src/main/java/org/umlgraph/doclet/ClassGraph.java @@ -845,7 +845,7 @@ class ClassGraph { RelationPattern rp = getClassInfo(c.toString()).getRelation(fri.cd.toString()); if (rp == null) { String destAdornment = fri.multiple ? "*" : ""; - relation(opt, opt.inferRelationshipType, c, fri.cd, "", "", destAdornment); + relation(opt, opt.inferRelationshipType, c, fri.cd, "", " ", destAdornment); } } } From 52d95c3cc30cf1378efeb00c4f38a8d61de6bd07 Mon Sep 17 00:00:00 2001 From: Daniel TISCHER Date: Mon, 10 Feb 2014 13:43:08 +0100 Subject: [PATCH 3/3] workaround empty label problem --- src/main/java/org/umlgraph/doclet/ClassGraph.java | 4 ++-- src/main/java/org/umlgraph/doclet/Version.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/umlgraph/doclet/ClassGraph.java b/src/main/java/org/umlgraph/doclet/ClassGraph.java index 06631c2..7abe2f2 100644 --- a/src/main/java/org/umlgraph/doclet/ClassGraph.java +++ b/src/main/java/org/umlgraph/doclet/ClassGraph.java @@ -661,7 +661,7 @@ class ClassGraph { w.println("\t// " + fromName + " " + rt.toString() + " " + toName); w.println("\t" + relationNode(from, fromName) + " -> " + relationNode(to, toName) + " [" + "taillabel=\"" + tailLabel + "\", " + - "label=\"" + guillemize(opt, label) + "\", " + + ((label == null || label.isEmpty()) ? "label=\" \"" : "label=\"" + guillemize(opt, label) + "\", ") + "headlabel=\"" + headLabel + "\", " + "fontname=\"" + opt.edgeFontName + "\", " + "fontcolor=\"" + opt.edgeFontColor + "\", " + @@ -845,7 +845,7 @@ class ClassGraph { RelationPattern rp = getClassInfo(c.toString()).getRelation(fri.cd.toString()); if (rp == null) { String destAdornment = fri.multiple ? "*" : ""; - relation(opt, opt.inferRelationshipType, c, fri.cd, "", " ", destAdornment); + relation(opt, opt.inferRelationshipType, c, fri.cd, "", "", destAdornment); } } } diff --git a/src/main/java/org/umlgraph/doclet/Version.java b/src/main/java/org/umlgraph/doclet/Version.java index d8c5bed..ce9e098 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_6_6-1-g9240c4";} +class Version { public static String VERSION = "R5_6_6-8-g8d7759";} \ No newline at end of file