From 96ce9aac63dd952a51900ba4b827a77a0eba2e4c Mon Sep 17 00:00:00 2001
From: Diomidis Spinellis <dds@aueb.gr>
Date: Sun, 27 May 2007 20:17:54 +0000
Subject: [PATCH] Fix inferred relations of maps to primitive Java types.

---
 Makefile                                       |  5 ++++-
 build.xml                                      |  7 ++++++-
 doc/ver.xml                                    | 12 +++++++++++-
 src/gr/spinellis/umlgraph/doclet/UmlGraph.java | 13 ++++++++++++-
 src/org/umlgraph/doclet/UmlGraph.java          | 13 ++++++++++++-
 5 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 9dbd0cf..a67c812 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 # $Id$
 #
 
-VERSION?=4.7
+VERSION?=4.8
 TAGVERSION=$(shell echo $(VERSION) | sed 's/\./_/g')
 BALL_TAR_GZ=UMLGraph-$(VERSION).tar.gz
 ZIPBALL=UMLGraph-$(VERSION).zip
@@ -49,12 +49,15 @@ $(BALL_TAR_GZ): $(JARFILE) docs Makefile
 	mkdir $(DISTDIR)
 	mkdir $(DISTDIR)/doc
 	mkdir $(DISTDIR)/lib
+	mkdir $(DISTDIR)/bin
 	$(LF) $(README) >$(DISTDIR)/$(README)
 	$(LF) $(LICENSE) >$(DISTDIR)/$(LICENSE)
 	$(LF) $(PICFILE) >$(DISTDIR)/lib/$(PICFILE)
 	cp $(JARFILE) $(DISTDIR)/lib
 	cp $(WEBDIR)/$(DOC)/* $(DISTDIR)/doc
 	cp build.xml $(DISTDIR)
+	cp umlgraph.bat $(DISTDIR)/bin
+	$(LF) umlgraph >$(DISTDIR)/bin/umlgraph
 	tar cf - src testdata/{java,dot-ref} javadoc --exclude='*/RCS' | tar -C $(DISTDIR) -xvf -
 	$(LF) $(PICFILE) >$(DISTDIR)/src/$(PICFILE)
 	tar czf $(BALL_TAR_GZ) $(DISTDIR)
diff --git a/build.xml b/build.xml
index 1058b3c..5429112 100644
--- a/build.xml
+++ b/build.xml
@@ -38,7 +38,12 @@ class Version { public static String VERSION = "${VERSION}";}
 	<javac srcdir="${src}" destdir="${build}" debug="true" deprecation="true" excludes="gr/spinellis/umlgraph/doclet/RCS/*,gr/spinellis/umlgraph/test/RCS/*">
 		<compilerarg value="-Xlint"/>
 	</javac>
-	<jar basedir="${build}" destfile="${lib}/UmlGraph.jar" includes="gr/spinellis/umlgraph/doclet/*.class"/>
+	<jar basedir="${build}" destfile="${lib}/UmlGraph.jar" includes="gr/spinellis/umlgraph/doclet/*.class">
+		<manifest>
+			<attribute name="Main-Class" value="gr.spinellis.umlgraph.doclet.UmlGraph"/>
+			<attribute name="Class-Path" value="tools.jar"/>
+		</manifest>
+	</jar>
 </target>
 
 <target name="test" depends="compile"
diff --git a/doc/ver.xml b/doc/ver.xml
index be62450..2ab9594 100644
--- a/doc/ver.xml
+++ b/doc/ver.xml
@@ -3,8 +3,18 @@
 <notes>
 <dl>
 
-<dt>Version 4.8 Under development </dt><dd>
+<dt>Version 4.9 Under development </dt><dd>
 <ul>
+<li> Fix inferred relations of maps to primitive Java types.
+(reported by Przemyslaw Wesolek).</li>
+</ul>
+
+<dt>Version 4.8 2007-05-10 </dt><dd>
+<ul>
+<li> UmlGraph can now be invoked directly as a jar file. </li>
+<li> Support for sending results to the standard output for piping into <em>dot</em>. </li>
+<li> The distribution includes an example shell script and batch file for
+invoking UmlGraph. </li>
 </ul>
 
 <dt>Version 4.7 2007-03-26 </dt><dd>
diff --git a/src/gr/spinellis/umlgraph/doclet/UmlGraph.java b/src/gr/spinellis/umlgraph/doclet/UmlGraph.java
index b71190d..bd37565 100644
--- a/src/gr/spinellis/umlgraph/doclet/UmlGraph.java
+++ b/src/gr/spinellis/umlgraph/doclet/UmlGraph.java
@@ -21,6 +21,7 @@
 package gr.spinellis.umlgraph.doclet;
 
 import java.io.IOException;
+import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -41,7 +42,11 @@ import com.sun.javadoc.RootDoc;
  * @author <a href="http://www.spinellis.gr">Diomidis Spinellis</a>
  */
 public class UmlGraph {
-    /** Entry point */
+
+    private static final String programName = "UmlGraph";
+    private static final String docletName = "gr.spinellis.umlgraph.doclet.UmlGraph";
+
+    /** Entry point through javadoc */
     public static boolean start(RootDoc root) throws IOException {
 	Options opt = buildOptions(root);
 	root.printNotice("UMLGraph doclet version " + Version.VERSION + " started");
@@ -57,6 +62,12 @@ public class UmlGraph {
 	return true;
     }
 
+    public static void main(String args[]) {
+	PrintWriter err = new PrintWriter(System.err);
+        com.sun.tools.javadoc.Main.execute(programName,
+	  err, err, err, docletName, args);
+    }
+
     /**
      * Creates the base Options object, that contains both the options specified on the command
      * line and the ones specified in the UMLOptions class, if available.
diff --git a/src/org/umlgraph/doclet/UmlGraph.java b/src/org/umlgraph/doclet/UmlGraph.java
index b71190d..bd37565 100644
--- a/src/org/umlgraph/doclet/UmlGraph.java
+++ b/src/org/umlgraph/doclet/UmlGraph.java
@@ -21,6 +21,7 @@
 package gr.spinellis.umlgraph.doclet;
 
 import java.io.IOException;
+import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -41,7 +42,11 @@ import com.sun.javadoc.RootDoc;
  * @author <a href="http://www.spinellis.gr">Diomidis Spinellis</a>
  */
 public class UmlGraph {
-    /** Entry point */
+
+    private static final String programName = "UmlGraph";
+    private static final String docletName = "gr.spinellis.umlgraph.doclet.UmlGraph";
+
+    /** Entry point through javadoc */
     public static boolean start(RootDoc root) throws IOException {
 	Options opt = buildOptions(root);
 	root.printNotice("UMLGraph doclet version " + Version.VERSION + " started");
@@ -57,6 +62,12 @@ public class UmlGraph {
 	return true;
     }
 
+    public static void main(String args[]) {
+	PrintWriter err = new PrintWriter(System.err);
+        com.sun.tools.javadoc.Main.execute(programName,
+	  err, err, err, docletName, args);
+    }
+
     /**
      * Creates the base Options object, that contains both the options specified on the command
      * line and the ones specified in the UMLOptions class, if available.