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/11/02 15:06:58 UTC
[6/7] git commit: WICKET-4845 Make BasicResourceReferenceMapper
public to make it easier to extend it
WICKET-4845 Make BasicResourceReferenceMapper public to make it easier to extend it
No need to extract the page parameters before checking whether this is a request that can be handled by this request mapper
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/e9e0456d
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/e9e0456d
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/e9e0456d
Branch: refs/heads/master
Commit: e9e0456d4583af7de1b755d3759ff8c0e8354b62
Parents: abd6343
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Oct 30 15:17:43 2012 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Nov 2 16:02:09 2012 +0200
----------------------------------------------------------------------
.../mapper/BasicResourceReferenceMapper.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/e9e0456d/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BasicResourceReferenceMapper.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BasicResourceReferenceMapper.java b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BasicResourceReferenceMapper.java
index 40c7c6f..1ec32f4 100755
--- a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BasicResourceReferenceMapper.java
+++ b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BasicResourceReferenceMapper.java
@@ -84,13 +84,13 @@ public class BasicResourceReferenceMapper extends AbstractResourceReferenceMappe
{
Url url = request.getUrl();
- // extract the PageParameters from URL if there are any
- PageParameters pageParameters = extractPageParameters(request, url.getSegments().size(),
- pageParametersEncoder);
-
if (url.getSegments().size() >= 4 &&
urlStartsWith(url, getContext().getNamespace(), getContext().getResourceIdentifier()))
{
+ // extract the PageParameters from URL if there are any
+ PageParameters pageParameters = extractPageParameters(request, url.getSegments().size(),
+ pageParametersEncoder);
+
String className = url.getSegments().get(2);
StringBuilder name = new StringBuilder();
int segmentsSize = url.getSegments().size();