Group 0 will be the full match, the rest are the - * parenthesized subexpressions
. - */ - public Vector getGroups(String argument) throws BuildException { - return matcher.getGroups(argument); - } - - /** - * Does this regular expression match the input, given - * certain options - * @param input The string to check for a match - * @param options The list of options for the match. See the - * MATCH_ constants above. - */ - public boolean matches(String input, int options) throws BuildException { - return matcher.matches(input, options); - } - - /** - * Get the match groups from this regular expression. The return - * type of the elements is always String. - * @param input The string to check for a match - * @param options The list of options for the match. See the - * MATCH_ constants above. - */ - public Vector getGroups(String input, int options) throws BuildException { - return matcher.getGroups(input, options); - } - - /** - * Perform a substitution on the regular expression. - * @param input The string to substitute on - * @param argument The string which defines the substitution - * @param options The list of options for the match and replace. See the - * MATCH_ and REPLACE_ constants above. - * REPLACE_ constants will be ignored. - */ - public String substitute(String input, String argument, int options) - throws BuildException { - Vector v = matcher.getGroups(input, options); - - StringBuffer result = new StringBuffer(); - char[] to = argument.toCharArray(); - for (int i=0; iant.regexp.regexpimpl.
*
* @author Matthew Inger mattinger@mindless.com
+ * @version $Revision$
*/
public class RegexpFactory extends RegexpMatcherFactory
{
@@ -110,12 +111,21 @@ public class RegexpFactory extends RegexpMatcherFactory
throw new BuildException("No supported regular expression matcher found");
}
- protected Regexp createRegexpInstance(String classname) {
+ /**
+ * Wrapper over {@seee RegexpMatcherFactory#createInstance
+ * createInstance} that ensures that we are dealing with a Regexp
+ * implementation.
+ *
+ * @since 1.3
+ */
+ protected Regexp createRegexpInstance(String classname)
+ throws BuildException {
+
RegexpMatcher m = createInstance(classname);
if (m instanceof Regexp) {
return (Regexp) m;
} else {
- return new MatcherWrappedAsRegexp(m);
+ throw new BuildException(classname + " doesn't implement the Regexp interface");
}
}
diff --git a/src/testcases/org/apache/tools/ant/util/regexp/MatcherWrappedAsRegexpTest.java b/src/testcases/org/apache/tools/ant/util/regexp/MatcherWrappedAsRegexpTest.java
deleted file mode 100644
index 2508feb5e..000000000
--- a/src/testcases/org/apache/tools/ant/util/regexp/MatcherWrappedAsRegexpTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2001 The Apache Software Foundation. All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution, if
- * any, must include the following acknowlegement:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowlegement may appear in the software itself,
- * if and wherever such third-party acknowlegements normally appear.
- *
- * 4. The names "The Jakarta Project", "Ant", and "Apache Software
- * Foundation" must not be used to endorse or promote products derived
- * from this software without prior written permission. For written
- * permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache"
- * nor may "Apache" appear in their names without prior written
- * permission of the Apache Group.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation. For more
- * information on the Apache Software Foundation, please see
- *