diff options
| author | Jeff Gaston <jeffrygaston@google.com> | 2017-06-16 21:58:39 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-16 21:58:39 +0000 |
| commit | 7e0c218b10bfdd1bdd144db9921c9b4f343a929d (patch) | |
| tree | c2efd9dea10bbe33e14818d9c6f9f52a17baf24e | |
| parent | ff54e096d95a349481988506b8f20323c46ff179 (diff) | |
| parent | 8da25e49bc72ec3a2455080c53c0dc2006decd7d (diff) | |
| download | jacoco-7e0c218b10bfdd1bdd144db9921c9b4f343a929d.tar.gz | |
Move WildcardMatcher into new 'matcher' package
am: 8da25e49bc
Change-Id: I6cc3210ceb6fbadf57486b80b09eb307556c4f8f
| -rw-r--r-- | org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/CoverageTransformer.java | 2 | ||||
| -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.java | 1 | ||||
| -rw-r--r-- | org.jacoco.report/src/org/jacoco/report/check/Rule.java | 2 |
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 |