From 3ae9f3ad1165c342558e45ffed5a6e8d23b7f02a Mon Sep 17 00:00:00 2001
From: evenisse <evenisse@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 31 Mar 2004 22:55:20 +0000
Subject: [PATCH] MPJCOVERAGE-6. Fix the report generation after a rmic
 generation.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@114963 13f79535-47bb-0310-9956-ffa450edef68
---
 jcoverage/project.xml                         |  2 +-
 .../maven/jcoveragereport/CoverageReport.java | 32 +++++++++++--------
 .../CoverageReportGenerator.java              |  3 +-
 jcoverage/xdocs/changes.xml                   |  3 ++
 4 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/jcoverage/project.xml b/jcoverage/project.xml
index 4159c018..01ff0e0f 100644
--- a/jcoverage/project.xml
+++ b/jcoverage/project.xml
@@ -23,7 +23,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-jcoverage-plugin</id>
   <name>Maven JCoverage plugin</name>
-  <currentVersion>1.0.3</currentVersion>
+  <currentVersion>1.0.4-SNAPSHOT</currentVersion>
   <package>org.apache.maven.jcoveragereport</package>
   <description>This plugin provides coverage analysis of your source-code based on the open-source jcoverage tool.</description>
   <shortDescription>This plugin provides coverage analysis of your source-code based on the open-source jcoverage tool.</shortDescription>
diff --git a/jcoverage/src/main/org/apache/maven/jcoveragereport/CoverageReport.java b/jcoverage/src/main/org/apache/maven/jcoveragereport/CoverageReport.java
index 68a18a7d..ad0a7db4 100644
--- a/jcoverage/src/main/org/apache/maven/jcoveragereport/CoverageReport.java
+++ b/jcoverage/src/main/org/apache/maven/jcoveragereport/CoverageReport.java
@@ -33,7 +33,7 @@ import org.apache.oro.text.perl.Perl5Util;
 
 /**
  * @author Emmanuel Venisse
- * @version $Id: CoverageReport.java,v 1.8 2004/03/02 15:07:06 evenisse Exp $
+ * @version $Id: CoverageReport.java,v 1.9 2004/03/31 22:55:19 evenisse Exp $
  */
 public class CoverageReport
 {
@@ -278,12 +278,15 @@ public class CoverageReport
                 for (Iterator it = thePackage.getClassesSortedByName().iterator(); it.hasNext(); )
                 {
                     Clazz cl = (Clazz) it.next();
-                    String classFilename = cl.getFile().substring(cl.getFile().lastIndexOf("/")+1, cl.getFile().lastIndexOf(".")) + ".html";
-                    pw.println("<tr class=\"report\">");
-                    pw.println("<td class=\"reportText\" colspan=\"2\"><a href=\"" + classFilename + "\">" + cl.getName() + "</a></td>");
-                    pw.println("<td class=\"reportValue\">" + generatePercentResult(getPercentValue(cl.getLineRate())) + "</td>");
-                    pw.println("<td class=\"reportValue\">" + generatePercentResult(getPercentValue(cl.getBranchRate())) + "</td>");
-                    pw.println("</tr>");
+                    if (cl.getFile().indexOf("[Unknown]")<0)
+                    {
+                        String classFilename = cl.getFile().substring(cl.getFile().lastIndexOf("/")+1, cl.getFile().lastIndexOf(".")) + ".html";
+                        pw.println("<tr class=\"report\">");
+                        pw.println("<td class=\"reportText\" colspan=\"2\"><a href=\"" + classFilename + "\">" + cl.getName() + "</a></td>");
+                        pw.println("<td class=\"reportValue\">" + generatePercentResult(getPercentValue(cl.getLineRate())) + "</td>");
+                        pw.println("<td class=\"reportValue\">" + generatePercentResult(getPercentValue(cl.getBranchRate())) + "</td>");
+                        pw.println("</tr>");
+                    }
                 }
             }
         }
@@ -326,12 +329,15 @@ public class CoverageReport
                     for (Iterator iter = classesList.iterator(); iter.hasNext(); )
                     {
                         Clazz cl = (Clazz) iter.next();
-                        String classFilename = cl.getFile().substring(cl.getFile().lastIndexOf("/")+1, cl.getFile().lastIndexOf(".")) + ".html";
-                        pw.println("<tr class=\"report\">");
-                        pw.println("<td class=\"reportText\" colspan=\"2\"><a href=\"" + classFilename + "\">" + cl.getName() + "</a></td>");
-                        pw.println("<td class=\"reportValue\">" + generatePercentResult(getPercentValue(cl.getLineRate())) + "</td>");
-                        pw.println("<td class=\"reportValue\">" + generatePercentResult(getPercentValue(cl.getBranchRate())) + "</td>");
-                        pw.println("</tr>");
+                        if (cl.getFile().indexOf("[Unknown]")<0)
+                        {
+                            String classFilename = cl.getFile().substring(cl.getFile().lastIndexOf("/")+1, cl.getFile().lastIndexOf(".")) + ".html";
+                            pw.println("<tr class=\"report\">");
+                            pw.println("<td class=\"reportText\" colspan=\"2\"><a href=\"" + classFilename + "\">" + cl.getName() + "</a></td>");
+                            pw.println("<td class=\"reportValue\">" + generatePercentResult(getPercentValue(cl.getLineRate())) + "</td>");
+                            pw.println("<td class=\"reportValue\">" + generatePercentResult(getPercentValue(cl.getBranchRate())) + "</td>");
+                            pw.println("</tr>");
+                        }
                     }
                 }
             }
diff --git a/jcoverage/src/main/org/apache/maven/jcoveragereport/CoverageReportGenerator.java b/jcoverage/src/main/org/apache/maven/jcoveragereport/CoverageReportGenerator.java
index c82d1edc..71b43ff5 100644
--- a/jcoverage/src/main/org/apache/maven/jcoveragereport/CoverageReportGenerator.java
+++ b/jcoverage/src/main/org/apache/maven/jcoveragereport/CoverageReportGenerator.java
@@ -25,7 +25,7 @@ import java.io.PrintWriter;
 
 /**
  * @author Emmanuel Venisse
- * @version $Id: CoverageReportGenerator.java,v 1.3 2004/03/02 15:07:06 evenisse Exp $
+ * @version $Id: CoverageReportGenerator.java,v 1.4 2004/03/31 22:55:19 evenisse Exp $
  */
 public class CoverageReportGenerator
 {
@@ -84,6 +84,7 @@ public class CoverageReportGenerator
         {
             line = replace(line, "<init>", "&lt;init&gt;", 0);
             line = replace(line, "<clinit>", "&lt;clinit&gt;", 0);
+            line = replace(line, "<Unknown>", "[Unknown]", 0);
             pw.println(line);
         }
         pw.close();
diff --git a/jcoverage/xdocs/changes.xml b/jcoverage/xdocs/changes.xml
index c41b1212..f4d0727d 100644
--- a/jcoverage/xdocs/changes.xml
+++ b/jcoverage/xdocs/changes.xml
@@ -24,6 +24,9 @@
     <author email="evenisse@ifrance.com">Emmanuel Venisse</author>
   </properties>
   <body>
+    <release version="1.0.4" date="In CVS">
+      <action dev="evenisse" type="fix" issue="MPJCOVERAGE-6">Fix the report generation after a rmic generation.</action>
+    </release>
     <release version="1.0.3" date="2004-03-10">
       <action dev="evenisse" type="fix">Apply MPJCOVERAGE-3.</action>
     </release>