Use String.split()

3 files changed, 4 insertions, 29 deletions

diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/TocData.java b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/TocData.java
index 0a203becf..f0da2c7f0 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/TocData.java
+++ b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/TocData.java
@@ -17,7 +17,6 @@ import javax.servlet.http.*;
 import org.eclipse.help.*;
 import org.eclipse.help.internal.*;
 import org.eclipse.help.internal.toc.*;
-import org.eclipse.help.internal.webapp.servlet.*;
 
 /**
  * Helper class for tocView.jsp initialization
@@ -75,8 +74,7 @@ public class TocData extends RequestData {
 		// initialize rootPath
 		String pathStr = request.getParameter("path");
 		if (pathStr != null && pathStr.length() > 0) {
-			// TODO use Java 1.4 API to do this
-			String[] paths = CookieUtil.split(pathStr, '_');
+			String[] paths = pathStr.split("_", -1);
 			int[] indexes = new int[paths.length];
 			boolean indexesOK = true;
 			for (int i = 0; i < paths.length; i++) {
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/CookieUtil.java b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/CookieUtil.java
index 9d6a69260..c5467e05e 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/CookieUtil.java
+++ b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/CookieUtil.java
@@ -11,7 +11,6 @@
 package org.eclipse.help.internal.webapp.servlet;
 
 import java.io.*;
-import java.util.*;
 
 import javax.servlet.http.*;
 
@@ -148,8 +147,7 @@ public class CookieUtil {
 			// no cookie
 			return null;
 		}
-		//String lengthAndSubstring1[] = value1.split("<");
-		String lengthAndSubstring1[] = CookieUtil.split(value1, '<');
+		String lengthAndSubstring1[] = value1.split("<");
 		if (lengthAndSubstring1.length < 2) {
 			return null;
 		}
@@ -187,23 +185,4 @@ public class CookieUtil {
 
 		return data.toString();
 	}
-	/**
-	 * Splits string around given character
-	 * @param s String
-	 * @param c separator
-	 * @return String[]
-	 */
-	public static String[] split(String s, char c) {
-		// TODO Delete this method as soon as not need to support Java 1.3
-		ArrayList fragments = new ArrayList();
-		int i = s.indexOf(c);
-		while (i >= 0) {
-			fragments.add(s.substring(0, i));
-			s = s.substring(i + 1);
-			i = s.indexOf(c);
-		}
-		fragments.add(s);
-		return (String[]) fragments.toArray(new String[fragments.size()]);
-	}
-
 }
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/InfocenterWorkingSetManager.java b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/InfocenterWorkingSetManager.java
index ef2caa252..e5d408c4e 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/InfocenterWorkingSetManager.java
+++ b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/InfocenterWorkingSetManager.java
@@ -123,16 +123,14 @@ public class InfocenterWorkingSetManager implements IHelpWorkingSetManager {
 			return;
 		}
 
-		//String[] values = data.split("\\|", -1);
-		String[] values = CookieUtil.split(data, '|');
+		String[] values = data.split("\\|", -1);
 		if (values.length < 1) {
 			return;
 		}
 		currentWorkingSet = URLCoder.decode(values[0] /*, "UTF8"*/
 		);
 		i : for (int i = 1; i < values.length; i++) {
-			//String[] nameAndHrefs = values[i].split("&", -1);
-			String[] nameAndHrefs = CookieUtil.split(values[i], '&');
+			String[] nameAndHrefs = values[i].split("&", -1);
 
 			String name = URLCoder.decode(nameAndHrefs[0] /*, "UTF8"*/
 			);