svn commit: r585965 - in /maven/sandbox/trunk/jxr/maven-jxr: maven-jxr-ant/src/main/java/org/apache/maven/jxr/ant/doc/ maven-jxr-utils/src/test/java/org/apache/maven/jxr/util/

[vsiveton]

Author: vsiveton
Date: Thu Oct 18 06:59:57 2007
New Revision: 585965

URL: http://svn.apache.org/viewvc?rev=585965&view=rev
Log:
o better catch of DotNotPresentInPathBuildException
o updated javadoc

Modified:
    
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-ant/src/main/java/org/apache/maven/jxr/ant/doc/AntDocTask.java
    
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-ant/src/main/java/org/apache/maven/jxr/ant/doc/GenerateHTMLDoc.java
    
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/src/test/java/org/apache/maven/jxr/util/DotTaskTest.java

Modified: 
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-ant/src/main/java/org/apache/maven/jxr/ant/doc/AntDocTask.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-ant/src/main/java/org/apache/maven/jxr/ant/doc/AntDocTask.java?rev=585965&r1=585964&r2=585965&view=diff
==============================================================================
--- 
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-ant/src/main/java/org/apache/maven/jxr/ant/doc/AntDocTask.java
 (original)
+++ 
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-ant/src/main/java/org/apache/maven/jxr/ant/doc/AntDocTask.java
 Thu Oct 18 06:59:57 2007
@@ -22,6 +22,7 @@
 import java.io.File;
 import java.io.IOException;
 
+import org.apache.maven.jxr.util.DotTask.DotNotPresentInPathBuildException;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;
@@ -119,6 +120,10 @@
             }
 
             log( "IOException: " + e.getMessage(), Project.MSG_ERR );
+        }
+        catch ( DotNotPresentInPathBuildException e )
+        {
+            log( "Dot is not present in the path: " + e.getMessage(), 
Project.MSG_ERR );
         }
         catch ( BuildException e )
         {

Modified: 
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-ant/src/main/java/org/apache/maven/jxr/ant/doc/GenerateHTMLDoc.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-ant/src/main/java/org/apache/maven/jxr/ant/doc/GenerateHTMLDoc.java?rev=585965&r1=585964&r2=585965&view=diff
==============================================================================
--- 
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-ant/src/main/java/org/apache/maven/jxr/ant/doc/GenerateHTMLDoc.java
 (original)
+++ 
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-ant/src/main/java/org/apache/maven/jxr/ant/doc/GenerateHTMLDoc.java
 Thu Oct 18 06:59:57 2007
@@ -28,6 +28,7 @@
 
 import org.apache.maven.jxr.ant.doc.vizant.Vizant;
 import org.apache.maven.jxr.util.DotTask;
+import org.apache.maven.jxr.util.DotTask.DotNotPresentInPathBuildException;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.taskdefs.XSLTProcess;
@@ -36,6 +37,8 @@
 
 /**
  * Generate HTML documentation for <a href="http://ant.apache.org/";>Ant</a> 
file.
+ * <br/>
+ * <b>Note</b>: <a href="http://www.graphviz.org/";>Graphviz</a> program should 
be in the path.
  *
  * @author <a href="mailto:[EMAIL PROTECTED]">Vincent Siveton</a>
  * @version $Id$
@@ -104,9 +107,11 @@
      * Generate the documentation
      *
      * @throws IOException if any
+     * @throws BuildException if any
+     * @throws DotNotPresentInPathBuildException if any
      */
     public void generateDoc()
-        throws IOException
+        throws IOException, BuildException, DotNotPresentInPathBuildException
     {
         // 1. Generate Vizant graph
         generateVizantBuildGraph();
@@ -325,9 +330,10 @@
      * Call graphviz dot to generate images.
      *
      * @throws BuildException if any
+     * @throws DotNotPresentInPathBuildException if any
      */
     private void generateImages()
-        throws BuildException
+        throws BuildException, DotNotPresentInPathBuildException
     {
         String[] dotFormat = { "svg", "png" };
         for ( int i = 0; i < dotFormat.length; i++ )

Modified: 
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/src/test/java/org/apache/maven/jxr/util/DotTaskTest.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/src/test/java/org/apache/maven/jxr/util/DotTaskTest.java?rev=585965&r1=585964&r2=585965&view=diff
==============================================================================
--- 
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/src/test/java/org/apache/maven/jxr/util/DotTaskTest.java
 (original)
+++ 
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/src/test/java/org/apache/maven/jxr/util/DotTaskTest.java
 Thu Oct 18 06:59:57 2007
@@ -75,7 +75,7 @@
         }
 
         // Generated files
-        File generated = new File( out, "target.dot.svg" );
+        File generated = new File( out, "target.dot.png" );
         assertTrue( generated.exists() );
         assertTrue( generated.length() > 0 );
     }