aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Gaston <jeffrygaston@google.com>2017-05-18 13:39:47 -0700
committerJeff Gaston <jeffrygaston@google.com>2017-06-15 15:25:26 -0700
commit8da25e49bc72ec3a2455080c53c0dc2006decd7d (patch)
treec2efd9dea10bbe33e14818d9c6f9f52a17baf24e
parent4ed39e392f8764a5b10387596d97a6ca74f01807 (diff)
downloadjacoco-8da25e49bc72ec3a2455080c53c0dc2006decd7d.tar.gz
Move WildcardMatcher into new 'matcher' package
Change-Id: If7997e60d9fbcc53c297793530eeafa97b38d7ee
-rw-r--r--org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/CoverageTransformer.java2
-rw-r--r--org.jacoco.core.test/src/org/jacoco/core/matcher/WildcardMatcherTest.java (renamed from org.jacoco.core.test/src/org/jacoco/core/runtime/WildcardMatcherTest.java)2
-rw-r--r--org.jacoco.core/src/org/jacoco/core/matcher/WildcardMatcher.java (renamed from org.jacoco.core/src/org/jacoco/core/runtime/WildcardMatcher.java)2
-rw-r--r--org.jacoco.core/src/org/jacoco/core/runtime/AgentOptions.java1
-rw-r--r--org.jacoco.report/src/org/jacoco/report/check/Rule.java2
5 files changed, 5 insertions, 4 deletions
diff --git a/org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/CoverageTransformer.java b/org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/CoverageTransformer.java
index 53d12387..2cb16fed 100644
--- a/org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/CoverageTransformer.java
+++ b/org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/CoverageTransformer.java
@@ -19,7 +19,7 @@ import java.security.ProtectionDomain;
import org.jacoco.core.instr.Instrumenter;
import org.jacoco.core.runtime.AgentOptions;
import org.jacoco.core.runtime.IRuntime;
-import org.jacoco.core.runtime.WildcardMatcher;
+import org.jacoco.core.matcher.WildcardMatcher;
/**
* Class file transformer to instrument classes for code coverage analysis.
diff --git a/org.jacoco.core.test/src/org/jacoco/core/runtime/WildcardMatcherTest.java b/org.jacoco.core.test/src/org/jacoco/core/matcher/WildcardMatcherTest.java
index 10e012c4..0d0a9c0a 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/runtime/WildcardMatcherTest.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/matcher/WildcardMatcherTest.java
@@ -9,7 +9,7 @@
* Marc R. Hoffmann - initial API and implementation
*
*******************************************************************************/
-package org.jacoco.core.runtime;
+package org.jacoco.core.matcher;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
diff --git a/org.jacoco.core/src/org/jacoco/core/runtime/WildcardMatcher.java b/org.jacoco.core/src/org/jacoco/core/matcher/WildcardMatcher.java
index 221e6ea5..9e7bd871 100644
--- a/org.jacoco.core/src/org/jacoco/core/runtime/WildcardMatcher.java
+++ b/org.jacoco.core/src/org/jacoco/core/matcher/WildcardMatcher.java
@@ -9,7 +9,7 @@
* Marc R. Hoffmann - initial API and implementation
*
*******************************************************************************/
-package org.jacoco.core.runtime;
+package org.jacoco.core.matcher;
import java.util.regex.Pattern;
diff --git a/org.jacoco.core/src/org/jacoco/core/runtime/AgentOptions.java b/org.jacoco.core/src/org/jacoco/core/runtime/AgentOptions.java
index cf575127..6b4fb0c5 100644
--- a/org.jacoco.core/src/org/jacoco/core/runtime/AgentOptions.java
+++ b/org.jacoco.core/src/org/jacoco/core/runtime/AgentOptions.java
@@ -22,6 +22,7 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.regex.Pattern;
+import org.jacoco.core.matcher.WildcardMatcher;
/**
* Utility to create and parse options for the runtime agent. Options are
diff --git a/org.jacoco.report/src/org/jacoco/report/check/Rule.java b/org.jacoco.report/src/org/jacoco/report/check/Rule.java
index f34c6cdf..acf90586 100644
--- a/org.jacoco.report/src/org/jacoco/report/check/Rule.java
+++ b/org.jacoco.report/src/org/jacoco/report/check/Rule.java
@@ -15,7 +15,7 @@ import java.util.ArrayList;
import java.util.List;
import org.jacoco.core.analysis.ICoverageNode.ElementType;
-import org.jacoco.core.runtime.WildcardMatcher;
+import org.jacoco.core.matcher.WildcardMatcher;
/**
* A rule applies for a certain element type and can define any number of limits