dfs 2004/09/02 11:14:40
Modified: src/java/org/apache/oro/text/java JavaMatcher.java
Log:
Adjusted imports and references to Pattern to avoid conflict with new
MatchResult interface in JDK 1.5.
Revision Changes Path
1.3 +12 -33 jakarta-oro/src/java/org/apache/oro/text/java/JavaMatcher.java
Index: JavaMatcher.java
===================================================================
RCS file: /home/cvs/jakarta-oro/src/java/org/apache/oro/text/java/JavaMatcher.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JavaMatcher.java 15 Jun 2004 05:39:54 -0000 1.2
+++ JavaMatcher.java 2 Sep 2004 18:14:40 -0000 1.3
@@ -20,7 +20,7 @@
package org.apache.oro.text.java;
import java.nio.*;
-import java.util.regex.*;
+import java.util.regex.Matcher;
import org.apache.oro.text.regex.*;
@@ -38,31 +38,22 @@
}
/** Currently throws an UnsupportedOperationException. */
- public boolean matchesPrefix(char[] input,
- org.apache.oro.text.regex.Pattern pattern,
- int offset)
- {
+ public boolean matchesPrefix(char[] input, Pattern pattern, int offset) {
throw new UnsupportedOperationException();
}
/** Currently throws an UnsupportedOperationException. */
- public boolean matchesPrefix(String input,
- org.apache.oro.text.regex.Pattern pattern)
- {
+ public boolean matchesPrefix(String input, Pattern pattern) {
throw new UnsupportedOperationException();
}
/** Currently throws an UnsupportedOperationException. */
- public boolean matchesPrefix(char[] input,
- org.apache.oro.text.regex.Pattern pattern)
- {
+ public boolean matchesPrefix(char[] input, Pattern pattern) {
throw new UnsupportedOperationException();
}
/** Currently throws an UnsupportedOperationException. */
- public boolean matchesPrefix(PatternMatcherInput input,
- org.apache.oro.text.regex.Pattern pattern)
- {
+ public boolean matchesPrefix(PatternMatcherInput input, Pattern pattern) {
throw new UnsupportedOperationException();
}
@@ -81,25 +72,19 @@
}
- public boolean matches(String input,
- org.apache.oro.text.regex.Pattern pattern)
- {
+ public boolean matches(String input, Pattern pattern) {
JavaPattern jp = (JavaPattern)pattern;
return __matches(jp._matcher(input));
}
- public boolean matches(char[] input,
- org.apache.oro.text.regex.Pattern pattern)
- {
+ public boolean matches(char[] input, Pattern pattern) {
JavaPattern jp = (JavaPattern)pattern;
return __matches(jp._matcher(CharBuffer.wrap(input)));
}
- public boolean matches(PatternMatcherInput input,
- org.apache.oro.text.regex.Pattern pattern)
- {
+ public boolean matches(PatternMatcherInput input, Pattern pattern) {
JavaPattern jp = (JavaPattern)pattern;
CharBuffer buffer =
CharBuffer.wrap(input.getBuffer(), input.getBeginOffset(),
@@ -125,25 +110,19 @@
// These wrappers are not the height of efficiency (java.util.regex.Matcher
// instances are not reused) because of the quirkiness of java.util.regex.
// Some time should be spent on improving their efficiency in the future.
- public boolean contains(String input,
- org.apache.oro.text.regex.Pattern pattern)
- {
+ public boolean contains(String input, Pattern pattern) {
JavaPattern jp = (JavaPattern)pattern;
return __contains(jp._matcher(input));
}
- public boolean contains(char[] input,
- org.apache.oro.text.regex.Pattern pattern)
- {
+ public boolean contains(char[] input, Pattern pattern) {
JavaPattern jp = (JavaPattern)pattern;
return __contains(jp._matcher(CharBuffer.wrap(input)));
}
- public boolean contains(PatternMatcherInput input,
- org.apache.oro.text.regex.Pattern pattern)
- {
+ public boolean contains(PatternMatcherInput input, Pattern pattern) {
JavaPattern jp = (JavaPattern)pattern;
CharBuffer buffer =
CharBuffer.wrap(input.getBuffer(), input.getCurrentOffset(),
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
