From 1a066ccff81c4d13381fe600a15876b722f94d65 Mon Sep 17 00:00:00 2001
From: Andrea Aime <andrea.aime@gmail.com>
Date: Sun, 11 Jun 2006 13:47:30 +0000
Subject: [PATCH] Removed reliance on -verbose2

---
 src/gr/spinellis/umlgraph/doclet/UmlDoc.java   | 4 ----
 src/gr/spinellis/umlgraph/doclet/UmlGraph.java | 8 ++------
 src/org/umlgraph/doclet/UmlDoc.java            | 4 ----
 src/org/umlgraph/doclet/UmlGraph.java          | 8 ++------
 4 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/src/gr/spinellis/umlgraph/doclet/UmlDoc.java b/src/gr/spinellis/umlgraph/doclet/UmlDoc.java
index a952df8..7478783 100644
--- a/src/gr/spinellis/umlgraph/doclet/UmlDoc.java
+++ b/src/gr/spinellis/umlgraph/doclet/UmlDoc.java
@@ -85,8 +85,6 @@ public class UmlDoc {
      */
     private static void generatePackageDiagrams(RootDoc root, Options opt, String outputFolder)
 	    throws IOException {
-	if (opt.verbose2)
-	    root.printNotice("Examining packages");
 	Set<String> packages = new HashSet<String>();
 	for (ClassDoc classDoc : root.classes()) {
 	    PackageDoc packageDoc = classDoc.containingPackage();
@@ -106,8 +104,6 @@ public class UmlDoc {
      */
     private static void generateContextDiagrams(RootDoc root, Options opt, String outputFolder)
 	    throws IOException {
-	if (opt.verbose2)
-	    root.printNotice("Examining classes");
 	ContextView view = null;
 	for (ClassDoc classDoc : root.classes()) {
 	    if(view == null)
diff --git a/src/gr/spinellis/umlgraph/doclet/UmlGraph.java b/src/gr/spinellis/umlgraph/doclet/UmlGraph.java
index ad014dc..3f2468c 100644
--- a/src/gr/spinellis/umlgraph/doclet/UmlGraph.java
+++ b/src/gr/spinellis/umlgraph/doclet/UmlGraph.java
@@ -44,8 +44,7 @@ public class UmlGraph {
     /** Entry point */
     public static boolean start(RootDoc root) throws IOException {
 	Options opt = buildOptions(root);
-	if (opt.verbose2)
-		System.out.println("UMLGraph doclet started");
+	root.printNotice("UMLGraph doclet version " + Version.VERSION + " started");
 
 	View[] views = buildViews(opt, root, root);
 	if(views == null)
@@ -58,8 +57,6 @@ public class UmlGraph {
 	    }
 	}
 
-	if (opt.verbose2)
-	    System.out.println("Class diagram generation complete");
 	return true;
     }
 
@@ -88,8 +85,7 @@ public class UmlGraph {
      */
     public static void buildGraph(RootDoc root, OptionProvider op, Doc contextDoc) throws IOException {
 	Options opt = op.getGlobalOptions();
-	if (opt.verbose2)
-	    System.out.println("Building " + op.getDisplayName());
+	root.printNotice("Building " + op.getDisplayName());
 	ClassDoc[] classes = root.classes();
 
 	ClassGraph c = new ClassGraph(root, op, contextDoc);
diff --git a/src/org/umlgraph/doclet/UmlDoc.java b/src/org/umlgraph/doclet/UmlDoc.java
index a952df8..7478783 100644
--- a/src/org/umlgraph/doclet/UmlDoc.java
+++ b/src/org/umlgraph/doclet/UmlDoc.java
@@ -85,8 +85,6 @@ public class UmlDoc {
      */
     private static void generatePackageDiagrams(RootDoc root, Options opt, String outputFolder)
 	    throws IOException {
-	if (opt.verbose2)
-	    root.printNotice("Examining packages");
 	Set<String> packages = new HashSet<String>();
 	for (ClassDoc classDoc : root.classes()) {
 	    PackageDoc packageDoc = classDoc.containingPackage();
@@ -106,8 +104,6 @@ public class UmlDoc {
      */
     private static void generateContextDiagrams(RootDoc root, Options opt, String outputFolder)
 	    throws IOException {
-	if (opt.verbose2)
-	    root.printNotice("Examining classes");
 	ContextView view = null;
 	for (ClassDoc classDoc : root.classes()) {
 	    if(view == null)
diff --git a/src/org/umlgraph/doclet/UmlGraph.java b/src/org/umlgraph/doclet/UmlGraph.java
index ad014dc..3f2468c 100644
--- a/src/org/umlgraph/doclet/UmlGraph.java
+++ b/src/org/umlgraph/doclet/UmlGraph.java
@@ -44,8 +44,7 @@ public class UmlGraph {
     /** Entry point */
     public static boolean start(RootDoc root) throws IOException {
 	Options opt = buildOptions(root);
-	if (opt.verbose2)
-		System.out.println("UMLGraph doclet started");
+	root.printNotice("UMLGraph doclet version " + Version.VERSION + " started");
 
 	View[] views = buildViews(opt, root, root);
 	if(views == null)
@@ -58,8 +57,6 @@ public class UmlGraph {
 	    }
 	}
 
-	if (opt.verbose2)
-	    System.out.println("Class diagram generation complete");
 	return true;
     }
 
@@ -88,8 +85,7 @@ public class UmlGraph {
      */
     public static void buildGraph(RootDoc root, OptionProvider op, Doc contextDoc) throws IOException {
 	Options opt = op.getGlobalOptions();
-	if (opt.verbose2)
-	    System.out.println("Building " + op.getDisplayName());
+	root.printNotice("Building " + op.getDisplayName());
 	ClassDoc[] classes = root.classes();
 
 	ClassGraph c = new ClassGraph(root, op, contextDoc);