From 41e8621dd41df07f6719240721b47e9208ded1dc Mon Sep 17 00:00:00 2001
From: hderuiter <hderuiter@users.noreply.github.com>
Date: Sat, 12 Nov 2016 20:24:01 +0100
Subject: [PATCH 1/2] - updated pom.xml with a "build jar with dependencies"
 goal - updated UmlJavaDoclet.java for usage with ant (retrieve javadoc path
 from root doc)

---
 pom.xml                                       | 16 +++++++++-
 .../umljavadoclet/UmlJavaDoclet.java          | 29 ++++++++++++++++---
 2 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2aa5a63..16bb9d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,21 @@
                     <source>1.8</source>
                     <target>1.8</target>
                 </configuration>
-            </plugin>      
+            </plugin>     
+            <!-- Build jar with dependencies for usage with ant -->
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <mainClass>info.leadinglight.umljavadoclet.UmlJavaDoclet</mainClass>
+                        </manifest>
+                    </archive>
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
+                </configuration>
+            </plugin>
             <!-- Generate UML diagrams in javadoc using doclet: mvn javadoc:javadoc -->
             <plugin>                                                                         
                 <groupId>org.apache.maven.plugins</groupId>                                  
diff --git a/src/main/java/info/leadinglight/umljavadoclet/UmlJavaDoclet.java b/src/main/java/info/leadinglight/umljavadoclet/UmlJavaDoclet.java
index 20d7f4d..0ea5073 100644
--- a/src/main/java/info/leadinglight/umljavadoclet/UmlJavaDoclet.java
+++ b/src/main/java/info/leadinglight/umljavadoclet/UmlJavaDoclet.java
@@ -4,14 +4,13 @@
 import com.sun.javadoc.LanguageVersion;
 import com.sun.javadoc.RootDoc;
 import com.sun.tools.doclets.standard.Standard;
-import info.leadinglight.umljavadoclet.printer.ContextDiagramPrinter;
-import info.leadinglight.umljavadoclet.printer.PackageDiagramPrinter;
 import info.leadinglight.umljavadoclet.model.Model;
 import info.leadinglight.umljavadoclet.model.ModelClass;
 import info.leadinglight.umljavadoclet.model.ModelPackage;
+import info.leadinglight.umljavadoclet.printer.ContextDiagramPrinter;
 import info.leadinglight.umljavadoclet.printer.DiagramOptions;
-import info.leadinglight.umljavadoclet.printer.ModelPrinter;
 import info.leadinglight.umljavadoclet.printer.OverviewDiagramPrinter;
+import info.leadinglight.umljavadoclet.printer.PackageDiagramPrinter;
 import java.io.BufferedOutputStream;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -34,6 +33,26 @@ public class UmlJavaDoclet extends Standard {
     public static boolean start(RootDoc root) {
         // Generate Javadocs using standard doclet.
         System.out.println("Generating Javadocs...");
+        System.out.println("Using arguments:");
+
+        int idx = -1;
+        for (int i = 0; i < root.options().length; i++)
+        {
+            for (int j = 0; j < root.options()[i].length; j++)
+            {
+                String s = root.options()[i][j];
+                System.out.print(s + " ");
+                if (s.trim().equalsIgnoreCase("-d"))
+                {
+                    idx = i;
+                }
+            }
+            System.out.println("");
+        }
+
+        javaDocDir = idx != -1 && root.options()[idx].length == 2 ? root.options()[idx][1] : ".";
+        System.out.println("Using java doc dir: " + javaDocDir);
+
         generateJavadoc(root);
         
         // Set the options.
@@ -202,7 +221,7 @@ private static File createFile(String name, String baseName, String extension) {
     }
     
     private static File fileForName(String name) {
-        File file = new File(".");
+        File file = new File(javaDocDir);
         for (String part : name.split("\\.")) {
             if (part.trim().length() > 0) {
                 file = new File(file, part);
@@ -278,4 +297,6 @@ private static boolean updateHtml(File directory, String baseName, Pattern inser
 	"<div align=\"center\">" +
 	    "<object type=\"image/svg+xml\" data=\"%1$s.svg\" alt=\"Package class diagram package %1$s\" border=0></object>" +
 	"</div>";
+    
+    private static String javaDocDir;
 }

From f101eb754b61c847a51ceee92efd551f04f23f2a Mon Sep 17 00:00:00 2001
From: hderuiter <hderuiter@users.noreply.github.com>
Date: Sat, 12 Nov 2016 20:33:41 +0100
Subject: [PATCH 2/2] - updated UmlJavaDoclet.java for usage with ant (retrieve
 javadoc path from root doc)

---
 .../info/leadinglight/umljavadoclet/UmlJavaDoclet.java   | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/main/java/info/leadinglight/umljavadoclet/UmlJavaDoclet.java b/src/main/java/info/leadinglight/umljavadoclet/UmlJavaDoclet.java
index 0ea5073..5a1355e 100644
--- a/src/main/java/info/leadinglight/umljavadoclet/UmlJavaDoclet.java
+++ b/src/main/java/info/leadinglight/umljavadoclet/UmlJavaDoclet.java
@@ -36,14 +36,11 @@ public static boolean start(RootDoc root) {
         System.out.println("Using arguments:");
 
         int idx = -1;
-        for (int i = 0; i < root.options().length; i++)
-        {
-            for (int j = 0; j < root.options()[i].length; j++)
-            {
+        for (int i = 0; i < root.options().length; i++){
+            for (int j = 0; j < root.options()[i].length; j++){
                 String s = root.options()[i][j];
                 System.out.print(s + " ");
-                if (s.trim().equalsIgnoreCase("-d"))
-                {
+                if (s.trim().equalsIgnoreCase("-d")){
                     idx = i;
                 }
             }