svn commit: r390872 - in /maven/plugins/trunk/maven-clover-plugin/src/main/java/org/apache/maven/plugin/clover: CloverAggregateMojo.java CloverInstrumentInternalMojo.java CloverReportMojo.java

[vm...@apache.org]

Author: vmassol
Date: Sun Apr  2 10:44:35 2006
New Revision: 390872

URL: http://svn.apache.org/viewcvs?rev=390872&view=rev
Log:
CLOVER-29: Pass on the maven debug flag to Clover

Modified:
    maven/plugins/trunk/maven-clover-plugin/src/main/java/org/apache/maven/plugin/clover/CloverAggregateMojo.java
    maven/plugins/trunk/maven-clover-plugin/src/main/java/org/apache/maven/plugin/clover/CloverInstrumentInternalMojo.java
    maven/plugins/trunk/maven-clover-plugin/src/main/java/org/apache/maven/plugin/clover/CloverReportMojo.java

Modified: maven/plugins/trunk/maven-clover-plugin/src/main/java/org/apache/maven/plugin/clover/CloverAggregateMojo.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-clover-plugin/src/main/java/org/apache/maven/plugin/clover/CloverAggregateMojo.java?rev=390872&r1=390871&r2=390872&view=diff
==============================================================================
--- maven/plugins/trunk/maven-clover-plugin/src/main/java/org/apache/maven/plugin/clover/CloverAggregateMojo.java (original)
+++ maven/plugins/trunk/maven-clover-plugin/src/main/java/org/apache/maven/plugin/clover/CloverAggregateMojo.java Sun Apr  2 10:44:35 2006
@@ -100,18 +100,19 @@
     {
         List dbFiles = getChildrenCloverDatabases();
 
-        String[] args = new String[dbFiles.size() + 2];
-        args[0] = "-i";
-        args[1] = this.cloverMergeDatabase;
+        List parameters = new ArrayList();
 
-        int i = 2;
-        for ( Iterator dbs = dbFiles.iterator(); dbs.hasNext(); )
+        parameters.add( "-i" );
+        parameters.add( this.cloverMergeDatabase );
+
+        if ( getLog().isDebugEnabled() )
         {
-            args[i] = (String) dbs.next();
-            i++;
+           parameters.add( "-d" );
         }
 
-        int mergeResult = CloverMerge.mainImpl( args );
+        parameters.addAll( dbFiles );
+
+        int mergeResult = CloverMerge.mainImpl( (String[]) parameters.toArray(new String[0]) );
         if ( mergeResult != 0 )
         {
             throw new MojoExecutionException( "Clover has failed to merge the children module databases" );

Modified: maven/plugins/trunk/maven-clover-plugin/src/main/java/org/apache/maven/plugin/clover/CloverInstrumentInternalMojo.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-clover-plugin/src/main/java/org/apache/maven/plugin/clover/CloverInstrumentInternalMojo.java?rev=390872&r1=390871&r2=390872&view=diff
==============================================================================
--- maven/plugins/trunk/maven-clover-plugin/src/main/java/org/apache/maven/plugin/clover/CloverInstrumentInternalMojo.java (original)
+++ maven/plugins/trunk/maven-clover-plugin/src/main/java/org/apache/maven/plugin/clover/CloverInstrumentInternalMojo.java Sun Apr  2 10:44:35 2006
@@ -265,6 +265,11 @@
         parameters.add( "-d" );
         parameters.add( this.cloverOutputSourceDirectory );
 
+        if ( getLog().isDebugEnabled() )
+        {
+            parameters.add( "-v" );
+        }
+
         if ( getJdk() != null )
         {
             if ( getJdk().equals( "1.4" ) )

Modified: maven/plugins/trunk/maven-clover-plugin/src/main/java/org/apache/maven/plugin/clover/CloverReportMojo.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-clover-plugin/src/main/java/org/apache/maven/plugin/clover/CloverReportMojo.java?rev=390872&r1=390871&r2=390872&view=diff
==============================================================================
--- maven/plugins/trunk/maven-clover-plugin/src/main/java/org/apache/maven/plugin/clover/CloverReportMojo.java (original)
+++ maven/plugins/trunk/maven-clover-plugin/src/main/java/org/apache/maven/plugin/clover/CloverReportMojo.java Sun Apr  2 10:44:35 2006
@@ -137,13 +137,23 @@
      */
     private void createCloverHtmlReport() throws MavenReportException
     {
-        String[] cliArgs = new String[] {
-            "-t", "Maven Clover report",
-            "-p", (String) this.project.getCompileSourceRoots().get( 0 ),
-            "-i", this.cloverDatabase,
-            "-o", this.outputDirectory.getPath() };
+        List parameters = new ArrayList();
 
-        int result = HtmlReporter.mainImpl( cliArgs );
+        parameters.add( "-t" );
+        parameters.add( "Maven Clover report" );
+        parameters.add( "-p" );
+        parameters.add( this.project.getCompileSourceRoots().get( 0 ) );
+        parameters.add( "-i" );
+        parameters.add( this.cloverDatabase );
+        parameters.add( "-o" );
+        parameters.add( this.outputDirectory.getPath() );
+
+        if ( getLog().isDebugEnabled() )
+        {
+            parameters.add( "-d" );
+        }
+
+        int result = HtmlReporter.mainImpl( (String[]) parameters.toArray(new String[0]) );
         if ( result != 0 )
         {
             throw new MavenReportException( "Clover has failed to create the HTML report" );