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/27 14:06:32 UTC
git commit: Use Wicket's Strings.split() because it is much faster
than String.split() which is Regex based
Updated Branches:
refs/heads/master b2e7f3bfb -> 5e731a60e
Use Wicket's Strings.split() because it is much faster than String.split() which is Regex based
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/5e731a60
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/5e731a60
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/5e731a60
Branch: refs/heads/master
Commit: 5e731a60e7536f2165a7b0ff3814ddcabaa29e4e
Parents: b2e7f3b
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Feb 27 15:06:13 2012 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Feb 27 15:06:13 2012 +0200
----------------------------------------------------------------------
.../resource/MetaInfStaticResourceReference.java | 6 ++++--
.../locator/ExtensionResourceNameIterator.java | 4 ----
.../resource/locator/ResourceNameIterator.java | 3 ++-
3 files changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/5e731a60/wicket-core/src/main/java/org/apache/wicket/request/resource/MetaInfStaticResourceReference.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/resource/MetaInfStaticResourceReference.java b/wicket-core/src/main/java/org/apache/wicket/request/resource/MetaInfStaticResourceReference.java
index 6277bc1..8ab487b 100644
--- a/wicket-core/src/main/java/org/apache/wicket/request/resource/MetaInfStaticResourceReference.java
+++ b/wicket-core/src/main/java/org/apache/wicket/request/resource/MetaInfStaticResourceReference.java
@@ -22,6 +22,7 @@ import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.Url;
import org.apache.wicket.util.lang.Packages;
+import org.apache.wicket.util.string.Strings;
/**
* Resource reference for static files. The resource must reside under the "/META-INF/resources/"
@@ -76,13 +77,14 @@ public class MetaInfStaticResourceReference extends PackageResourceReference
List<String> segments = url.getSegments();
- String[] parts = Packages.extractPackageName(getScope()).split("\\.");
+ String packageName = Packages.extractPackageName(getScope());
+ String[] parts = Strings.split(packageName, '.');
for (String p : parts)
{
segments.add(p);
}
- parts = getName().split("/");
+ parts = Strings.split(getName(), '/');
for (String p : parts)
{
segments.add(p);
http://git-wip-us.apache.org/repos/asf/wicket/blob/5e731a60/wicket-core/src/main/java/org/apache/wicket/util/resource/locator/ExtensionResourceNameIterator.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/util/resource/locator/ExtensionResourceNameIterator.java b/wicket-core/src/main/java/org/apache/wicket/util/resource/locator/ExtensionResourceNameIterator.java
index d698447..a697749 100644
--- a/wicket-core/src/main/java/org/apache/wicket/util/resource/locator/ExtensionResourceNameIterator.java
+++ b/wicket-core/src/main/java/org/apache/wicket/util/resource/locator/ExtensionResourceNameIterator.java
@@ -85,10 +85,6 @@ public class ExtensionResourceNameIterator implements Iterator<String>
return ext;
}
- /**
- * Noop.
- *
- */
@Override
public void remove()
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/5e731a60/wicket-core/src/main/java/org/apache/wicket/util/resource/locator/ResourceNameIterator.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/util/resource/locator/ResourceNameIterator.java b/wicket-core/src/main/java/org/apache/wicket/util/resource/locator/ResourceNameIterator.java
index 6b09f5b..06128bb 100644
--- a/wicket-core/src/main/java/org/apache/wicket/util/resource/locator/ResourceNameIterator.java
+++ b/wicket-core/src/main/java/org/apache/wicket/util/resource/locator/ResourceNameIterator.java
@@ -93,7 +93,8 @@ public class ResourceNameIterator implements Iterator<String>
if (noext && (path != null) && (path.indexOf('.') != -1))
{
- this.extensions = Arrays.asList(Strings.afterLast(path, '.').split(","));
+ String[] extns = Strings.split(Strings.afterLast(path, '.'), ',');
+ this.extensions = Arrays.asList(extns);
this.path = Strings.beforeLast(path, '.');
}
else