commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bay...@apache.org
Subject svn commit: r907385 - /commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/StringUtils.java
Date Sun, 07 Feb 2010 07:10:14 GMT
Author: bayard
Date: Sun Feb  7 07:10:14 2010
New Revision: 907385

URL: http://svn.apache.org/viewvc?rev=907385&view=rev
Log:
Moving the indexOf(String, String, int) method above the ordinalIndexOf methods to put it
with its overloaded peers. LANG-590

Modified:
    commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/StringUtils.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=907385&r1=907384&r2=907385&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
Feb  7 07:10:14 2010
@@ -814,6 +814,44 @@
     }
 
     /**
+     * <p>Finds the first index within a String, handling <code>null</code>.
+     * This method uses {@link String#indexOf(String, int)}.</p>
+     *
+     * <p>A <code>null</code> String will return <code>-1</code>.
+     * A negative start position is treated as zero.
+     * An empty ("") search String always matches.
+     * A start position greater than the string length only matches
+     * an empty search String.</p>
+     *
+     * <pre>
+     * StringUtils.indexOf(null, *, *)          = -1
+     * StringUtils.indexOf(*, null, *)          = -1
+     * StringUtils.indexOf("", "", 0)           = 0
+     * StringUtils.indexOf("aabaabaa", "a", 0)  = 0
+     * StringUtils.indexOf("aabaabaa", "b", 0)  = 2
+     * StringUtils.indexOf("aabaabaa", "ab", 0) = 1
+     * StringUtils.indexOf("aabaabaa", "b", 3)  = 5
+     * StringUtils.indexOf("aabaabaa", "b", 9)  = -1
+     * StringUtils.indexOf("aabaabaa", "b", -1) = 2
+     * StringUtils.indexOf("aabaabaa", "", 2)   = 2
+     * StringUtils.indexOf("abc", "", 9)        = 3
+     * </pre>
+     *
+     * @param str  the String to check, may be null
+     * @param searchStr  the String to find, may be null
+     * @param startPos  the start position, negative treated as zero
+     * @return the first index of the search String,
+     *  -1 if no match or <code>null</code> string input
+     * @since 2.0
+     */
+    public static int indexOf(String str, String searchStr, int startPos) {
+        if (str == null || searchStr == null) {
+            return -1;
+        }
+        return str.indexOf(searchStr, startPos);
+    }
+
+    /**
      * <p>Finds the n-th index within a String, handling <code>null</code>.
      * This method uses {@link String#indexOf(String)}.</p>
      *
@@ -875,44 +913,6 @@
     }
 
     /**
-     * <p>Finds the first index within a String, handling <code>null</code>.
-     * This method uses {@link String#indexOf(String, int)}.</p>
-     *
-     * <p>A <code>null</code> String will return <code>-1</code>.
-     * A negative start position is treated as zero.
-     * An empty ("") search String always matches.
-     * A start position greater than the string length only matches
-     * an empty search String.</p>
-     *
-     * <pre>
-     * StringUtils.indexOf(null, *, *)          = -1
-     * StringUtils.indexOf(*, null, *)          = -1
-     * StringUtils.indexOf("", "", 0)           = 0
-     * StringUtils.indexOf("aabaabaa", "a", 0)  = 0
-     * StringUtils.indexOf("aabaabaa", "b", 0)  = 2
-     * StringUtils.indexOf("aabaabaa", "ab", 0) = 1
-     * StringUtils.indexOf("aabaabaa", "b", 3)  = 5
-     * StringUtils.indexOf("aabaabaa", "b", 9)  = -1
-     * StringUtils.indexOf("aabaabaa", "b", -1) = 2
-     * StringUtils.indexOf("aabaabaa", "", 2)   = 2
-     * StringUtils.indexOf("abc", "", 9)        = 3
-     * </pre>
-     *
-     * @param str  the String to check, may be null
-     * @param searchStr  the String to find, may be null
-     * @param startPos  the start position, negative treated as zero
-     * @return the first index of the search String,
-     *  -1 if no match or <code>null</code> string input
-     * @since 2.0
-     */
-    public static int indexOf(String str, String searchStr, int startPos) {
-        if (str == null || searchStr == null) {
-            return -1;
-        }
-        return str.indexOf(searchStr, startPos);
-    }
-
-    /**
      * <p>Case in-sensitive find of the first index within a String.</p>
      *
      * <p>A <code>null</code> String will return <code>-1</code>.



Mime
View raw message