evenisse 2004/03/31 14:55:20
Modified: jcoverage project.xml
jcoverage/src/main/org/apache/maven/jcoveragereport
CoverageReport.java CoverageReportGenerator.java
jcoverage/xdocs changes.xml
Log:
MPJCOVERAGE-6. Fix the report generation after a rmic generation.
Revision Changes Path
1.17 +1 -1 maven-plugins/jcoverage/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/jcoverage/project.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- project.xml 10 Mar 2004 11:51:28 -0000 1.16
+++ project.xml 31 Mar 2004 22:55:19 -0000 1.17
@@ -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>
1.9 +19 -13
maven-plugins/jcoverage/src/main/org/apache/maven/jcoveragereport/CoverageReport.java
Index: CoverageReport.java
===================================================================
RCS file:
/home/cvs/maven-plugins/jcoverage/src/main/org/apache/maven/jcoveragereport/CoverageReport.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- CoverageReport.java 2 Mar 2004 15:07:06 -0000 1.8
+++ CoverageReport.java 31 Mar 2004 22:55:19 -0000 1.9
@@ -278,12 +278,15 @@
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 @@
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>");
+ }
}
}
}
1.4 +2 -1
maven-plugins/jcoverage/src/main/org/apache/maven/jcoveragereport/CoverageReportGenerator.java
Index: CoverageReportGenerator.java
===================================================================
RCS file:
/home/cvs/maven-plugins/jcoverage/src/main/org/apache/maven/jcoveragereport/CoverageReportGenerator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CoverageReportGenerator.java 2 Mar 2004 15:07:06 -0000 1.3
+++ CoverageReportGenerator.java 31 Mar 2004 22:55:19 -0000 1.4
@@ -84,6 +84,7 @@
{
line = replace(line, "<init>", "<init>", 0);
line = replace(line, "<clinit>", "<clinit>", 0);
+ line = replace(line, "<Unknown>", "[Unknown]", 0);
pw.println(line);
}
pw.close();
1.10 +3 -0 maven-plugins/jcoverage/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/jcoverage/xdocs/changes.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- changes.xml 10 Mar 2004 11:51:28 -0000 1.9
+++ changes.xml 31 Mar 2004 22:55:20 -0000 1.10
@@ -24,6 +24,9 @@
<author email="[EMAIL PROTECTED]">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>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
