From 6bbf7d2f71ecd48b113607658a22fbd93afbc412 Mon Sep 17 00:00:00 2001
From: Andrea Aime <andrea.aime@gmail.com>
Date: Sun, 4 Jun 2006 13:54:27 +0000
Subject: [PATCH] Don't infer dependencies from fields if we already inferred
 relationships (basically to avoid having dependencies on the collection
 containers that were not included in the relationships)

---
 src/gr/spinellis/umlgraph/doclet/ClassGraph.java | 6 ++++--
 src/org/umlgraph/doclet/ClassGraph.java          | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/gr/spinellis/umlgraph/doclet/ClassGraph.java b/src/gr/spinellis/umlgraph/doclet/ClassGraph.java
index b9121b1..7a43e3a 100644
--- a/src/gr/spinellis/umlgraph/doclet/ClassGraph.java
+++ b/src/gr/spinellis/umlgraph/doclet/ClassGraph.java
@@ -734,8 +734,10 @@ class ClassGraph {
 	    }
 	}
 	// and the field types
-	for (FieldDoc field : c.fields(false)) {
-	    types.add(field.type());
+	if (!opt.inferRelationships) {
+	    for (FieldDoc field : c.fields(false)) {
+		types.add(field.type());
+	    }
 	}
 	// see if there are some type parameters
 	if (c.asParameterizedType() != null) {
diff --git a/src/org/umlgraph/doclet/ClassGraph.java b/src/org/umlgraph/doclet/ClassGraph.java
index b9121b1..7a43e3a 100644
--- a/src/org/umlgraph/doclet/ClassGraph.java
+++ b/src/org/umlgraph/doclet/ClassGraph.java
@@ -734,8 +734,10 @@ class ClassGraph {
 	    }
 	}
 	// and the field types
-	for (FieldDoc field : c.fields(false)) {
-	    types.add(field.type());
+	if (!opt.inferRelationships) {
+	    for (FieldDoc field : c.fields(false)) {
+		types.add(field.type());
+	    }
 	}
 	// see if there are some type parameters
 	if (c.asParameterizedType() != null) {