From f9a4a8cec7606473edf551a6fd76279081162269 Mon Sep 17 00:00:00 2001 From: "Marc R. Hoffmann" Date: Fri, 11 Oct 2019 19:59:34 +0200 Subject: Access to static members should use qualifier of declaring type (#962) --- .../org/jacoco/core/internal/analysis/MethodCoverageCalculator.java | 5 ++--- .../org/jacoco/core/internal/analysis/filter/KotlinWhenFilter.java | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'org.jacoco.core/src/org/jacoco/core/internal/analysis') diff --git a/org.jacoco.core/src/org/jacoco/core/internal/analysis/MethodCoverageCalculator.java b/org.jacoco.core/src/org/jacoco/core/internal/analysis/MethodCoverageCalculator.java index ee8b7c6f..f6a7c5d9 100644 --- a/org.jacoco.core/src/org/jacoco/core/internal/analysis/MethodCoverageCalculator.java +++ b/org.jacoco.core/src/org/jacoco/core/internal/analysis/MethodCoverageCalculator.java @@ -20,7 +20,6 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import org.jacoco.core.analysis.ISourceFileCoverage; import org.jacoco.core.analysis.ISourceNode; import org.jacoco.core.internal.analysis.filter.IFilterOutput; import org.objectweb.asm.tree.AbstractInsnNode; @@ -122,8 +121,8 @@ class MethodCoverageCalculator implements IFilterOutput { private void ensureCapacity(final MethodCoverageImpl coverage) { // Determine line range: - int firstLine = ISourceFileCoverage.UNKNOWN_LINE; - int lastLine = ISourceFileCoverage.UNKNOWN_LINE; + int firstLine = ISourceNode.UNKNOWN_LINE; + int lastLine = ISourceNode.UNKNOWN_LINE; for (final Entry entry : instructions .entrySet()) { if (!ignored.contains(entry.getKey())) { diff --git a/org.jacoco.core/src/org/jacoco/core/internal/analysis/filter/KotlinWhenFilter.java b/org.jacoco.core/src/org/jacoco/core/internal/analysis/filter/KotlinWhenFilter.java index 37c3ac3b..ecf6dbac 100644 --- a/org.jacoco.core/src/org/jacoco/core/internal/analysis/filter/KotlinWhenFilter.java +++ b/org.jacoco.core/src/org/jacoco/core/internal/analysis/filter/KotlinWhenFilter.java @@ -18,7 +18,6 @@ import java.util.Set; import org.objectweb.asm.Opcodes; import org.objectweb.asm.tree.AbstractInsnNode; -import org.objectweb.asm.tree.InsnNode; import org.objectweb.asm.tree.JumpInsnNode; import org.objectweb.asm.tree.LabelNode; import org.objectweb.asm.tree.LookupSwitchInsnNode; @@ -45,7 +44,7 @@ public final class KotlinWhenFilter implements IFilter { private static class Matcher extends AbstractMatcher { void match(final AbstractInsnNode start, final IFilterOutput output) { - if (start.getType() != InsnNode.LABEL) { + if (start.getType() != AbstractInsnNode.LABEL) { return; } cursor = start; -- cgit v1.2.3