Return-Path:
Delivered-To: apmail-commons-commits-archive@minotaur.apache.org
Received: (qmail 43553 invoked from network); 7 Nov 2010 07:15:48 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
by 140.211.11.9 with SMTP; 7 Nov 2010 07:15:48 -0000
Received: (qmail 2405 invoked by uid 500); 7 Nov 2010 07:16:19 -0000
Delivered-To: apmail-commons-commits-archive@commons.apache.org
Received: (qmail 2102 invoked by uid 500); 7 Nov 2010 07:16:16 -0000
Mailing-List: contact commits-help@commons.apache.org; run by ezmlm
Precedence: bulk
List-Help:
List-Unsubscribe:
List-Post:
List-Id:
Reply-To: dev@commons.apache.org
Delivered-To: mailing list commits@commons.apache.org
Received: (qmail 2095 invoked by uid 99); 7 Nov 2010 07:16:15 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 07 Nov 2010 07:16:15 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 07 Nov 2010 07:16:14 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
id B404623889E7; Sun, 7 Nov 2010 07:15:00 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1032220 - in /commons/proper/lang/trunk/src:
main/java/org/apache/commons/lang3/StringUtils.java
test/java/org/apache/commons/lang3/StringUtilsEqualsIndexOfTest.java
Date: Sun, 07 Nov 2010 07:15:00 -0000
To: commits@commons.apache.org
From: bayard@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20101107071500.B404623889E7@eris.apache.org>
Author: bayard
Date: Sun Nov 7 07:15:00 2010
New Revision: 1032220
URL: http://svn.apache.org/viewvc?rev=1032220&view=rev
Log:
Fixing the javadoc for indexOfAnyBut(CharSequence, char[]) per Dirk Starke's report
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/StringUtils.java
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/StringUtilsEqualsIndexOfTest.java
Modified: commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/StringUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/StringUtils.java?rev=1032220&r1=1032219&r2=1032220&view=diff
==============================================================================
--- commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/StringUtils.java (original)
+++ commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/StringUtils.java Sun Nov 7 07:15:00 2010
@@ -1555,13 +1555,14 @@ public class StringUtils {
* A null
or zero length search array will return -1
.
*
*
- * StringUtils.indexOfAnyBut(null, *) = -1
- * StringUtils.indexOfAnyBut("", *) = -1
- * StringUtils.indexOfAnyBut(*, null) = -1
- * StringUtils.indexOfAnyBut(*, []) = -1
- * StringUtils.indexOfAnyBut("zzabyycdxx",'za') = 3
- * StringUtils.indexOfAnyBut("zzabyycdxx", '') = 0
- * StringUtils.indexOfAnyBut("aba", 'ab') = -1
+ * StringUtils.indexOfAnyBut(null, *) = -1
+ * StringUtils.indexOfAnyBut("", *) = -1
+ * StringUtils.indexOfAnyBut(*, null) = -1
+ * StringUtils.indexOfAnyBut(*, []) = -1
+ * StringUtils.indexOfAnyBut("zzabyycdxx", new char[] {'z', 'a'} ) = 3
+ * StringUtils.indexOfAnyBut("aba", new char[] {'z'} ) = 0
+ * StringUtils.indexOfAnyBut("aba", new char[] {'a', 'b'} ) = -1
+
*
*
* @param cs the CharSequence to check, may be null
Modified: commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/StringUtilsEqualsIndexOfTest.java
URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/StringUtilsEqualsIndexOfTest.java?rev=1032220&r1=1032219&r2=1032220&view=diff
==============================================================================
--- commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/StringUtilsEqualsIndexOfTest.java (original)
+++ commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/StringUtilsEqualsIndexOfTest.java Sun Nov 7 07:15:00 2010
@@ -596,7 +596,9 @@ public class StringUtilsEqualsIndexOfTes
assertEquals(-1, StringUtils.indexOfAnyBut("zzabyycdxx", new char[0]));
assertEquals(3, StringUtils.indexOfAnyBut("zzabyycdxx", new char[] {'z','a'}));
assertEquals(0, StringUtils.indexOfAnyBut("zzabyycdxx", new char[] {'b','y'}));
- assertEquals(0, StringUtils.indexOfAnyBut("ab", new char[] {'z'}));
+ assertEquals(-1, StringUtils.indexOfAnyBut("aba", new char[] {'a', 'b'}));
+ assertEquals(0, StringUtils.indexOfAnyBut("aba", new char[] {'z'}));
+
}
public void testIndexOfAnyBut_StringCharArrayWithSupplementaryChars() {