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 2014/02/06 11:25:13 UTC
[2/2] git commit: Use Args#notNull and thus simplify the method
Use Args#notNull and thus simplify the method
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/82999908
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/82999908
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/82999908
Branch: refs/heads/wicket-6.x
Commit: 82999908fa0f3ad412713825c4341be354b8f1cf
Parents: 7cc1913
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Feb 6 10:57:34 2014 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Feb 6 11:25:03 2014 +0100
----------------------------------------------------------------------
.../request/mapper/AbstractComponentMapper.java | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/82999908/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/AbstractComponentMapper.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/AbstractComponentMapper.java b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/AbstractComponentMapper.java
index f3e3770..b1480ee 100644
--- a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/AbstractComponentMapper.java
+++ b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/AbstractComponentMapper.java
@@ -83,24 +83,20 @@ public abstract class AbstractComponentMapper extends AbstractMapper implements
*/
protected PageComponentInfo getPageComponentInfo(final Url url)
{
- if (url == null)
- {
- throw new IllegalStateException("Argument 'url' may not be null.");
- }
- else
+ Args.notNull(url, "url");
+
+ for (QueryParameter queryParameter : url.getQueryParameters())
{
- for (QueryParameter queryParameter : url.getQueryParameters())
+ if (Strings.isEmpty(queryParameter.getValue()))
{
- if (Strings.isEmpty(queryParameter.getValue()))
+ PageComponentInfo pageComponentInfo = PageComponentInfo.parse(queryParameter.getName());
+ if (pageComponentInfo != null)
{
- PageComponentInfo pageComponentInfo = PageComponentInfo.parse(queryParameter.getName());
- if (pageComponentInfo != null)
- {
- return pageComponentInfo;
- }
+ return pageComponentInfo;
}
}
}
+
return null;
}