From d54d8bf7da92c414b5d9bf14d56ab0417ab81007 Mon Sep 17 00:00:00 2001
From: Diomidis Spinellis <dds@aueb.gr>
Date: Mon, 23 Apr 2012 18:30:50 +0000
Subject: [PATCH] Added ability to make aggregate relationships navigable

The @has and @composed now also have corresponding @navhas
and @navcomposed relationships.

Contributed by: Alan Jeffrey.
---
 doc/cd-model.xml                          | 14 ++++++--------
 doc/ver.xml                               |  4 ++++
 src/org/umlgraph/doclet/ClassGraph.java   |  4 ++++
 src/org/umlgraph/doclet/RelationType.java |  2 +-
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/doc/cd-model.xml b/doc/cd-model.xml
index a44a41e..0682650 100644
--- a/doc/cd-model.xml
+++ b/doc/cd-model.xml
@@ -22,14 +22,12 @@ collaborations, and packages
 </li>
 <li>generalization relationships (specified using the Java <code>extends</code> declaration or (for multiple inheritance) the <em>javadoc</em> <code>@extends</code> tag)
 </li>
-<li>association relationships (specified using the <em>javadoc</em> <code>@assoc</code> tag)
-</li>
-<li>navigatable (directed) association relationships (specified using the <em>javadoc</em> <code>@navassoc</code> tag)
-</li>
-<li>aggregation relationships (specified using the <em>javadoc</em> <code>@has</code> tag)
-</li>
-<li>composition relationships (specified using the <em>javadoc</em> <code>@composed</code> tag)
-</li>
+<li>association relationships (specified using the <em>javadoc</em> <code>@assoc</code> tag) </li>
+<li>navigable (directed) association relationships (specified using the <em>javadoc</em> <code>@navassoc</code> tag) </li>
+<li>aggregation relationships (specified using the <em>javadoc</em> <code>@has</code> tag) </li>
+<li>navigable aggregation relationships (specified using the <em>javadoc</em> <code>@navhas</code> tag) </li>
+<li>composition relationships (specified using the <em>javadoc</em> <code>@composed</code> tag) </li>
+<li>navigable composition relationships (specified using the <em>javadoc</em> <code>@navcomposed</code> tag) </li>
 <li>dependency relationships (specified using the <em>javadoc</em> <code>@depend</code> tag)
 </li>
 </ul>
diff --git a/doc/ver.xml b/doc/ver.xml
index 826c2f2..11ba308 100644
--- a/doc/ver.xml
+++ b/doc/ver.xml
@@ -5,6 +5,10 @@
 
 <dt>Version 5.5 Under development </dt><dd>
 <ul>
+<li>Added ability to make aggregate relationships (<code>@has</code> and
+</code>@composed</code>) navigable through the new <code>@navhas</code>
+and <code>@navcomposed</code> relationships.
+(Contributed by Alan Jeffrey.)</li>
 <li>Make UMLGraphDoc generation compatible with JDK 7
 (Contributed by Stefano Martina.)</li>
 <li>Various documentation improvements.</li>
diff --git a/src/org/umlgraph/doclet/ClassGraph.java b/src/org/umlgraph/doclet/ClassGraph.java
index 45ebb69..a3676e1 100644
--- a/src/org/umlgraph/doclet/ClassGraph.java
+++ b/src/org/umlgraph/doclet/ClassGraph.java
@@ -74,7 +74,9 @@ class ClassGraph {
 	associationMap.put(RelationType.ASSOC, "arrowhead=none");
 	associationMap.put(RelationType.NAVASSOC, "arrowhead=open");
 	associationMap.put(RelationType.HAS, "arrowhead=none, arrowtail=ediamond, dir=both");
+	associationMap.put(RelationType.NAVHAS, "arrowhead=open, arrowtail=ediamond, dir=both");
 	associationMap.put(RelationType.COMPOSED, "arrowhead=none, arrowtail=diamond, dir=both");
+	associationMap.put(RelationType.NAVCOMPOSED, "arrowhead=open, arrowtail=diamond, dir=both");
 	associationMap.put(RelationType.DEPEND, "arrowhead=open, style=dashed");
     }
     protected Map<String, ClassInfo> classnames = new HashMap<String, ClassInfo>();
@@ -757,7 +759,9 @@ class ClassGraph {
 	allRelation(opt, RelationType.ASSOC, c);
 	allRelation(opt, RelationType.NAVASSOC, c);
 	allRelation(opt, RelationType.HAS, c);
+	allRelation(opt, RelationType.NAVHAS, c);
 	allRelation(opt, RelationType.COMPOSED, c);
+	allRelation(opt, RelationType.NAVCOMPOSED, c);
 	allRelation(opt, RelationType.DEPEND, c);
     }
 
diff --git a/src/org/umlgraph/doclet/RelationType.java b/src/org/umlgraph/doclet/RelationType.java
index a4c13ae..eb6b4cf 100644
--- a/src/org/umlgraph/doclet/RelationType.java
+++ b/src/org/umlgraph/doclet/RelationType.java
@@ -6,5 +6,5 @@ package org.umlgraph.doclet;
  * 
  */
 public enum RelationType {
-    ASSOC, NAVASSOC, HAS, COMPOSED, DEPEND, EXTENDS, IMPLEMENTS;
+    ASSOC, NAVASSOC, HAS, NAVHAS, COMPOSED, NAVCOMPOSED, DEPEND, EXTENDS, IMPLEMENTS;
 }