From a641d50e8450202112c64bb5f209a7361bef84e8 Mon Sep 17 00:00:00 2001 From: Evgeny Mandrikov Date: Wed, 23 Jan 2019 00:13:28 +0100 Subject: Rename method 'isEmpty' to 'containsCode' --- org.jacoco.report/src/org/jacoco/report/csv/CSVGroupHandler.java | 2 +- .../src/org/jacoco/report/internal/html/page/BundlePage.java | 4 ++-- .../src/org/jacoco/report/internal/html/page/PackagePage.java | 2 +- .../src/org/jacoco/report/internal/html/page/PackageSourcePage.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'org.jacoco.report/src/org') 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 { 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 { 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 { 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 { 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(); -- cgit v1.2.3