Updated Branches: refs/heads/wicket-6.x 8a4a367f6 -> f040afaa7
WICKET-5256 Allow configuring the resource used by ResourceStreamRequestHandler Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/f040afaa Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/f040afaa Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/f040afaa Branch: refs/heads/wicket-6.x Commit: f040afaa714fb7f5d654773fe88bc1d3e714c030 Parents: 8a4a367 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Thu Jun 27 14:27:01 2013 +0300 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Thu Jun 27 14:28:32 2013 +0300 ---------------------------------------------------------------------- .../resource/ResourceStreamRequestHandler.java | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/f040afaa/wicket-core/src/main/java/org/apache/wicket/request/handler/resource/ResourceStreamRequestHandler.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/request/handler/resource/ResourceStreamRequestHandler.java b/wicket-core/src/main/java/org/apache/wicket/request/handler/resource/ResourceStreamRequestHandler.java index 52ab80c..e710c19 100644 --- a/wicket-core/src/main/java/org/apache/wicket/request/handler/resource/ResourceStreamRequestHandler.java +++ b/wicket-core/src/main/java/org/apache/wicket/request/handler/resource/ResourceStreamRequestHandler.java @@ -16,10 +16,10 @@ */ package org.apache.wicket.request.handler.resource; +import org.apache.wicket.core.request.handler.logger.ResourceStreamLogData; import org.apache.wicket.request.ILoggableRequestHandler; import org.apache.wicket.request.IRequestCycle; import org.apache.wicket.request.IRequestHandler; -import org.apache.wicket.core.request.handler.logger.ResourceStreamLogData; import org.apache.wicket.request.resource.ContentDisposition; import org.apache.wicket.request.resource.IResource.Attributes; import org.apache.wicket.request.resource.ResourceStreamResource; @@ -133,6 +133,20 @@ public class ResourceStreamRequestHandler implements IRequestHandler, ILoggableR requestCycle.getResponse()); ResourceStreamResource resource = new ResourceStreamResource(resourceStream); + + configure(resource); + + resource.respond(attributes); + } + + /** + * Configures the ResourceStreamResource used by this request handler + * + * @param resource + * the resource to configure + */ + protected void configure(ResourceStreamResource resource) + { resource.setFileName(fileName); if (contentDisposition != null) { @@ -141,7 +155,7 @@ public class ResourceStreamRequestHandler implements IRequestHandler, ILoggableR else { resource.setContentDisposition(Strings.isEmpty(fileName) ? ContentDisposition.INLINE - : ContentDisposition.ATTACHMENT); + : ContentDisposition.ATTACHMENT); } final Duration cacheDuration = getCacheDuration(); @@ -149,8 +163,6 @@ public class ResourceStreamRequestHandler implements IRequestHandler, ILoggableR { resource.setCacheDuration(cacheDuration); } - - resource.respond(attributes); } @Override
