You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2012/02/28 13:57:00 UTC
git commit: WICKET-4434 Replace all String.split(char) with Wicket's
Strings.split(String, char) for better performance
Updated Branches:
refs/heads/master 73307ccce -> 90faa5a36
WICKET-4434 Replace all String.split(char) with Wicket's Strings.split(String, char) for better performance
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/90faa5a3
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/90faa5a3
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/90faa5a3
Branch: refs/heads/master
Commit: 90faa5a363d6d4294e8c721bf930c18c94b4d61d
Parents: 73307cc
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Feb 28 14:52:49 2012 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Feb 28 14:56:48 2012 +0200
----------------------------------------------------------------------
.../org/apache/wicket/markup/html/form/Form.java | 3 ++-
.../parser/filter/WicketMessageTagHandler.java | 2 +-
.../apache/wicket/protocol/http/RequestUtils.java | 3 ++-
.../documentvalidation/HtmlDocumentParser.java | 4 ++--
.../protocol/http/mock/MockHttpServletRequest.java | 4 ++--
.../protocol/http/mock/MockServletContext.java | 3 ++-
.../protocol/http/request/WebClientInfo.java | 3 ++-
.../html/form/palette/component/Recorder.java | 2 +-
8 files changed, 14 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/90faa5a3/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java
index df2fcea..f1ef050 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java
@@ -1575,7 +1575,8 @@ public class Form<T> extends WebMarkupContainer implements IFormSubmitListener
{
String url = getActionUrl().toString();
int i = url.indexOf('?');
- String[] params = ((i > -1) ? url.substring(i + 1) : url).split("&");
+ String queryString = (i > -1) ? url.substring(i + 1) : url;
+ String[] params = Strings.split(queryString, '&');
writeParamsAsHiddenFields(params, buffer);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/90faa5a3/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/WicketMessageTagHandler.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/WicketMessageTagHandler.java b/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/WicketMessageTagHandler.java
index 38f2004..acda0a6 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/WicketMessageTagHandler.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/WicketMessageTagHandler.java
@@ -126,7 +126,7 @@ public final class WicketMessageTagHandler extends AbstractMarkupFilter
{
expr = expr.trim();
- String[] attrsAndKeys = expr.split(",");
+ String[] attrsAndKeys = Strings.split(expr, ',');
for (String attrAndKey : attrsAndKeys)
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/90faa5a3/wicket-core/src/main/java/org/apache/wicket/protocol/http/RequestUtils.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/RequestUtils.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/RequestUtils.java
index 3991287..c7147ed 100644
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/RequestUtils.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/RequestUtils.java
@@ -70,7 +70,8 @@ public final class RequestUtils
*/
public static String removeDoubleDots(String path)
{
- List<String> newcomponents = new ArrayList<String>(Arrays.asList(path.split("/")));
+ String[] segments = Strings.split(path, '/');
+ List<String> newcomponents = new ArrayList<String>(Arrays.asList(segments));
for (int i = 0; i < newcomponents.size(); i++)
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/90faa5a3/wicket-core/src/main/java/org/apache/wicket/protocol/http/documentvalidation/HtmlDocumentParser.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/documentvalidation/HtmlDocumentParser.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/documentvalidation/HtmlDocumentParser.java
index c5c6b11..d7e1c75 100644
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/documentvalidation/HtmlDocumentParser.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/documentvalidation/HtmlDocumentParser.java
@@ -159,10 +159,10 @@ public class HtmlDocumentParser
Map<String, String> m = new HashMap<String, String>();
attributeString = Strings.replaceAll(attributeString.trim(), "\t", " ").toString();
attributeString = Strings.replaceAll(attributeString, " = ", "=").toString();
- String[] attributeElements = attributeString.split(" ");
+ String[] attributeElements = Strings.split(attributeString, ' ');
for (String attributeElement : attributeElements)
{
- String[] bits = attributeElement.split("=");
+ String[] bits = Strings.split(attributeElement, '=');
if (bits.length == 1)
{
m.put(bits[0].trim().toLowerCase(), "");
http://git-wip-us.apache.org/repos/asf/wicket/blob/90faa5a3/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.java
index 1ab95a0..3c8ec51 100755
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.java
@@ -604,7 +604,7 @@ public class MockHttpServletRequest implements HttpServletRequest
*/
private Locale getLocale(final String value)
{
- final String[] bits = value.split("-");
+ final String[] bits = Strings.split(value, '-');
if (bits.length < 1)
{
return null;
@@ -634,7 +634,7 @@ public class MockHttpServletRequest implements HttpServletRequest
final String header = getHeader("Accept-Language");
if (header != null)
{
- final String[] locales = header.split(",");
+ final String[] locales = Strings.split(header, ',');
for (String value : locales)
{
Locale locale = getLocale(value);
http://git-wip-us.apache.org/repos/asf/wicket/blob/90faa5a3/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockServletContext.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockServletContext.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockServletContext.java
index 5c7a2d7..bb18416 100755
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockServletContext.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockServletContext.java
@@ -36,6 +36,7 @@ import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import org.apache.wicket.Application;
+import org.apache.wicket.util.string.Strings;
import org.apache.wicket.util.value.ValueMap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -419,7 +420,7 @@ public class MockServletContext implements ServletContext
}
else
{
- elements = name.split("/");
+ elements = Strings.split(name, '/');
}
File current = webappRoot;
http://git-wip-us.apache.org/repos/asf/wicket/blob/90faa5a3/wicket-core/src/main/java/org/apache/wicket/protocol/http/request/WebClientInfo.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/request/WebClientInfo.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/request/WebClientInfo.java
index 5944ed7..4fc752d 100644
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/request/WebClientInfo.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/request/WebClientInfo.java
@@ -26,6 +26,7 @@ import org.apache.wicket.protocol.http.ClientProperties;
import org.apache.wicket.protocol.http.servlet.ServletWebRequest;
import org.apache.wicket.request.ClientInfo;
import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.util.string.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -140,7 +141,7 @@ public class WebClientInfo extends ClientInfo
{
// sometimes the header is of form client ip,proxy 1 ip,proxy 2 ip,...,proxy n ip,
// we just want the client
- remoteAddr = remoteAddr.split(",")[0].trim();
+ remoteAddr = Strings.split(remoteAddr, ',')[0].trim();
}
}
return remoteAddr;
http://git-wip-us.apache.org/repos/asf/wicket/blob/90faa5a3/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/Recorder.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/Recorder.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/Recorder.java
index 03d33df..e02c2eb 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/Recorder.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/Recorder.java
@@ -225,7 +225,7 @@ public class Recorder<T> extends HiddenField<Object>
}
else
{
- ids = value.split(",");
+ ids = Strings.split(value, ',');
}
}