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 14:59:19 UTC
[5/9] git commit: WICKET-4845 Make BasicResourceReferenceMapper
public so it is easy to extend it
WICKET-4845 Make BasicResourceReferenceMapper public so it is easy to extend it
Make pageParametersEncoder and cachingStrategy visible for specializations of this class
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/880718ce
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/880718ce
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/880718ce
Branch: refs/heads/wicket-1.5.x
Commit: 880718ce07b6306a2b106b3cca4497849358bc3d
Parents: bdf5c75
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Nov 2 15:41:38 2012 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Nov 2 15:41:38 2012 +0200
----------------------------------------------------------------------
.../mapper/BasicResourceReferenceMapper.java | 19 +++++++--------
1 files changed, 9 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/880718ce/wicket-core/src/main/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapper.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapper.java b/wicket-core/src/main/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapper.java
index 42a0420..3e798ad 100755
--- a/wicket-core/src/main/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapper.java
+++ b/wicket-core/src/main/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapper.java
@@ -25,14 +25,16 @@ import org.apache.wicket.request.Url;
import org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandler;
import org.apache.wicket.request.mapper.parameter.IPageParametersEncoder;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.wicket.request.resource.ResourceReferenceRegistry;
import org.apache.wicket.request.resource.IResource;
-import org.apache.wicket.request.resource.caching.IStaticCacheableResource;
import org.apache.wicket.request.resource.MetaInfStaticResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
+import org.apache.wicket.request.resource.ResourceReferenceRegistry;
import org.apache.wicket.request.resource.caching.IResourceCachingStrategy;
+import org.apache.wicket.request.resource.caching.IStaticCacheableResource;
import org.apache.wicket.request.resource.caching.ResourceUrl;
import org.apache.wicket.util.IProvider;
+import org.apache.wicket.util.lang.Args;
+import org.apache.wicket.util.lang.Checks;
import org.apache.wicket.util.lang.WicketObjects;
import org.apache.wicket.util.string.Strings;
import org.slf4j.Logger;
@@ -59,10 +61,10 @@ public class BasicResourceReferenceMapper extends AbstractResourceReferenceMappe
{
private static final Logger log = LoggerFactory.getLogger(BasicResourceReferenceMapper.class);
- private final IPageParametersEncoder pageParametersEncoder;
+ protected final IPageParametersEncoder pageParametersEncoder;
/** resource caching strategy */
- private final IProvider<? extends IResourceCachingStrategy> cachingStrategy;
+ protected final IProvider<? extends IResourceCachingStrategy> cachingStrategy;
/**
* Construct.
@@ -73,7 +75,7 @@ public class BasicResourceReferenceMapper extends AbstractResourceReferenceMappe
public BasicResourceReferenceMapper(IPageParametersEncoder pageParametersEncoder,
IProvider<? extends IResourceCachingStrategy> cachingStrategy)
{
- this.pageParametersEncoder = pageParametersEncoder;
+ this.pageParametersEncoder = Args.notNull(pageParametersEncoder, "pageParametersEncoder");
this.cachingStrategy = cachingStrategy;
}
@@ -141,7 +143,7 @@ public class BasicResourceReferenceMapper extends AbstractResourceReferenceMappe
return null;
}
- private IResourceCachingStrategy getCachingStrategy()
+ protected final IResourceCachingStrategy getCachingStrategy()
{
return cachingStrategy.get();
}
@@ -225,10 +227,7 @@ public class BasicResourceReferenceMapper extends AbstractResourceReferenceMappe
getCachingStrategy().decorateUrl(resourceUrl, cacheable);
token = resourceUrl.getFileName();
- if (Strings.isEmpty(token))
- {
- throw new IllegalStateException("caching strategy returned empty name for " + resource);
- }
+ Checks.notEmpty(token, "Caching strategy returned empty name for '%s'", resource);
}
}
segments.add(token);