Return-Path: Delivered-To: apmail-jakarta-oro-dev-archive@www.apache.org Received: (qmail 34551 invoked from network); 15 Jun 2004 05:39:58 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 15 Jun 2004 05:39:58 -0000 Received: (qmail 20249 invoked by uid 500); 15 Jun 2004 05:40:23 -0000 Delivered-To: apmail-jakarta-oro-dev-archive@jakarta.apache.org Received: (qmail 20225 invoked by uid 500); 15 Jun 2004 05:40:22 -0000 Mailing-List: contact oro-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "ORO Developers List" Reply-To: "ORO Developers List" Delivered-To: mailing list oro-dev@jakarta.apache.org Received: (qmail 20196 invoked by uid 500); 15 Jun 2004 05:40:22 -0000 Received: (qmail 20185 invoked by uid 99); 15 Jun 2004 05:40:21 -0000 Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.27.1) with SMTP; Mon, 14 Jun 2004 22:40:21 -0700 Received: (qmail 34513 invoked by uid 1170); 15 Jun 2004 05:39:54 -0000 Date: 15 Jun 2004 05:39:54 -0000 Message-ID: <20040615053954.34512.qmail@minotaur.apache.org> From: dfs@apache.org To: jakarta-oro-cvs@apache.org Subject: cvs commit: jakarta-oro/src/java/org/apache/oro/text/java JavaMatcher.java X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N dfs 2004/06/14 22:39:54 Modified: src/java/org/apache/oro/text/java JavaMatcher.java Log: Implemented matches methods according to contract defined in PatternMatcher. Revision Changes Path 1.2 +27 -7 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.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- JavaMatcher.java 15 Jun 2004 02:46:00 -0000 1.1 +++ JavaMatcher.java 15 Jun 2004 05:39:54 -0000 1.2 @@ -66,26 +66,46 @@ throw new UnsupportedOperationException(); } - /** Currently throws an UnsupportedOperationException. */ + + private boolean __matches(Matcher matcher) { + boolean matched; + + matched = matcher.matches(); + + if(matched) + __matcher = matcher; + else + __matcher = null; + + return matched; + } + + public boolean matches(String input, org.apache.oro.text.regex.Pattern pattern) { - throw new UnsupportedOperationException(); + JavaPattern jp = (JavaPattern)pattern; + return __matches(jp._matcher(input)); } - /** Currently throws an UnsupportedOperationException. */ + public boolean matches(char[] input, org.apache.oro.text.regex.Pattern pattern) { - throw new UnsupportedOperationException(); + JavaPattern jp = (JavaPattern)pattern; + return __matches(jp._matcher(CharBuffer.wrap(input))); } - /** Currently throws an UnsupportedOperationException. */ public boolean matches(PatternMatcherInput input, org.apache.oro.text.regex.Pattern pattern) { - throw new UnsupportedOperationException(); + JavaPattern jp = (JavaPattern)pattern; + CharBuffer buffer = + CharBuffer.wrap(input.getBuffer(), input.getBeginOffset(), + input.getEndOffset()); + Matcher matcher = jp._matcher(buffer); + return __matches(matcher); } --------------------------------------------------------------------- To unsubscribe, e-mail: oro-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: oro-dev-help@jakarta.apache.org