Trac #94: Include id with ClassCoverage to allow linkage with execution data.

2 files changed, 18 insertions, 4 deletions

diff --git a/org.jacoco.core/src/org/jacoco/core/analysis/ClassCoverage.java b/org.jacoco.core/src/org/jacoco/core/analysis/ClassCoverage.java
index 3016e6fa..b319d693 100644
--- a/org.jacoco.core/src/org/jacoco/core/analysis/ClassCoverage.java
+++ b/org.jacoco.core/src/org/jacoco/core/analysis/ClassCoverage.java
@@ -22,6 +22,7 @@ import java.util.Collection;
  */

 public class ClassCoverage extends CoverageNodeImpl {

 

+	private final long id;

 	private final String signature;

 	private final String superName;

 	private final String[] interfaces;

@@ -33,6 +34,8 @@ public class ClassCoverage extends CoverageNodeImpl {
 	 * 

 	 * @param name

 	 *            vm name of the class

+	 * @param id

+	 *            class identifier

 	 * @param signature

 	 *            vm signature of the class

 	 * @param superName

@@ -44,11 +47,12 @@ public class ClassCoverage extends CoverageNodeImpl {
 	 * @param methods

 	 *            contained methods

 	 */

-	public ClassCoverage(final String name, final String signature,

-			final String superName, final String[] interfaces,

-			final String sourceFileName,

+	public ClassCoverage(final String name, final long id,

+			final String signature, final String superName,

+			final String[] interfaces, final String sourceFileName,

 			final Collection<MethodCoverage> methods) {

 		super(ElementType.CLASS, name, true);

+		this.id = id;

 		this.signature = signature;

 		this.superName = superName;

 		this.interfaces = interfaces;

@@ -62,6 +66,16 @@ public class ClassCoverage extends CoverageNodeImpl {
 	}

 

 	/**

+	 * Returns the identifier for this class which is the CRC64 signature of the

+	 * class definition.

+	 * 

+	 * @return class identifier

+	 */

+	public long getId() {

+		return id;

+	}

+

+	/**

 	 * Returns the VM signature of the class.

 	 * 

 	 * @return VM signature of the class (may be <code>null</code>)

diff --git a/org.jacoco.core/src/org/jacoco/core/analysis/CoverageBuilder.java b/org.jacoco.core/src/org/jacoco/core/analysis/CoverageBuilder.java
index 3adae388..527e97a1 100644
--- a/org.jacoco.core/src/org/jacoco/core/analysis/CoverageBuilder.java
+++ b/org.jacoco.core/src/org/jacoco/core/analysis/CoverageBuilder.java
@@ -116,7 +116,7 @@ public class CoverageBuilder implements IStructureVisitor {
 			}

 

 			public void visitEnd() {

-				final ClassCoverage classData = new ClassCoverage(name,

+				final ClassCoverage classData = new ClassCoverage(name, id,

 						signature, superName, interfaces, sourcename, methods);

 				// Only consider classes that actually contain code:

 				if (classData.getInstructionCounter().getTotalCount() > 0) {