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 2013/06/27 13:28:10 UTC
git commit: WICKET-5256 Allow configuring the resource used by
ResourceStreamRequestHandler
Updated Branches:
refs/heads/master 8076947db -> 0d134f5bf
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/0d134f5b
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/0d134f5b
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/0d134f5b
Branch: refs/heads/master
Commit: 0d134f5bf7a9b0dba3823ad8b16af28e2b0505d8
Parents: 8076947
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Jun 27 14:27:01 2013 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Jun 27 14:27:01 2013 +0300
----------------------------------------------------------------------
.../resource/ResourceStreamRequestHandler.java | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/0d134f5b/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