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
[5/7] 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/b23f3572
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/b23f3572
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/b23f3572
Branch: refs/heads/master
Commit: b23f3572d7743589ac74f6a53450584710ce3a45
Parents: e9e0456
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 16:04:00 2012 +0200
----------------------------------------------------------------------
.../mapper/BasicResourceReferenceMapper.java | 18 +++++++-------
1 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/b23f3572/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 1ec32f4..c7fc0bc 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
@@ -31,11 +31,15 @@ import org.apache.wicket.request.resource.UrlResourceReference;
import org.apache.wicket.request.resource.IResource;
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.resource.bundles.ResourceBundleReference;
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;
import org.slf4j.LoggerFactory;
@@ -61,10 +65,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.
@@ -75,7 +79,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;
}
@@ -145,7 +149,7 @@ public class BasicResourceReferenceMapper extends AbstractResourceReferenceMappe
return null;
}
- private IResourceCachingStrategy getCachingStrategy()
+ protected final IResourceCachingStrategy getCachingStrategy()
{
return cachingStrategy.get();
}
@@ -246,11 +250,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);
}
}
}