You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by vs...@apache.org on 2007/10/29 13:33:56 UTC
svn commit: r589601 - in
/maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/doc:
GenerateUMLDoc.java UmlDocTask.java
Author: vsiveton
Date: Mon Oct 29 05:33:56 2007
New Revision: 589601
URL: http://svn.apache.org/viewvc?rev=589601&view=rev
Log:
o added verbose option
o improved generated temp files
Modified:
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/doc/GenerateUMLDoc.java
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/doc/UmlDocTask.java
Modified: maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/doc/GenerateUMLDoc.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/doc/GenerateUMLDoc.java?rev=589601&r1=589600&r2=589601&view=diff
==============================================================================
--- maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/doc/GenerateUMLDoc.java (original)
+++ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/doc/GenerateUMLDoc.java Mon Oct 29 05:33:56 2007
@@ -65,6 +65,9 @@
/** Temp generated dot file */
private File dot;
+ /** Specify verbose information */
+ private boolean verbose;
+
/**
* Default constructor.
*
@@ -121,27 +124,82 @@
generateUmlImage();
}
- // ----------------------------------------------------------------------
- // Private
- // ----------------------------------------------------------------------
-
/**
- * @return the dest dir
+ * Getter for the destDir
+ *
+ * @return the destDir
*/
- private File getOut()
+ public File getOut()
{
return this.out;
}
/**
+ * Getter for the srcDir
+ *
+ * @return the srcDir
+ */
+ public File getSrcDir()
+ {
+ return this.srcDir;
+ }
+
+ /**
+ * Getter for the verbose
+ *
+ * @return the verbose
+ */
+ public boolean isVerbose()
+ {
+ return this.verbose;
+ }
+
+ /**
+ * Setter for the destDir
+ *
+ * @param destDir the destDir to set
+ */
+ public void setOut( File destDir )
+ {
+ this.out = destDir;
+ }
+
+ /**
+ * Setter for the srcDir
+ *
+ * @param srcDir the srcDir to set
+ */
+ public void setSrcDir( File srcDir )
+ {
+ this.srcDir = srcDir;
+ }
+
+ /**
+ * Setter for the verbose
+ *
+ * @param verbose the verbose to set
+ */
+ public void setVerbose( boolean verbose )
+ {
+ this.verbose = verbose;
+ }
+
+ // ----------------------------------------------------------------------
+ // Private
+ // ----------------------------------------------------------------------
+
+ /**
* @return the javadoc output xml file
*/
private File getJavadocXml()
{
if ( this.javadocXml == null )
{
- this.javadocXml = FileUtils.createTempFile( "javadoc", ".xml", null );
- this.javadocXml.deleteOnExit();
+ this.javadocXml = new File( getOut().getParentFile(), "javadoc.xml" );
+ if ( !isVerbose() )
+ {
+ this.javadocXml.deleteOnExit();
+ }
}
return this.javadocXml;
@@ -154,8 +212,11 @@
{
if ( this.dot == null )
{
- this.dot = FileUtils.createTempFile( "javadoc", ".dot", null );
- this.dot.deleteOnExit();
+ this.dot = new File( getOut().getParentFile(), "javadoc.dot" );
+ if ( !isVerbose() )
+ {
+ this.dot.deleteOnExit();
+ }
}
return this.dot;
@@ -181,8 +242,11 @@
{
if ( this.xml2dot == null )
{
- this.xml2dot = FileUtils.createTempFile( "xml2dot", ".xsl", null );
- this.xml2dot.deleteOnExit();
+ this.xml2dot = new File( getOut().getParentFile(), "xml2dot.xsl" );
+ if ( !isVerbose() )
+ {
+ this.xml2dot.deleteOnExit();
+ }
InputStream is = getClass().getClassLoader().getResourceAsStream(
GenerateUMLDoc.class.getPackage()
Modified: maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/doc/UmlDocTask.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/doc/UmlDocTask.java?rev=589601&r1=589600&r2=589601&view=diff
==============================================================================
--- maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/doc/UmlDocTask.java (original)
+++ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/doc/UmlDocTask.java Mon Oct 29 05:33:56 2007
@@ -44,6 +44,9 @@
/** Output file of the diagram*/
private File out;
+ /** Specify verbose information */
+ private boolean verbose;
+
/** Terminate Ant build */
private boolean failOnError;
@@ -68,6 +71,16 @@
}
/**
+ * Setter for the verbose
+ *
+ * @param verbose the verbose to set
+ */
+ public void setVerbose( boolean verbose )
+ {
+ this.verbose = verbose;
+ }
+
+ /**
* Set fail on an error.
*
* @param b true to fail on an error.
@@ -103,6 +116,7 @@
try
{
GenerateUMLDoc generator = new GenerateUMLDoc( getSrcDir(), getOut() );
+ generator.setVerbose( true );
generator.generateUML();
}
catch ( IllegalArgumentException e )