From fff08645caa58a1a31f59dd825ba69094623280e Mon Sep 17 00:00:00 2001
From: Diomidis Spinellis <dds@aueb.gr>
Date: Fri, 26 Jul 2002 07:55:19 +0000
Subject: [PATCH] Display interfaces.

---
 src/gr/spinellis/umlgraph/doclet/ClassGraph.java | 12 +++++++++---
 src/gr/spinellis/umlgraph/doclet/ClassInfo.java  | 12 +++++++++---
 src/gr/spinellis/umlgraph/doclet/Options.java    | 12 +++++++++---
 src/gr/spinellis/umlgraph/doclet/StringUtil.java | 12 +++++++++---
 src/gr/spinellis/umlgraph/doclet/UmlGraph.java   | 12 +++++++++---
 src/org/umlgraph/doclet/ClassGraph.java          | 12 +++++++++---
 src/org/umlgraph/doclet/ClassInfo.java           | 12 +++++++++---
 src/org/umlgraph/doclet/Options.java             | 12 +++++++++---
 src/org/umlgraph/doclet/StringUtil.java          | 12 +++++++++---
 src/org/umlgraph/doclet/UmlGraph.java            | 12 +++++++++---
 10 files changed, 90 insertions(+), 30 deletions(-)

diff --git a/src/gr/spinellis/umlgraph/doclet/ClassGraph.java b/src/gr/spinellis/umlgraph/doclet/ClassGraph.java
index 0693195..4fe564e 100644
--- a/src/gr/spinellis/umlgraph/doclet/ClassGraph.java
+++ b/src/gr/spinellis/umlgraph/doclet/ClassGraph.java
@@ -78,8 +78,7 @@ class ClassGraph {
 	private void parameter(Parameter p[]) {
 		for (int i = 0; i < p.length; i++) {
 			opt.w.print(p[i].name());
-			opt.w.print(" : ");
-			opt.w.print(p[i].type());
+			type(p[i].type());
 			if (i + 1 < p.length)
 				opt.w.print(", ");
 		}
@@ -163,6 +162,12 @@ class ClassGraph {
 			opt.w.print("\t" + name(s) + " -> " + cs + " [dir=back,arrowtail=empty];");
 			opt.w.println("\t//" + c + " extends " + s);
 		}
+		// Print interfaces
+		ClassDoc ifs[] = c.interfaces();
+		for (int i = 0; i < ifs.length; i++) {
+			opt.w.print("\t" + name(ifs[i]) + " -> " + cs + " [dir=back,arrowtail=empty,style=dashed];");
+			opt.w.println("\t//" + c + " implements " + s);
+		}
 	}
 }
 
@@ -214,7 +219,8 @@ public class UmlGraph {
 		opt.w.println(
 			"#!/usr/local/bin/dot\n" +
 			"#\n" +
-			"# Class hirerarchy\n" +
+			"# Class diagram \n" +
+			"# Generated by $Id$\n" +
 			"#\n\n" +
 			"digraph G {\n" +
 			"\tnode [fontname=\"Helvetica\",fontsize=8,shape=record];"
diff --git a/src/gr/spinellis/umlgraph/doclet/ClassInfo.java b/src/gr/spinellis/umlgraph/doclet/ClassInfo.java
index 0693195..4fe564e 100644
--- a/src/gr/spinellis/umlgraph/doclet/ClassInfo.java
+++ b/src/gr/spinellis/umlgraph/doclet/ClassInfo.java
@@ -78,8 +78,7 @@ class ClassGraph {
 	private void parameter(Parameter p[]) {
 		for (int i = 0; i < p.length; i++) {
 			opt.w.print(p[i].name());
-			opt.w.print(" : ");
-			opt.w.print(p[i].type());
+			type(p[i].type());
 			if (i + 1 < p.length)
 				opt.w.print(", ");
 		}
@@ -163,6 +162,12 @@ class ClassGraph {
 			opt.w.print("\t" + name(s) + " -> " + cs + " [dir=back,arrowtail=empty];");
 			opt.w.println("\t//" + c + " extends " + s);
 		}
+		// Print interfaces
+		ClassDoc ifs[] = c.interfaces();
+		for (int i = 0; i < ifs.length; i++) {
+			opt.w.print("\t" + name(ifs[i]) + " -> " + cs + " [dir=back,arrowtail=empty,style=dashed];");
+			opt.w.println("\t//" + c + " implements " + s);
+		}
 	}
 }
 
@@ -214,7 +219,8 @@ public class UmlGraph {
 		opt.w.println(
 			"#!/usr/local/bin/dot\n" +
 			"#\n" +
-			"# Class hirerarchy\n" +
+			"# Class diagram \n" +
+			"# Generated by $Id$\n" +
 			"#\n\n" +
 			"digraph G {\n" +
 			"\tnode [fontname=\"Helvetica\",fontsize=8,shape=record];"
diff --git a/src/gr/spinellis/umlgraph/doclet/Options.java b/src/gr/spinellis/umlgraph/doclet/Options.java
index 0693195..4fe564e 100644
--- a/src/gr/spinellis/umlgraph/doclet/Options.java
+++ b/src/gr/spinellis/umlgraph/doclet/Options.java
@@ -78,8 +78,7 @@ class ClassGraph {
 	private void parameter(Parameter p[]) {
 		for (int i = 0; i < p.length; i++) {
 			opt.w.print(p[i].name());
-			opt.w.print(" : ");
-			opt.w.print(p[i].type());
+			type(p[i].type());
 			if (i + 1 < p.length)
 				opt.w.print(", ");
 		}
@@ -163,6 +162,12 @@ class ClassGraph {
 			opt.w.print("\t" + name(s) + " -> " + cs + " [dir=back,arrowtail=empty];");
 			opt.w.println("\t//" + c + " extends " + s);
 		}
+		// Print interfaces
+		ClassDoc ifs[] = c.interfaces();
+		for (int i = 0; i < ifs.length; i++) {
+			opt.w.print("\t" + name(ifs[i]) + " -> " + cs + " [dir=back,arrowtail=empty,style=dashed];");
+			opt.w.println("\t//" + c + " implements " + s);
+		}
 	}
 }
 
@@ -214,7 +219,8 @@ public class UmlGraph {
 		opt.w.println(
 			"#!/usr/local/bin/dot\n" +
 			"#\n" +
-			"# Class hirerarchy\n" +
+			"# Class diagram \n" +
+			"# Generated by $Id$\n" +
 			"#\n\n" +
 			"digraph G {\n" +
 			"\tnode [fontname=\"Helvetica\",fontsize=8,shape=record];"
diff --git a/src/gr/spinellis/umlgraph/doclet/StringUtil.java b/src/gr/spinellis/umlgraph/doclet/StringUtil.java
index 0693195..4fe564e 100644
--- a/src/gr/spinellis/umlgraph/doclet/StringUtil.java
+++ b/src/gr/spinellis/umlgraph/doclet/StringUtil.java
@@ -78,8 +78,7 @@ class ClassGraph {
 	private void parameter(Parameter p[]) {
 		for (int i = 0; i < p.length; i++) {
 			opt.w.print(p[i].name());
-			opt.w.print(" : ");
-			opt.w.print(p[i].type());
+			type(p[i].type());
 			if (i + 1 < p.length)
 				opt.w.print(", ");
 		}
@@ -163,6 +162,12 @@ class ClassGraph {
 			opt.w.print("\t" + name(s) + " -> " + cs + " [dir=back,arrowtail=empty];");
 			opt.w.println("\t//" + c + " extends " + s);
 		}
+		// Print interfaces
+		ClassDoc ifs[] = c.interfaces();
+		for (int i = 0; i < ifs.length; i++) {
+			opt.w.print("\t" + name(ifs[i]) + " -> " + cs + " [dir=back,arrowtail=empty,style=dashed];");
+			opt.w.println("\t//" + c + " implements " + s);
+		}
 	}
 }
 
@@ -214,7 +219,8 @@ public class UmlGraph {
 		opt.w.println(
 			"#!/usr/local/bin/dot\n" +
 			"#\n" +
-			"# Class hirerarchy\n" +
+			"# Class diagram \n" +
+			"# Generated by $Id$\n" +
 			"#\n\n" +
 			"digraph G {\n" +
 			"\tnode [fontname=\"Helvetica\",fontsize=8,shape=record];"
diff --git a/src/gr/spinellis/umlgraph/doclet/UmlGraph.java b/src/gr/spinellis/umlgraph/doclet/UmlGraph.java
index 0693195..4fe564e 100644
--- a/src/gr/spinellis/umlgraph/doclet/UmlGraph.java
+++ b/src/gr/spinellis/umlgraph/doclet/UmlGraph.java
@@ -78,8 +78,7 @@ class ClassGraph {
 	private void parameter(Parameter p[]) {
 		for (int i = 0; i < p.length; i++) {
 			opt.w.print(p[i].name());
-			opt.w.print(" : ");
-			opt.w.print(p[i].type());
+			type(p[i].type());
 			if (i + 1 < p.length)
 				opt.w.print(", ");
 		}
@@ -163,6 +162,12 @@ class ClassGraph {
 			opt.w.print("\t" + name(s) + " -> " + cs + " [dir=back,arrowtail=empty];");
 			opt.w.println("\t//" + c + " extends " + s);
 		}
+		// Print interfaces
+		ClassDoc ifs[] = c.interfaces();
+		for (int i = 0; i < ifs.length; i++) {
+			opt.w.print("\t" + name(ifs[i]) + " -> " + cs + " [dir=back,arrowtail=empty,style=dashed];");
+			opt.w.println("\t//" + c + " implements " + s);
+		}
 	}
 }
 
@@ -214,7 +219,8 @@ public class UmlGraph {
 		opt.w.println(
 			"#!/usr/local/bin/dot\n" +
 			"#\n" +
-			"# Class hirerarchy\n" +
+			"# Class diagram \n" +
+			"# Generated by $Id$\n" +
 			"#\n\n" +
 			"digraph G {\n" +
 			"\tnode [fontname=\"Helvetica\",fontsize=8,shape=record];"
diff --git a/src/org/umlgraph/doclet/ClassGraph.java b/src/org/umlgraph/doclet/ClassGraph.java
index 0693195..4fe564e 100644
--- a/src/org/umlgraph/doclet/ClassGraph.java
+++ b/src/org/umlgraph/doclet/ClassGraph.java
@@ -78,8 +78,7 @@ class ClassGraph {
 	private void parameter(Parameter p[]) {
 		for (int i = 0; i < p.length; i++) {
 			opt.w.print(p[i].name());
-			opt.w.print(" : ");
-			opt.w.print(p[i].type());
+			type(p[i].type());
 			if (i + 1 < p.length)
 				opt.w.print(", ");
 		}
@@ -163,6 +162,12 @@ class ClassGraph {
 			opt.w.print("\t" + name(s) + " -> " + cs + " [dir=back,arrowtail=empty];");
 			opt.w.println("\t//" + c + " extends " + s);
 		}
+		// Print interfaces
+		ClassDoc ifs[] = c.interfaces();
+		for (int i = 0; i < ifs.length; i++) {
+			opt.w.print("\t" + name(ifs[i]) + " -> " + cs + " [dir=back,arrowtail=empty,style=dashed];");
+			opt.w.println("\t//" + c + " implements " + s);
+		}
 	}
 }
 
@@ -214,7 +219,8 @@ public class UmlGraph {
 		opt.w.println(
 			"#!/usr/local/bin/dot\n" +
 			"#\n" +
-			"# Class hirerarchy\n" +
+			"# Class diagram \n" +
+			"# Generated by $Id$\n" +
 			"#\n\n" +
 			"digraph G {\n" +
 			"\tnode [fontname=\"Helvetica\",fontsize=8,shape=record];"
diff --git a/src/org/umlgraph/doclet/ClassInfo.java b/src/org/umlgraph/doclet/ClassInfo.java
index 0693195..4fe564e 100644
--- a/src/org/umlgraph/doclet/ClassInfo.java
+++ b/src/org/umlgraph/doclet/ClassInfo.java
@@ -78,8 +78,7 @@ class ClassGraph {
 	private void parameter(Parameter p[]) {
 		for (int i = 0; i < p.length; i++) {
 			opt.w.print(p[i].name());
-			opt.w.print(" : ");
-			opt.w.print(p[i].type());
+			type(p[i].type());
 			if (i + 1 < p.length)
 				opt.w.print(", ");
 		}
@@ -163,6 +162,12 @@ class ClassGraph {
 			opt.w.print("\t" + name(s) + " -> " + cs + " [dir=back,arrowtail=empty];");
 			opt.w.println("\t//" + c + " extends " + s);
 		}
+		// Print interfaces
+		ClassDoc ifs[] = c.interfaces();
+		for (int i = 0; i < ifs.length; i++) {
+			opt.w.print("\t" + name(ifs[i]) + " -> " + cs + " [dir=back,arrowtail=empty,style=dashed];");
+			opt.w.println("\t//" + c + " implements " + s);
+		}
 	}
 }
 
@@ -214,7 +219,8 @@ public class UmlGraph {
 		opt.w.println(
 			"#!/usr/local/bin/dot\n" +
 			"#\n" +
-			"# Class hirerarchy\n" +
+			"# Class diagram \n" +
+			"# Generated by $Id$\n" +
 			"#\n\n" +
 			"digraph G {\n" +
 			"\tnode [fontname=\"Helvetica\",fontsize=8,shape=record];"
diff --git a/src/org/umlgraph/doclet/Options.java b/src/org/umlgraph/doclet/Options.java
index 0693195..4fe564e 100644
--- a/src/org/umlgraph/doclet/Options.java
+++ b/src/org/umlgraph/doclet/Options.java
@@ -78,8 +78,7 @@ class ClassGraph {
 	private void parameter(Parameter p[]) {
 		for (int i = 0; i < p.length; i++) {
 			opt.w.print(p[i].name());
-			opt.w.print(" : ");
-			opt.w.print(p[i].type());
+			type(p[i].type());
 			if (i + 1 < p.length)
 				opt.w.print(", ");
 		}
@@ -163,6 +162,12 @@ class ClassGraph {
 			opt.w.print("\t" + name(s) + " -> " + cs + " [dir=back,arrowtail=empty];");
 			opt.w.println("\t//" + c + " extends " + s);
 		}
+		// Print interfaces
+		ClassDoc ifs[] = c.interfaces();
+		for (int i = 0; i < ifs.length; i++) {
+			opt.w.print("\t" + name(ifs[i]) + " -> " + cs + " [dir=back,arrowtail=empty,style=dashed];");
+			opt.w.println("\t//" + c + " implements " + s);
+		}
 	}
 }
 
@@ -214,7 +219,8 @@ public class UmlGraph {
 		opt.w.println(
 			"#!/usr/local/bin/dot\n" +
 			"#\n" +
-			"# Class hirerarchy\n" +
+			"# Class diagram \n" +
+			"# Generated by $Id$\n" +
 			"#\n\n" +
 			"digraph G {\n" +
 			"\tnode [fontname=\"Helvetica\",fontsize=8,shape=record];"
diff --git a/src/org/umlgraph/doclet/StringUtil.java b/src/org/umlgraph/doclet/StringUtil.java
index 0693195..4fe564e 100644
--- a/src/org/umlgraph/doclet/StringUtil.java
+++ b/src/org/umlgraph/doclet/StringUtil.java
@@ -78,8 +78,7 @@ class ClassGraph {
 	private void parameter(Parameter p[]) {
 		for (int i = 0; i < p.length; i++) {
 			opt.w.print(p[i].name());
-			opt.w.print(" : ");
-			opt.w.print(p[i].type());
+			type(p[i].type());
 			if (i + 1 < p.length)
 				opt.w.print(", ");
 		}
@@ -163,6 +162,12 @@ class ClassGraph {
 			opt.w.print("\t" + name(s) + " -> " + cs + " [dir=back,arrowtail=empty];");
 			opt.w.println("\t//" + c + " extends " + s);
 		}
+		// Print interfaces
+		ClassDoc ifs[] = c.interfaces();
+		for (int i = 0; i < ifs.length; i++) {
+			opt.w.print("\t" + name(ifs[i]) + " -> " + cs + " [dir=back,arrowtail=empty,style=dashed];");
+			opt.w.println("\t//" + c + " implements " + s);
+		}
 	}
 }
 
@@ -214,7 +219,8 @@ public class UmlGraph {
 		opt.w.println(
 			"#!/usr/local/bin/dot\n" +
 			"#\n" +
-			"# Class hirerarchy\n" +
+			"# Class diagram \n" +
+			"# Generated by $Id$\n" +
 			"#\n\n" +
 			"digraph G {\n" +
 			"\tnode [fontname=\"Helvetica\",fontsize=8,shape=record];"
diff --git a/src/org/umlgraph/doclet/UmlGraph.java b/src/org/umlgraph/doclet/UmlGraph.java
index 0693195..4fe564e 100644
--- a/src/org/umlgraph/doclet/UmlGraph.java
+++ b/src/org/umlgraph/doclet/UmlGraph.java
@@ -78,8 +78,7 @@ class ClassGraph {
 	private void parameter(Parameter p[]) {
 		for (int i = 0; i < p.length; i++) {
 			opt.w.print(p[i].name());
-			opt.w.print(" : ");
-			opt.w.print(p[i].type());
+			type(p[i].type());
 			if (i + 1 < p.length)
 				opt.w.print(", ");
 		}
@@ -163,6 +162,12 @@ class ClassGraph {
 			opt.w.print("\t" + name(s) + " -> " + cs + " [dir=back,arrowtail=empty];");
 			opt.w.println("\t//" + c + " extends " + s);
 		}
+		// Print interfaces
+		ClassDoc ifs[] = c.interfaces();
+		for (int i = 0; i < ifs.length; i++) {
+			opt.w.print("\t" + name(ifs[i]) + " -> " + cs + " [dir=back,arrowtail=empty,style=dashed];");
+			opt.w.println("\t//" + c + " implements " + s);
+		}
 	}
 }
 
@@ -214,7 +219,8 @@ public class UmlGraph {
 		opt.w.println(
 			"#!/usr/local/bin/dot\n" +
 			"#\n" +
-			"# Class hirerarchy\n" +
+			"# Class diagram \n" +
+			"# Generated by $Id$\n" +
 			"#\n\n" +
 			"digraph G {\n" +
 			"\tnode [fontname=\"Helvetica\",fontsize=8,shape=record];"