Menu
▾
▴
[Qalab-develop] SF.net SVN: qalab:[302] trunk/qalab
|
From: <be...@us...> - 2009-05-20 16:40:04
|
Revision: 302
http://qalab.svn.sourceforge.net/qalab/?rev=302&view=rev
Author: benoitx
Date: 2009-05-20 16:39:54 +0000 (Wed, 20 May 2009)
Log Message:
-----------
Must define the version explicitly.
Also Updated to JFreeChart 1.0.13 and JCommon 1.0.16
Modified Paths:
--------------
trunk/qalab/.classpath
trunk/qalab/project.xml
trunk/qalab/qalab.xml
trunk/qalab/src/main/java/net/objectlab/qalab/parser/DefaultChartGenerator.java
trunk/qalab/src/main/java/net/objectlab/qalab/parser/FindBugsStatMerge.java
Modified: trunk/qalab/.classpath
===================================================================
--- trunk/qalab/.classpath 2009-05-20 16:38:18 UTC (rev 301)
+++ trunk/qalab/.classpath 2009-05-20 16:39:54 UTC (rev 302)
@@ -1,24 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
- </classpathentry>
- <classpathentry excluding="" kind="src" path="src/main/java">
- </classpathentry>
- <classpathentry output="target/test-classes" kind="src" path="src/test/java">
- </classpathentry>
- <classpathentry sourcepath="MAVEN_REPO/junit/java-sources/junit-3.8.2-sources.jar" kind="var" path="MAVEN_REPO/junit/jars/junit-3.8.2.jar">
- </classpathentry>
- <classpathentry sourcepath="MAVEN_REPO/jfree/java-sources/jfreechart-1.02-sources.jar" kind="var" path="MAVEN_REPO/jfree/jars/jfreechart-1.0.2.jar">
- </classpathentry>
- <classpathentry sourcepath="MAVEN_REPO/jfree/java-sources/jcommon-1.0.5-sources.jar" kind="var" path="MAVEN_REPO/jfree/jars/jcommon-1.0.5.jar">
- </classpathentry>
- <classpathentry sourcepath="MAVEN_REPO/xerces/java-sources/xerces-2.4.0-sources.jar" kind="var" path="MAVEN_REPO/xerces/jars/xerces-2.4.0.jar">
- </classpathentry>
- <classpathentry sourcepath="MAVEN_REPO/xerces/java-sources/xercesImpl-2.6.2-sources.jar" kind="var" path="MAVEN_REPO/xerces/jars/xercesImpl-2.6.2.jar">
- </classpathentry>
- <classpathentry sourcepath="MAVEN_REPO/ant/java-sources/ant-1.6.4-sources.jar" kind="var" path="MAVEN_REPO/ant/jars/ant-1.6.4.jar">
- </classpathentry>
- <classpathentry kind="output" path="target/classes">
- </classpathentry>
-</classpath>
\ No newline at end of file
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry kind="var" path="MAVEN_REPO/junit/jars/junit-3.8.2.jar" sourcepath="MAVEN_REPO/junit/java-sources/junit-3.8.2-sources.jar"/>
+ <classpathentry kind="var" path="MAVEN_REPO/jfree/jars/jfreechart-1.0.13.jar" sourcepath="MAVEN_REPO/jfree/java-sources/jfreechart-1.02-sources.jar"/>
+ <classpathentry kind="var" path="MAVEN_REPO/jfree/jars/jcommon-1.0.16.jar" sourcepath="MAVEN_REPO/jfree/java-sources/jcommon-1.0.5-sources.jar"/>
+ <classpathentry kind="var" path="MAVEN_REPO/xerces/jars/xerces-2.4.0.jar" sourcepath="MAVEN_REPO/xerces/java-sources/xerces-2.4.0-sources.jar"/>
+ <classpathentry kind="var" path="MAVEN_REPO/xerces/jars/xercesImpl-2.6.2.jar" sourcepath="MAVEN_REPO/xerces/java-sources/xercesImpl-2.6.2-sources.jar"/>
+ <classpathentry kind="var" path="MAVEN_REPO/ant/jars/ant-1.6.4.jar" sourcepath="MAVEN_REPO/ant/java-sources/ant-1.6.4-sources.jar"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Modified: trunk/qalab/project.xml
===================================================================
--- trunk/qalab/project.xml 2009-05-20 16:38:18 UTC (rev 301)
+++ trunk/qalab/project.xml 2009-05-20 16:39:54 UTC (rev 302)
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!--
////////////////////////////////////////////////////////////////////////////////
//
// ObjectLab is sponsoring QALab
-//
-// Based in London, we are world leaders in the design and development
+//
+// Based in London, we are world leaders in the design and development
// of bespoke applications for the Securities Financing markets.
-//
+//
// <a href="http://www.objectlab.co.uk/open">Click here to learn more</a>
// ___ _ _ _ _ _
// / _ \| |__ (_) ___ ___| |_| | __ _| |__
@@ -48,7 +48,7 @@
<artifactId>qalab</artifactId>
<name>QALab Library Stats for Builds</name>
<!-- The version of the project under development, e.g.
- 1.1, 1.2, 2.0-SNAPSHOT
+ 1.1, 1.2, 2.0-SNAPSHOT
<groupId>net.objectlab</groupId>
<currentVersion>1.0</currentVersion>-->
<!-- details about the organization that 'owns' the project -->
@@ -129,6 +129,11 @@
<tag>1.1</tag>
</version>
<version>
+ <id>1.2</id>
+ <name>1.2</name>
+ <tag>1.2</tag>
+ </version>
+ <version>
<id>1.0</id>
<name>1.0</name>
<tag>1.0</tag>
@@ -257,13 +262,13 @@
<dependency>
<groupId>jfree</groupId>
<artifactId>jfreechart</artifactId>
- <version>1.0.2</version>
+ <version>1.0.13</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>jfree</groupId>
<artifactId>jcommon</artifactId>
- <version>1.0.5</version>
+ <version>1.0.16</version>
<type>jar</type>
</dependency>
<dependency>
@@ -287,14 +292,14 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- <version>3.1.12-bin</version>
+ <version>5.0.4</version>
<type>jar</type>
<url>http://dev.mysql.com/downloads/</url>
<properties>
<classloader>root</classloader>
</properties>
</dependency>
-
+
</dependencies>
<!-- build information for the project -->
<build>
Modified: trunk/qalab/qalab.xml
===================================================================
--- trunk/qalab/qalab.xml 2009-05-20 16:38:18 UTC (rev 301)
+++ trunk/qalab/qalab.xml 2009-05-20 16:39:54 UTC (rev 302)
@@ -519,6 +519,18 @@
project="qalab" statvalue="69" type="cobertura-branch"/>
<summaryresult date="2007-04-20" filecount="2" module="qalab"
project="qalab" statvalue="2" type="pmd"/>
+ <summaryresult date="2009-05-20" filecount="39" module="qalab"
+ project="qalab" statvalue="30" type="checkstyle"/>
+ <summaryresult date="2009-05-20" filecount="3" module="qalab"
+ project="qalab" statvalue="9" type="findbugs"/>
+ <summaryresult date="2009-05-20" filecount="3" module="qalab"
+ project="qalab" statvalue="64" type="simian"/>
+ <summaryresult date="2009-05-20" filecount="34" module="qalab"
+ project="qalab" statvalue="58" type="cobertura-line"/>
+ <summaryresult date="2009-05-20" filecount="34" module="qalab"
+ project="qalab" statvalue="54" type="cobertura-branch"/>
+ <summaryresult date="2009-05-20" filecount="2" module="qalab"
+ project="qalab" statvalue="2" type="pmd"/>
</summary>
<file id="qalab-qalab-net_objectlab_qalab_util_package.html"
module="qalab" path="net/objectlab/qalab/util/package.html" project="qalab">
@@ -575,6 +587,7 @@
<result date="2007-04-06" statvalue="100" type="cobertura-branch"/>
<result date="2007-04-09" statvalue="100" type="cobertura-branch"/>
<result date="2007-04-20" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-05-20" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="qalab-qalab-net_objectlab_qalab_ant_BuildStatChartTask.java"
@@ -796,6 +809,9 @@
<result date="2007-04-20" statvalue="1" type="findbugs"/>
<result date="2007-04-20" statvalue="93" type="cobertura-line"/>
<result date="2007-04-20" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-05-20" statvalue="1" type="findbugs"/>
+ <result date="2009-05-20" statvalue="93" type="cobertura-line"/>
+ <result date="2009-05-20" statvalue="93" type="cobertura-branch"/>
</file>
<file
id="qalab-qalab-net_objectlab_qalab_parser_BuildStatForChartParser.java"
@@ -940,6 +956,9 @@
<result date="2007-04-20" statvalue="1" type="checkstyle"/>
<result date="2007-04-20" statvalue="75" type="cobertura-line"/>
<result date="2007-04-20" statvalue="80" type="cobertura-branch"/>
+ <result date="2009-05-20" statvalue="1" type="checkstyle"/>
+ <result date="2009-05-20" statvalue="75" type="cobertura-line"/>
+ <result date="2009-05-20" statvalue="72" type="cobertura-branch"/>
</file>
<file
id="qalab-qalab-net_objectlab_qalab_parser_BuildStatMoverHandler.java"
@@ -1076,6 +1095,8 @@
<result date="2007-04-09" statvalue="96" type="cobertura-branch"/>
<result date="2007-04-20" statvalue="90" type="cobertura-line"/>
<result date="2007-04-20" statvalue="96" type="cobertura-branch"/>
+ <result date="2009-05-20" statvalue="90" type="cobertura-line"/>
+ <result date="2009-05-20" statvalue="70" type="cobertura-branch"/>
</file>
<file
id="qalab-qalab-net_objectlab_qalab_parser_CheckstyleStatMerge.java"
@@ -1163,6 +1184,8 @@
<result date="2007-04-09" statvalue="100" type="cobertura-branch"/>
<result date="2007-04-20" statvalue="100" type="cobertura-line"/>
<result date="2007-04-20" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-05-20" statvalue="100" type="cobertura-line"/>
+ <result date="2009-05-20" statvalue="100" type="cobertura-branch"/>
</file>
<file id="qalab-qalab-net_objectlab_qalab_parser_FileStats.java"
module="qalab" path="net/objectlab/qalab/parser/FileStats.java" project="qalab">
@@ -1257,6 +1280,8 @@
<result date="2007-04-09" statvalue="100" type="cobertura-branch"/>
<result date="2007-04-20" statvalue="92" type="cobertura-line"/>
<result date="2007-04-20" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-05-20" statvalue="92" type="cobertura-line"/>
+ <result date="2009-05-20" statvalue="84" type="cobertura-branch"/>
</file>
<file
id="qalab-qalab-net_objectlab_qalab_parser_FindBugsStatMerge.java"
@@ -1344,6 +1369,8 @@
<result date="2007-04-09" statvalue="100" type="cobertura-branch"/>
<result date="2007-04-20" statvalue="97" type="cobertura-line"/>
<result date="2007-04-20" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-05-20" statvalue="97" type="cobertura-line"/>
+ <result date="2009-05-20" statvalue="92" type="cobertura-branch"/>
</file>
<file id="qalab-qalab-net_objectlab_qalab_parser_PMDStatMerge.java"
module="qalab"
@@ -1430,6 +1457,8 @@
<result date="2007-04-09" statvalue="100" type="cobertura-branch"/>
<result date="2007-04-20" statvalue="100" type="cobertura-line"/>
<result date="2007-04-20" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-05-20" statvalue="100" type="cobertura-line"/>
+ <result date="2009-05-20" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="qalab-qalab-net_objectlab_qalab_parser_SimianStatMerge.java"
@@ -1552,6 +1581,8 @@
<result date="2007-04-09" statvalue="100" type="cobertura-branch"/>
<result date="2007-04-20" statvalue="100" type="cobertura-line"/>
<result date="2007-04-20" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-05-20" statvalue="100" type="cobertura-line"/>
+ <result date="2009-05-20" statvalue="66" type="cobertura-branch"/>
</file>
<file id="qalab-qalab-net_objectlab_qalab_parser_SingleStat.java"
module="qalab" path="net/objectlab/qalab/parser/SingleStat.java" project="qalab">
@@ -1640,6 +1671,8 @@
<result date="2007-04-09" statvalue="100" type="cobertura-branch"/>
<result date="2007-04-20" statvalue="68" type="cobertura-line"/>
<result date="2007-04-20" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-05-20" statvalue="68" type="cobertura-line"/>
+ <result date="2009-05-20" statvalue="50" type="cobertura-branch"/>
</file>
<file id="qalab-qalab-net_objectlab_qalab_parser_StatMerger.java"
module="qalab" path="net/objectlab/qalab/parser/StatMerger.java" project="qalab">
@@ -1731,6 +1764,8 @@
<result date="2007-04-09" statvalue="100" type="cobertura-branch"/>
<result date="2007-04-20" statvalue="100" type="cobertura-line"/>
<result date="2007-04-20" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-05-20" statvalue="100" type="cobertura-line"/>
+ <result date="2009-05-20" statvalue="100" type="cobertura-branch"/>
</file>
<file id="qalab-qalab-net_objectlab_qalab_util_ConsoleLogger.java"
module="qalab"
@@ -1822,6 +1857,8 @@
<result date="2007-04-09" statvalue="100" type="cobertura-branch"/>
<result date="2007-04-20" statvalue="100" type="cobertura-line"/>
<result date="2007-04-20" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-05-20" statvalue="100" type="cobertura-line"/>
+ <result date="2009-05-20" statvalue="100" type="cobertura-branch"/>
</file>
<file id="qalab-qalab-net_objectlab_qalab_util_TaskLogger.java"
module="qalab" path="net/objectlab/qalab/util/TaskLogger.java" project="qalab">
@@ -1906,6 +1943,8 @@
<result date="2007-04-09" statvalue="100" type="cobertura-branch"/>
<result date="2007-04-20" statvalue="100" type="cobertura-line"/>
<result date="2007-04-20" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-05-20" statvalue="100" type="cobertura-line"/>
+ <result date="2009-05-20" statvalue="100" type="cobertura-branch"/>
</file>
<file id="qalab-qalab-net_objectlab_qalab_util_QALabTags.java"
module="qalab" path="net/objectlab/qalab/util/QALabTags.java" project="qalab">
@@ -1987,6 +2026,8 @@
<result date="2007-04-09" statvalue="100" type="cobertura-branch"/>
<result date="2007-04-20" statvalue="60" type="cobertura-line"/>
<result date="2007-04-20" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-05-20" statvalue="60" type="cobertura-line"/>
+ <result date="2009-05-20" statvalue="100" type="cobertura-branch"/>
</file>
<file id="qalab-qalab-net_objectlab_qalab_util_Util.java"
module="qalab" path="net/objectlab/qalab/util/Util.java" project="qalab">
@@ -2081,6 +2122,8 @@
<result date="2007-04-09" statvalue="100" type="cobertura-branch"/>
<result date="2007-04-20" statvalue="88" type="cobertura-line"/>
<result date="2007-04-20" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-05-20" statvalue="88" type="cobertura-line"/>
+ <result date="2009-05-20" statvalue="81" type="cobertura-branch"/>
</file>
<file
id="qalab-qalab-net_objectlab_qalab_parser_CheckstyleOrPMDBaseMerge.java"
@@ -2225,6 +2268,8 @@
<result date="2007-04-09" statvalue="100" type="cobertura-branch"/>
<result date="2007-04-20" statvalue="100" type="cobertura-line"/>
<result date="2007-04-20" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-05-20" statvalue="100" type="cobertura-line"/>
+ <result date="2009-05-20" statvalue="75" type="cobertura-branch"/>
</file>
<file
id="qalab-qalab-net_objectlab_qalab_exporter_QALabXMLExporter.java"
@@ -2312,6 +2357,8 @@
<result date="2007-04-09" statvalue="68" type="cobertura-branch"/>
<result date="2007-04-20" statvalue="63" type="cobertura-line"/>
<result date="2007-04-20" statvalue="68" type="cobertura-branch"/>
+ <result date="2009-05-20" statvalue="63" type="cobertura-line"/>
+ <result date="2009-05-20" statvalue="45" type="cobertura-branch"/>
</file>
<file id="qalab-qalab-net_objectlab_qalab_util_SilentLogger.java"
module="qalab" path="net/objectlab/qalab/util/SilentLogger.java" project="qalab">
@@ -2419,6 +2466,8 @@
<result date="2007-04-09" statvalue="100" type="cobertura-branch"/>
<result date="2007-04-20" statvalue="100" type="cobertura-line"/>
<result date="2007-04-20" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-05-20" statvalue="100" type="cobertura-line"/>
+ <result date="2009-05-20" statvalue="100" type="cobertura-branch"/>
</file>
<file id="qalab-qalab-net_objectlab_qalab_util_FilenameUtil.java"
module="qalab" path="net/objectlab/qalab/util/FilenameUtil.java" project="qalab">
@@ -2498,6 +2547,8 @@
<result date="2007-04-09" statvalue="100" type="cobertura-branch"/>
<result date="2007-04-20" statvalue="83" type="cobertura-line"/>
<result date="2007-04-20" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-05-20" statvalue="83" type="cobertura-line"/>
+ <result date="2009-05-20" statvalue="75" type="cobertura-branch"/>
</file>
<file
id="qalab-qalab-net_objectlab_qalab_parser_CoberturaBranchStatMerge.java"
@@ -2576,6 +2627,8 @@
<result date="2007-04-09" statvalue="100" type="cobertura-branch"/>
<result date="2007-04-20" statvalue="100" type="cobertura-line"/>
<result date="2007-04-20" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-05-20" statvalue="100" type="cobertura-line"/>
+ <result date="2009-05-20" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="qalab-qalab-net_objectlab_qalab_parser_CoberturaLineStatMerge.java"
@@ -2661,6 +2714,8 @@
<result date="2007-04-09" statvalue="92" type="cobertura-branch"/>
<result date="2007-04-20" statvalue="82" type="cobertura-line"/>
<result date="2007-04-20" statvalue="92" type="cobertura-branch"/>
+ <result date="2009-05-20" statvalue="82" type="cobertura-line"/>
+ <result date="2009-05-20" statvalue="66" type="cobertura-branch"/>
</file>
<file
id="qalab-qalab-net_objectlab_qalab_exporter_ConsoleExporter.java"
@@ -2738,6 +2793,8 @@
<result date="2007-04-09" statvalue="100" type="cobertura-branch"/>
<result date="2007-04-20" statvalue="47" type="cobertura-line"/>
<result date="2007-04-20" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-05-20" statvalue="47" type="cobertura-line"/>
+ <result date="2009-05-20" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="qalab-qalab-net_objectlab_qalab_interfaces_QALabExporter.java"
@@ -2815,6 +2872,8 @@
<result date="2007-04-09" statvalue="100" type="cobertura-branch"/>
<result date="2007-04-20" statvalue="100" type="cobertura-line"/>
<result date="2007-04-20" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-05-20" statvalue="100" type="cobertura-line"/>
+ <result date="2009-05-20" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="qalab-qalab-net_objectlab_qalab_parser_PMDCPDStatMerge.java"
@@ -2856,6 +2915,8 @@
<result date="2007-04-09" statvalue="100" type="cobertura-branch"/>
<result date="2007-04-20" statvalue="100" type="cobertura-line"/>
<result date="2007-04-20" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-05-20" statvalue="100" type="cobertura-line"/>
+ <result date="2009-05-20" statvalue="66" type="cobertura-branch"/>
</file>
<file
id="qalab-qalab-C:_project_qalab_qalab_src_test_java_net_objectlab_qalab_parser_BuildStatChartTest.java"
@@ -2885,6 +2946,9 @@
<result date="2007-04-20" statvalue="3" type="checkstyle"/>
<result date="2007-04-20" statvalue="3" type="findbugs"/>
<result date="2007-04-20" statvalue="1" type="pmd"/>
+ <result date="2009-05-20" statvalue="3" type="checkstyle"/>
+ <result date="2009-05-20" statvalue="3" type="findbugs"/>
+ <result date="2009-05-20" statvalue="1" type="pmd"/>
</file>
<file
id="qalab-qalab-net_objectlab_qalab_parser_DefaultChartGenerator.java"
@@ -2926,6 +2990,11 @@
<result date="2007-04-20" statvalue="87" type="cobertura-line"/>
<result date="2007-04-20" statvalue="96" type="cobertura-branch"/>
<result date="2007-04-20" statvalue="1" type="pmd"/>
+ <result date="2009-05-20" statvalue="19" type="checkstyle"/>
+ <result date="2009-05-20" statvalue="5" type="findbugs"/>
+ <result date="2009-05-20" statvalue="87" type="cobertura-line"/>
+ <result date="2009-05-20" statvalue="71" type="cobertura-branch"/>
+ <result date="2009-05-20" statvalue="1" type="pmd"/>
</file>
<file
id="qalab-qalab-net_objectlab_qalab_parser_ChartGenerator.java"
@@ -2941,6 +3010,8 @@
<result date="2007-04-09" statvalue="100" type="cobertura-branch"/>
<result date="2007-04-20" statvalue="100" type="cobertura-line"/>
<result date="2007-04-20" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-05-20" statvalue="100" type="cobertura-line"/>
+ <result date="2009-05-20" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="qalab-qalab-net_objectlab_qalab_parser_EmmaLineStatMerge.java"
@@ -2955,6 +3026,9 @@
<result date="2007-04-20" statvalue="7" type="checkstyle"/>
<result date="2007-04-20" statvalue="100" type="cobertura-line"/>
<result date="2007-04-20" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-05-20" statvalue="7" type="checkstyle"/>
+ <result date="2009-05-20" statvalue="100" type="cobertura-line"/>
+ <result date="2009-05-20" statvalue="91" type="cobertura-branch"/>
</file>
<file
id="qalab-qalab-net_objectlab_qalab_parser_EmmaBlockStatMerge.java"
@@ -2966,6 +3040,8 @@
<result date="2007-04-09" statvalue="100" type="cobertura-branch"/>
<result date="2007-04-20" statvalue="100" type="cobertura-line"/>
<result date="2007-04-20" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-05-20" statvalue="100" type="cobertura-line"/>
+ <result date="2009-05-20" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="qalab-qalab-net_objectlab_qalab_parser_EmmaClassStatMerge.java"
@@ -2977,6 +3053,8 @@
<result date="2007-04-09" statvalue="100" type="cobertura-branch"/>
<result date="2007-04-20" statvalue="100" type="cobertura-line"/>
<result date="2007-04-20" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-05-20" statvalue="100" type="cobertura-line"/>
+ <result date="2009-05-20" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="qalab-qalab-net_objectlab_qalab_parser_EmmaMethodStatMerge.java"
@@ -2988,5 +3066,7 @@
<result date="2007-04-09" statvalue="100" type="cobertura-branch"/>
<result date="2007-04-20" statvalue="100" type="cobertura-line"/>
<result date="2007-04-20" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-05-20" statvalue="100" type="cobertura-line"/>
+ <result date="2009-05-20" statvalue="100" type="cobertura-branch"/>
</file>
</qalab>
Modified: trunk/qalab/src/main/java/net/objectlab/qalab/parser/DefaultChartGenerator.java
===================================================================
--- trunk/qalab/src/main/java/net/objectlab/qalab/parser/DefaultChartGenerator.java 2009-05-20 16:38:18 UTC (rev 301)
+++ trunk/qalab/src/main/java/net/objectlab/qalab/parser/DefaultChartGenerator.java 2009-05-20 16:39:54 UTC (rev 302)
@@ -231,7 +231,7 @@
final Map.Entry pairTypeDates = (Map.Entry) typeIter.next();
final String type = (String) pairTypeDates.getKey();
availableTypes.add(type);
- final TimeSeries ts = new TimeSeries(type, "bla", "bli", FixedMillisecond.class);
+ final TimeSeries ts = new TimeSeries(type, "bla", "bli");
final List typeDates = (List) pairTypeDates.getValue();
final List typeErrors = (List) theErrors.get(type);
Modified: trunk/qalab/src/main/java/net/objectlab/qalab/parser/FindBugsStatMerge.java
===================================================================
--- trunk/qalab/src/main/java/net/objectlab/qalab/parser/FindBugsStatMerge.java 2009-05-20 16:38:18 UTC (rev 301)
+++ trunk/qalab/src/main/java/net/objectlab/qalab/parser/FindBugsStatMerge.java 2009-05-20 16:39:54 UTC (rev 302)
@@ -1,209 +1,209 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// ObjectLab is sponsoring QALab
-//
-// Based in London, we are world leaders in the design and development
-// of bespoke applications for the Securities Financing markets.
-//
-// <a href="http://www.objectlab.co.uk/open">Click here to learn more</a>
-// ___ _ _ _ _ _
-// / _ \| |__ (_) ___ ___| |_| | __ _| |__
-// | | | | '_ \| |/ _ \/ __| __| | / _` | '_ \
-// | |_| | |_) | | __/ (__| |_| |__| (_| | |_) |
-// \___/|_.__// |\___|\___|\__|_____\__,_|_.__/
-// |__/
-//
-// http://www.ObjectLab.co.uk
-// ---------------------------------------------------------------------------
-//
-//QALab is released under the GNU General Public License.
-//
-//QALab: Collects QA Statistics from your build over time.
-//2005+, ObjectLab Ltd
-//
-//This library is free software; you can redistribute it and/or
-//modify it under the terms of the GNU General Public
-//License as published by the Free Software Foundation; either
-//version 2.1 of the License, or (at your option) any later version.
-//
-//This library is distributed in the hope that it will be useful,
-//but WITHOUT ANY WARRANTY; without even the implied warranty of
-//MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-//General Public License for more details.
-//
-//You should have received a copy of the GNU General Public
-//License along with this library; if not, write to the Free Software
-//Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-//
-////////////////////////////////////////////////////////////////////////////////
-package net.objectlab.qalab.parser;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import net.objectlab.qalab.util.Util;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * This is the new FindBugs Stat merger, able to handle BOTH xdoc and xml output from FindBugs.
- *
- * @author Benoit Xhenseval
- * @version $Revision$
- */
-public class FindBugsStatMerge extends BaseStatMerge {
- private static final String TAG_BUG_COLLECTION = "BugCollection";
- private static final String TAG_BUG_INSTANCE = "BugInstance";
- private static final String TAG_CLASS_STATS = "ClassStats";
- private static final String TAG_FILE = "file";
- private static final String ATT_CLASSNAME = "classname";
- private static final String ATT_CLASS_IN_SUMMARY = "class";
- private static final String ATT_BUGS = "bugs";
- private Map violationPerFile = new HashMap();
-
- // used by the old XDOC format.
- private String currentFile;
- private boolean xdocFormatDetected = false;
-
-
- /**
- * At the start of a new element, capture the filename and if the element
- * is a result one, create a SingleStat to store for the given type.
- * @param ignoreNamespaceURI ignore (present for interface implementation).
- * @param localname name of the current element.
- * @param qualifiedname element name.
- * @param attrs the XML attribute of the current element.
- * @throws SAXException any SAX issue
- */
- public final void startElement(final String ignoreNamespaceURI, // NOPMD
- final String localname, final String qualifiedname, final Attributes attrs) throws SAXException {
- String local = localname;
-
- if ("".equals(local)) {
- local = qualifiedname;
- }
-
- //if (!isQuiet()) {
- // getTaskLogger().log("Start :" + local);
- //}
-
- if (TAG_FILE.equals(local)) {
- currentFile = getFileName(attrs, ATT_CLASSNAME);
- if (!violationPerFile.containsKey(currentFile)) {
- violationPerFile.put(currentFile, new Integer(0));
- }
- xdocFormatDetected = true;
- } else if (TAG_CLASS_STATS.equals(local)) {
- // new XML format
- String fileName = getFileName(attrs, ATT_CLASS_IN_SUMMARY);
- String bugs = Util.getAttributeValue(attrs, ATT_BUGS, isQuiet(), getTaskLogger());
- int bug = Integer.parseInt(bugs);
- if (bug > 0) {
- Integer issue = (Integer) violationPerFile.get(fileName);
- if (issue != null) {
- bug += issue.intValue();
- }
- violationPerFile.put(fileName, new Integer(bug));
- }
- }
-
- // for the XDOC, there is no summary, we need to COUNT the number of violations
- if (xdocFormatDetected && TAG_BUG_INSTANCE.equals(local)) {
- Integer issue = (Integer) violationPerFile.get(currentFile);
- if (issue != null) {
- violationPerFile.put(currentFile, new Integer(issue.intValue() + 1));
- } else {
- violationPerFile.put(currentFile, new Integer(1));
- }
- }
- }
-
- /**
- * At the end of an element, check if it is a BugCollection one and add the
- * all results found.
- * @param ignoreNamespaceURI ignore (present for interface implementation).
- * @param ignoreSimplename ignore (present for interface implementation).
- * @param qualifiedname the name of the element.
- * @throws SAXException any SAX issue
- */
- public final void endElement(final String ignoreNamespaceURI, // NOPMD
- final String ignoreSimplename, final String qualifiedname) // NOPMD
- throws SAXException {
- // if (!isQuiet()) {
- // getTaskLogger().log("End :" + qualifiedname);
- // }
-
- if (TAG_BUG_COLLECTION.equals(qualifiedname)) {
- // now publish all statistics one file at a time.
- setTotalStatistics(0);
- incrementFileCount(violationPerFile.size());
- for (Iterator it = violationPerFile.entrySet().iterator(); it.hasNext();) {
- Map.Entry entry = (Entry) it.next();
- resetFileStatistics();
- setCurrentFile((String) entry.getKey());
- addFileStatistics(((Integer) entry.getValue()).intValue());
- addNewResults();
- }
- }
- }
-
- /**
- * @return findbugs
- */
- public final String getType() {
- return "findbugs";
- }
-
- /**
- * Given the different ways that files can be stored on file system, this
- * method will remove anything part of the path up to the 'srcDir' given, it
- * should only retain the package name in java. For instance, for Findbugs
- * classname="net.objectlab.X" will be stored in the compiled stats as:
- * net/objectlab/A.java
- *
- * Please note that FindBugs may refer to internal classes too like
- * net.objectlab.A$Key but we shall consider them to be in the same file
- * net/objectlab/A.java
- *
- * @param att
- * the XML attribute
- */
- protected final String getFileName(final Attributes att, final String attributeName) {
- String fileName = Util.getAttributeValue(att, attributeName, isQuiet(), getTaskLogger());
-
- fileName = fileName.replace('.', '/');
-
- final int embeddedClass = fileName.indexOf("$");
-
- if (embeddedClass > 0) {
- fileName = fileName.substring(0, embeddedClass);
- }
-
- fileName += ".java";
-
- if (!isQuiet()) {
- getTaskLogger().log("setCurrentFileName FILE [" + fileName + "]");
- }
-
- return fileName;
- }
-}
-/*
- * ObjectLab is sponsoring QALab
- *
- * Based in London, we are world leaders in the design and development
- * of bespoke applications for the securities financing markets.
- *
- * <a href="http://www.objectlab.co.uk/open">Click here to learn more about us</a>
- * ___ _ _ _ _ _
- * / _ \| |__ (_) ___ ___| |_| | __ _| |__
- * | | | | '_ \| |/ _ \/ __| __| | / _` | '_ \
- * | |_| | |_) | | __/ (__| |_| |__| (_| | |_) |
- * \___/|_.__// |\___|\___|\__|_____\__,_|_.__/
- * |__/
- *
- * www.ObjectLab.co.uk
- */
+////////////////////////////////////////////////////////////////////////////////
+//
+// ObjectLab is sponsoring QALab
+//
+// Based in London, we are world leaders in the design and development
+// of bespoke applications for the Securities Financing markets.
+//
+// <a href="http://www.objectlab.co.uk/open">Click here to learn more</a>
+// ___ _ _ _ _ _
+// / _ \| |__ (_) ___ ___| |_| | __ _| |__
+// | | | | '_ \| |/ _ \/ __| __| | / _` | '_ \
+// | |_| | |_) | | __/ (__| |_| |__| (_| | |_) |
+// \___/|_.__// |\___|\___|\__|_____\__,_|_.__/
+// |__/
+//
+// http://www.ObjectLab.co.uk
+// ---------------------------------------------------------------------------
+//
+//QALab is released under the GNU General Public License.
+//
+//QALab: Collects QA Statistics from your build over time.
+//2005+, ObjectLab Ltd
+//
+//This library is free software; you can redistribute it and/or
+//modify it under the terms of the GNU General Public
+//License as published by the Free Software Foundation; either
+//version 2.1 of the License, or (at your option) any later version.
+//
+//This library is distributed in the hope that it will be useful,
+//but WITHOUT ANY WARRANTY; without even the implied warranty of
+//MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+//General Public License for more details.
+//
+//You should have received a copy of the GNU General Public
+//License along with this library; if not, write to the Free Software
+//Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+////////////////////////////////////////////////////////////////////////////////
+package net.objectlab.qalab.parser;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import net.objectlab.qalab.util.Util;
+
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * This is the new FindBugs Stat merger, able to handle BOTH xdoc and xml output from FindBugs.
+ *
+ * @author Benoit Xhenseval
+ * @version $Revision: 187 $
+ */
+public class FindBugsStatMerge extends BaseStatMerge {
+ private static final String TAG_BUG_COLLECTION = "BugCollection";
+ private static final String TAG_BUG_INSTANCE = "BugInstance";
+ private static final String TAG_CLASS_STATS = "ClassStats";
+ private static final String TAG_FILE = "file";
+ private static final String ATT_CLASSNAME = "classname";
+ private static final String ATT_CLASS_IN_SUMMARY = "class";
+ private static final String ATT_BUGS = "bugs";
+ private Map violationPerFile = new HashMap();
+
+ // used by the old XDOC format.
+ private String currentFile;
+ private boolean xdocFormatDetected = false;
+
+
+ /**
+ * At the start of a new element, capture the filename and if the element
+ * is a result one, create a SingleStat to store for the given type.
+ * @param ignoreNamespaceURI ignore (present for interface implementation).
+ * @param localname name of the current element.
+ * @param qualifiedname element name.
+ * @param attrs the XML attribute of the current element.
+ * @throws SAXException any SAX issue
+ */
+ public final void startElement(final String ignoreNamespaceURI, // NOPMD
+ final String localname, final String qualifiedname, final Attributes attrs) throws SAXException {
+ String local = localname;
+
+ if ("".equals(local)) {
+ local = qualifiedname;
+ }
+
+ //if (!isQuiet()) {
+ // getTaskLogger().log("Start :" + local);
+ //}
+
+ if (TAG_FILE.equals(local)) {
+ currentFile = getFileName(attrs, ATT_CLASSNAME);
+ if (!violationPerFile.containsKey(currentFile)) {
+ violationPerFile.put(currentFile, new Integer(0));
+ }
+ xdocFormatDetected = true;
+ } else if (TAG_CLASS_STATS.equals(local)) {
+ // new XML format
+ String fileName = getFileName(attrs, ATT_CLASS_IN_SUMMARY);
+ String bugs = Util.getAttributeValue(attrs, ATT_BUGS, isQuiet(), getTaskLogger());
+ int bug = Integer.parseInt(bugs);
+ if (bug > 0) {
+ Integer issue = (Integer) violationPerFile.get(fileName);
+ if (issue != null) {
+ bug += issue.intValue();
+ }
+ violationPerFile.put(fileName, new Integer(bug));
+ }
+ }
+
+ // for the XDOC, there is no summary, we need to COUNT the number of violations
+ if (xdocFormatDetected && TAG_BUG_INSTANCE.equals(local)) {
+ Integer issue = (Integer) violationPerFile.get(currentFile);
+ if (issue != null) {
+ violationPerFile.put(currentFile, new Integer(issue.intValue() + 1));
+ } else {
+ violationPerFile.put(currentFile, new Integer(1));
+ }
+ }
+ }
+
+ /**
+ * At the end of an element, check if it is a BugCollection one and add the
+ * all results found.
+ * @param ignoreNamespaceURI ignore (present for interface implementation).
+ * @param ignoreSimplename ignore (present for interface implementation).
+ * @param qualifiedname the name of the element.
+ * @throws SAXException any SAX issue
+ */
+ public final void endElement(final String ignoreNamespaceURI, // NOPMD
+ final String ignoreSimplename, final String qualifiedname) // NOPMD
+ throws SAXException {
+ // if (!isQuiet()) {
+ // getTaskLogger().log("End :" + qualifiedname);
+ // }
+
+ if (TAG_BUG_COLLECTION.equals(qualifiedname)) {
+ // now publish all statistics one file at a time.
+ setTotalStatistics(0);
+ incrementFileCount(violationPerFile.size());
+ for (Iterator it = violationPerFile.entrySet().iterator(); it.hasNext();) {
+ Map.Entry entry = (Entry) it.next();
+ resetFileStatistics();
+ setCurrentFile((String) entry.getKey());
+ addFileStatistics(((Integer) entry.getValue()).intValue());
+ addNewResults();
+ }
+ }
+ }
+
+ /**
+ * @return findbugs
+ */
+ public final String getType() {
+ return "findbugs";
+ }
+
+ /**
+ * Given the different ways that files can be stored on file system, this
+ * method will remove anything part of the path up to the 'srcDir' given, it
+ * should only retain the package name in java. For instance, for Findbugs
+ * classname="net.objectlab.X" will be stored in the compiled stats as:
+ * net/objectlab/A.java
+ *
+ * Please note that FindBugs may refer to internal classes too like
+ * net.objectlab.A$Key but we shall consider them to be in the same file
+ * net/objectlab/A.java
+ *
+ * @param att
+ * the XML attribute
+ */
+ protected final String getFileName(final Attributes att, final String attributeName) {
+ String fileName = Util.getAttributeValue(att, attributeName, isQuiet(), getTaskLogger());
+
+ fileName = fileName.replace('.', '/');
+
+ final int embeddedClass = fileName.indexOf("$");
+
+ if (embeddedClass > 0) {
+ fileName = fileName.substring(0, embeddedClass);
+ }
+
+ fileName += ".java";
+
+ if (!isQuiet()) {
+ getTaskLogger().log("setCurrentFileName FILE [" + fileName + "]");
+ }
+
+ return fileName;
+ }
+}
+/*
+ * ObjectLab is sponsoring QALab
+ *
+ * Based in London, we are world leaders in the design and development
+ * of bespoke applications for the securities financing markets.
+ *
+ * <a href="http://www.objectlab.co.uk/open">Click here to learn more about us</a>
+ * ___ _ _ _ _ _
+ * / _ \| |__ (_) ___ ___| |_| | __ _| |__
+ * | | | | '_ \| |/ _ \/ __| __| | / _` | '_ \
+ * | |_| | |_) | | __/ (__| |_| |__| (_| | |_) |
+ * \___/|_.__// |\___|\___|\__|_____\__,_|_.__/
+ * |__/
+ *
+ * www.ObjectLab.co.uk
+ */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
