Rename method 'isEmpty' to 'containsCode'

9 files changed, 14 insertions, 13 deletions

diff --git a/jacoco-maven-plugin/src/org/jacoco/maven/ReportSupport.java b/jacoco-maven-plugin/src/org/jacoco/maven/ReportSupport.java
index eaf31c80..1cdf847c 100644
--- a/jacoco-maven-plugin/src/org/jacoco/maven/ReportSupport.java
+++ b/jacoco-maven-plugin/src/org/jacoco/maven/ReportSupport.java
@@ -222,7 +222,8 @@ final class ReportSupport {
 						c.getName()));
 			}
 		}
-		if (!bundle.isEmpty() && bundle.getLineCounter().getTotalCount() == 0) {
+		if (bundle.containsCode()
+				&& bundle.getLineCounter().getTotalCount() == 0) {
 			log.warn(
 					"To enable source code annotation class files have to be compiled with debug information.");
 		}
diff --git a/org.jacoco.ant/src/org/jacoco/ant/ReportTask.java b/org.jacoco.ant/src/org/jacoco/ant/ReportTask.java
index 95ee9cda..bbcb3487 100644
--- a/org.jacoco.ant/src/org/jacoco/ant/ReportTask.java
+++ b/org.jacoco.ant/src/org/jacoco/ant/ReportTask.java
@@ -593,7 +593,7 @@ public class ReportTask extends Task {
 	}
 
 	private void checkForMissingDebugInformation(final ICoverageNode node) {
-		if (!node.isEmpty() && node.getLineCounter().getTotalCount() == 0) {
+		if (node.containsCode() && node.getLineCounter().getTotalCount() == 0) {
 			log(format(
 					"To enable source code annotation class files for bundle '%s' have to be compiled with debug information.",
 					node.getName()), Project.MSG_WARN);
diff --git a/org.jacoco.core/src/org/jacoco/core/analysis/CoverageNodeImpl.java b/org.jacoco.core/src/org/jacoco/core/analysis/CoverageNodeImpl.java
index 95a15c44..6be3bb6f 100644
--- a/org.jacoco.core/src/org/jacoco/core/analysis/CoverageNodeImpl.java
+++ b/org.jacoco.core/src/org/jacoco/core/analysis/CoverageNodeImpl.java
@@ -143,8 +143,8 @@ public class CoverageNodeImpl implements ICoverageNode {
 		throw new AssertionError(entity);
 	}
 
-	public boolean isEmpty() {
-		return getInstructionCounter().getTotalCount() == 0;
+	public boolean containsCode() {
+		return getInstructionCounter().getTotalCount() != 0;
 	}
 
 	public ICoverageNode getPlainCopy() {
diff --git a/org.jacoco.core/src/org/jacoco/core/analysis/ICoverageNode.java b/org.jacoco.core/src/org/jacoco/core/analysis/ICoverageNode.java
index 32177bbd..20b107d4 100644
--- a/org.jacoco.core/src/org/jacoco/core/analysis/ICoverageNode.java
+++ b/org.jacoco.core/src/org/jacoco/core/analysis/ICoverageNode.java
@@ -132,11 +132,11 @@ public interface ICoverageNode {
 	ICounter getCounter(CounterEntity entity);
 
 	/**
-	 * Checks whether this is an empty node.
+	 * Checks whether this node contains code relevant for code coverage.
 	 *
-	 * @return <code>true</code> if this node does not contain instructions
+	 * @return <code>true</code> if this node contains code relevant for code coverage
 	 */
-	boolean isEmpty();
+	boolean containsCode();
 
 	/**
 	 * Creates a plain copy of this node. While {@link ICoverageNode}
diff --git a/org.jacoco.core/src/org/jacoco/core/internal/analysis/ClassAnalyzer.java b/org.jacoco.core/src/org/jacoco/core/internal/analysis/ClassAnalyzer.java
index 1fb37ad6..a18ee7ed 100644
--- a/org.jacoco.core/src/org/jacoco/core/internal/analysis/ClassAnalyzer.java
+++ b/org.jacoco.core/src/org/jacoco/core/internal/analysis/ClassAnalyzer.java
@@ -113,7 +113,7 @@ public class ClassAnalyzer extends ClassProbesVisitor
 				signature);
 		mcc.calculate(mc);
 
-		if (!mc.isEmpty()) {
+		if (mc.containsCode()) {
 			// Only consider methods that actually contain code
 			coverage.addMethod(mc);
 		}
diff --git a/org.jacoco.report/src/org/jacoco/report/csv/CSVGroupHandler.java b/org.jacoco.report/src/org/jacoco/report/csv/CSVGroupHandler.java
index bb701570..594feb4a 100644
--- a/org.jacoco.report/src/org/jacoco/report/csv/CSVGroupHandler.java
+++ b/org.jacoco.report/src/org/jacoco/report/csv/CSVGroupHandler.java
@@ -43,7 +43,7 @@ class CSVGroupHandler implements IReportGroupVisitor {
 		for (final IPackageCoverage p : bundle.getPackages()) {
 			final String packageName = p.getName();
 			for (final IClassCoverage c : p.getClasses()) {
-				if (!c.isEmpty()) {
+				if (c.containsCode()) {
 					writer.writeRow(name, packageName, c);
 				}
 			}
diff --git a/org.jacoco.report/src/org/jacoco/report/internal/html/page/BundlePage.java b/org.jacoco.report/src/org/jacoco/report/internal/html/page/BundlePage.java
index 403269c9..4caeb67e 100644
--- a/org.jacoco.report/src/org/jacoco/report/internal/html/page/BundlePage.java
+++ b/org.jacoco.report/src/org/jacoco/report/internal/html/page/BundlePage.java
@@ -63,7 +63,7 @@ public class BundlePage extends TablePage<ICoverageNode> {
 
 	private void renderPackages() throws IOException {
 		for (final IPackageCoverage p : bundle.getPackages()) {
-			if (p.isEmpty()) {
+			if (!p.containsCode()) {
 				continue;
 			}
 			final String packagename = p.getName();
@@ -90,7 +90,7 @@ public class BundlePage extends TablePage<ICoverageNode> {
 	protected void content(HTMLElement body) throws IOException {
 		if (bundle.getPackages().isEmpty()) {
 			body.p().text("No class files specified.");
-		} else if (bundle.isEmpty()) {
+		} else if (!bundle.containsCode()) {
 			body.p().text(
 					"None of the analyzed classes contain code relevant for code coverage.");
 		} else {
diff --git a/org.jacoco.report/src/org/jacoco/report/internal/html/page/PackagePage.java b/org.jacoco.report/src/org/jacoco/report/internal/html/page/PackagePage.java
index 23d14f4c..3d5e24dc 100644
--- a/org.jacoco.report/src/org/jacoco/report/internal/html/page/PackagePage.java
+++ b/org.jacoco.report/src/org/jacoco/report/internal/html/page/PackagePage.java
@@ -65,7 +65,7 @@ public class PackagePage extends TablePage<IPackageCoverage> {
 
 	private void renderClasses() throws IOException {
 		for (final IClassCoverage c : getNode().getClasses()) {
-			if (c.isEmpty()) {
+			if (!c.containsCode()) {
 				continue;
 			}
 			final ILinkable sourceFilePage = packageSourcePage
diff --git a/org.jacoco.report/src/org/jacoco/report/internal/html/page/PackageSourcePage.java b/org.jacoco.report/src/org/jacoco/report/internal/html/page/PackageSourcePage.java
index 135e895d..988033d0 100644
--- a/org.jacoco.report/src/org/jacoco/report/internal/html/page/PackageSourcePage.java
+++ b/org.jacoco.report/src/org/jacoco/report/internal/html/page/PackageSourcePage.java
@@ -79,7 +79,7 @@ public class PackageSourcePage extends TablePage<IPackageCoverage> {
 	private final void renderSourceFilePages() throws IOException {
 		final String packagename = getNode().getName();
 		for (final ISourceFileCoverage s : getNode().getSourceFiles()) {
-			if (s.isEmpty()) {
+			if (!s.containsCode()) {
 				continue;
 			}
 			final String sourcename = s.getName();