evenisse 2003/09/09 08:52:57
Modified: src/plugins-build/jcoverage plugin.jelly project.xml
src/plugins-build/jcoverage/src/main/org/apache/maven/jcoveragereport
Clazz.java CoverageReport.java Package.java
PackageComparator.java
Added: src/plugins-build/jcoverage/xdocs changes.xml
Log:
Correction of some point due to feedback on the user list :
- Fix bug when classes have no package.
- Fix overview page for inner classes.
- Add a postGoal to clean:clean for suppress jcoverage.ser file.
Revision Changes Path
1.4 +4 -0 maven/src/plugins-build/jcoverage/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/jcoverage/plugin.jelly,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plugin.jelly 8 Sep 2003 11:15:16 -0000 1.3
+++ plugin.jelly 9 Sep 2003 15:52:57 -0000 1.4
@@ -194,5 +194,9 @@
</classpath>
</java>
</goal>
+
+ <postGoal name="clean:clean">
+ <ant:delete file="${basedir}/jcoverage.ser" quiet="true" failonerror="false"/>
+ </postGoal>
</project>
1.2 +1 -1 maven/src/plugins-build/jcoverage/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/jcoverage/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 3 Sep 2003 16:27:14 -0000 1.1
+++ project.xml 9 Sep 2003 15:52:57 -0000 1.2
@@ -5,7 +5,7 @@
<pomVersion>3</pomVersion>
<id>maven-jcoverage-plugin</id>
<name>Maven JCoverage plugin</name>
- <currentVersion>1.0</currentVersion>
+ <currentVersion>1.0.1-SNAPSHOT</currentVersion>
<package>org.apache.maven.jcoveragereport</package>
<description>
1.2 +2 -2
maven/src/plugins-build/jcoverage/src/main/org/apache/maven/jcoveragereport/Clazz.java
Index: Clazz.java
===================================================================
RCS file:
/home/cvs/maven/src/plugins-build/jcoverage/src/main/org/apache/maven/jcoveragereport/Clazz.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Clazz.java 3 Sep 2003 16:27:14 -0000 1.1
+++ Clazz.java 9 Sep 2003 15:52:57 -0000 1.2
@@ -67,7 +67,7 @@
*/
public class Clazz
{
- private String packageName;
+ private String packageName = "";
private String name;
private String file;
private String lineRate;
1.5 +13 -4
maven/src/plugins-build/jcoverage/src/main/org/apache/maven/jcoveragereport/CoverageReport.java
Index: CoverageReport.java
===================================================================
RCS file:
/home/cvs/maven/src/plugins-build/jcoverage/src/main/org/apache/maven/jcoveragereport/CoverageReport.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CoverageReport.java 8 Sep 2003 13:39:51 -0000 1.4
+++ CoverageReport.java 9 Sep 2003 15:52:57 -0000 1.5
@@ -317,8 +317,9 @@
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=\""
+ cl.getName() + ".html\">" + cl.getName() + "</a></td>");
+ 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>");
@@ -364,8 +365,9 @@
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=\"" + cl.getName() + ".html\">" + cl.getName() + "</a></td>");
+ 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>");
@@ -510,7 +512,14 @@
private String getRelativePath(String path)
{
- return new Perl5Util().substitute("s/[^\\.]*(\\.|$)/\\.\\.\\//g", path);
+ if (path != null && !path.equals(""))
+ {
+ return new Perl5Util().substitute("s/[^\\.]*(\\.|$)/\\.\\.\\//g", path);
+ }
+ else
+ {
+ return "";
+ }
}
private String getPercentValue(String value)
1.2 +6 -2
maven/src/plugins-build/jcoverage/src/main/org/apache/maven/jcoveragereport/Package.java
Index: Package.java
===================================================================
RCS file:
/home/cvs/maven/src/plugins-build/jcoverage/src/main/org/apache/maven/jcoveragereport/Package.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Package.java 3 Sep 2003 16:27:15 -0000 1.1
+++ Package.java 9 Sep 2003 15:52:57 -0000 1.2
@@ -68,7 +68,7 @@
public class Package
{
private List classes;
- private String name;
+ private String name = "";
private String directory;
public Package(String name)
@@ -79,6 +79,10 @@
public void setName(String name)
{
+ if (name == null)
+ {
+ System.out.println("Package == null");
+ }
this.name = name;
}
1.2 +18 -4
maven/src/plugins-build/jcoverage/src/main/org/apache/maven/jcoveragereport/PackageComparator.java
Index: PackageComparator.java
===================================================================
RCS file:
/home/cvs/maven/src/plugins-build/jcoverage/src/main/org/apache/maven/jcoveragereport/PackageComparator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PackageComparator.java 3 Sep 2003 16:27:15 -0000 1.1
+++ PackageComparator.java 9 Sep 2003 15:52:57 -0000 1.2
@@ -70,9 +70,23 @@
{
Package p1 = (Package) package1;
Package p2 = (Package) package2;
- String lower1 = p1.getName().toLowerCase();
- String lower2 = p2.getName().toLowerCase();
- return lower1.compareTo(lower2);
+ if (p1.getName() != null && p2.getName() != null)
+ {
+ String lower1 = p1.getName().toLowerCase();
+ String lower2 = p2.getName().toLowerCase();
+ return lower1.compareTo(lower2);
+ }
+ else
+ {
+ if (p1.getName() == null && p2.getName() == null)
+ {
+ return 0;
+ }
+ else
+ {
+ return -1;
+ }
+ }
}
else
{
1.1 maven/src/plugins-build/jcoverage/xdocs/changes.xml
Index: changes.xml
===================================================================
<?xml version="1.0"?>
<document>
<properties>
<title>Changes</title>
<author email="[EMAIL PROTECTED]">Emmanuel Venisse</author>
</properties>
<body>
<release version="1.0.1" date="In CVS">
<action dev="evenisse" type="fix">
Fix bug when classes have no package.
</action>
<action dev="evenisse" type="fix">
Fix overview page for inner classes.
</action>
<action dev="evenisse" type="add">
Add a postGoal to clean:clean for suppress jcoverage.ser file.
</action>
</release>
<release version="1.0" date="2003-09-04">
<action dev="evenisse" type="add">
First release
</action>
</release>
</body>
</document>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
