diff options
| author | Marc R. Hoffmann <hoffmann@mountainminds.com> | 2012-02-02 21:24:39 +0000 |
|---|---|---|
| committer | Marc R. Hoffmann <hoffmann@mountainminds.com> | 2012-02-02 21:24:39 +0000 |
| commit | 91d87e36c322e55b4aeaef267abefc123309c642 (patch) | |
| tree | d265f2d8acc4d71b85a752a8a959772a7db9dd7d | |
| parent | 50bde49108e455f3902b961d8b820718664fe997 (diff) | |
| download | jacoco-91d87e36c322e55b4aeaef267abefc123309c642.tar.gz | |
Simplified implementation.
| -rw-r--r-- | org.jacoco.core/src/org/jacoco/core/runtime/WildcardMatcher.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/org.jacoco.core/src/org/jacoco/core/runtime/WildcardMatcher.java b/org.jacoco.core/src/org/jacoco/core/runtime/WildcardMatcher.java index 331d7cb8..9951d20b 100644 --- a/org.jacoco.core/src/org/jacoco/core/runtime/WildcardMatcher.java +++ b/org.jacoco.core/src/org/jacoco/core/runtime/WildcardMatcher.java @@ -11,7 +11,6 @@ *******************************************************************************/
package org.jacoco.core.runtime;
-import java.util.StringTokenizer;
import java.util.regex.Pattern;
/**
@@ -45,15 +44,16 @@ public class WildcardMatcher { private static CharSequence toRegex(final String expression) {
final StringBuilder regex = new StringBuilder(expression.length() * 2);
- final StringTokenizer st = new StringTokenizer(expression, "?*", true);
- while (st.hasMoreTokens()) {
- final String token = st.nextToken();
- if ("?".equals(token)) {
+ for (final char c : expression.toCharArray()) {
+ switch (c) {
+ case '?':
regex.append(".?");
- } else if ("*".equals(token)) {
+ break;
+ case '*':
regex.append(".*");
- } else {
- regex.append(Pattern.quote(token));
+ break;
+ default:
+ regex.append(Pattern.quote(String.valueOf(c)));
}
}
return regex;
|