diff options
| author | Jeff Gaston <jeffrygaston@google.com> | 2017-06-28 00:29:05 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-28 00:29:05 +0000 |
| commit | e28fab5f40c3c8f64666c6e46f9b0992673e9067 (patch) | |
| tree | 660155d155e075109b5d7f6dd0c96e532805ca88 | |
| parent | 477925316b044af307a791bb148f8751ae930df1 (diff) | |
| parent | 7501f6096cd2217a12aa0c05a548d4c04d0552fd (diff) | |
| download | jacoco-e28fab5f40c3c8f64666c6e46f9b0992673e9067.tar.gz | |
Merge "Revert "Move WildcardMatcher into new 'matcher' package"" am: b1b164ac86 am: 9ef5ef62ba am: 626019de32oreo-mr1-dev
am: 7501f6096c
Change-Id: I848da9940449f2eff0d3d137465a92e54915f87e
| -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/runtime/WildcardMatcherTest.java (renamed from org.jacoco.core.test/src/org/jacoco/core/matcher/WildcardMatcherTest.java) | 2 | ||||
| -rw-r--r-- | org.jacoco.core/src/org/jacoco/core/runtime/AgentOptions.java | 1 | ||||
| -rw-r--r-- | org.jacoco.core/src/org/jacoco/core/runtime/WildcardMatcher.java (renamed from org.jacoco.core/src/org/jacoco/core/matcher/WildcardMatcher.java) | 2 | ||||
| -rw-r--r-- | org.jacoco.report/src/org/jacoco/report/check/Rule.java | 2 |
5 files changed, 4 insertions, 5 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 2cb16fed..53d12387 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.matcher.WildcardMatcher; +import org.jacoco.core.runtime.WildcardMatcher; /** * Class file transformer to instrument classes for code coverage analysis. diff --git a/org.jacoco.core.test/src/org/jacoco/core/matcher/WildcardMatcherTest.java b/org.jacoco.core.test/src/org/jacoco/core/runtime/WildcardMatcherTest.java index 0d0a9c0a..10e012c4 100644 --- a/org.jacoco.core.test/src/org/jacoco/core/matcher/WildcardMatcherTest.java +++ b/org.jacoco.core.test/src/org/jacoco/core/runtime/WildcardMatcherTest.java @@ -9,7 +9,7 @@ * Marc R. Hoffmann - initial API and implementation * *******************************************************************************/ -package org.jacoco.core.matcher; +package org.jacoco.core.runtime; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; 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 6b4fb0c5..cf575127 100644 --- a/org.jacoco.core/src/org/jacoco/core/runtime/AgentOptions.java +++ b/org.jacoco.core/src/org/jacoco/core/runtime/AgentOptions.java @@ -22,7 +22,6 @@ 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.core/src/org/jacoco/core/matcher/WildcardMatcher.java b/org.jacoco.core/src/org/jacoco/core/runtime/WildcardMatcher.java index 9e7bd871..221e6ea5 100644 --- a/org.jacoco.core/src/org/jacoco/core/matcher/WildcardMatcher.java +++ b/org.jacoco.core/src/org/jacoco/core/runtime/WildcardMatcher.java @@ -9,7 +9,7 @@ * Marc R. Hoffmann - initial API and implementation * *******************************************************************************/ -package org.jacoco.core.matcher; +package org.jacoco.core.runtime; import java.util.regex.Pattern; 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 acf90586..f34c6cdf 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.matcher.WildcardMatcher; +import org.jacoco.core.runtime.WildcardMatcher; /** * A rule applies for a certain element type and can define any number of limits |