[CIShell-SVN] SF.net SVN: cishell:[1130] trunk/core/org.cishell.utilities/src/org/cishell /utilities/StringUtilities.java

[<pat...@us...>]

Revision: 1130
          http://cishell.svn.sourceforge.net/cishell/?rev=1130&view=rev
Author:   pataphil
Date:     2010-08-27 15:23:24 +0000 (Fri, 27 Aug 2010)

Log Message:
-----------
* Escaping the separator string in StringUtilities.getAllTokens is now optional.

Modified Paths:
--------------
    trunk/core/org.cishell.utilities/src/org/cishell/utilities/StringUtilities.java

Modified: trunk/core/org.cishell.utilities/src/org/cishell/utilities/StringUtilities.java
===================================================================
--- trunk/core/org.cishell.utilities/src/org/cishell/utilities/StringUtilities.java	2010-08-26 17:58:18 UTC (rev 1129)
+++ trunk/core/org.cishell.utilities/src/org/cishell/utilities/StringUtilities.java	2010-08-27 15:23:24 UTC (rev 1130)
@@ -1,7 +1,6 @@
 package org.cishell.utilities;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
@@ -316,15 +315,25 @@
 	}
 
 	public static String getNthToken(
-			String originalString, String separator, int index, boolean trim) {
-		return getAllTokens(originalString, separator, trim)[index];
+			String originalString,
+			String separator,
+			int index,
+			boolean trim,
+			boolean escapeForRegularExpression) {
+		return getAllTokens(originalString, separator, trim, escapeForRegularExpression)[index];
 	}
 
 	public static String[] getAllTokens(
-			String originalString, String separator, boolean trim) {
-		String escapedSeparator = escapeForRegularExpression(separator);
-		String[] tokens = originalString.split(escapedSeparator);
+			String originalString,
+			String separator,
+			boolean trim,
+			boolean escapeForRegularExpression) {
+		if (escapeForRegularExpression) {
+			separator = escapeForRegularExpression(separator);
+		}
 
+		String[] tokens = originalString.split(separator);
+
 		if (trim) {
 			String[] trimmedTokens = new String[tokens.length];
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.