You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by sv...@apache.org on 2018/07/24 13:23:03 UTC
wicket git commit: Added an overrideable getFilename() method.
Repository: wicket
Updated Branches:
refs/heads/master 88533b187 -> 7f17cf9d6
Added an overrideable getFilename() method.
This closes #286
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/7f17cf9d
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/7f17cf9d
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/7f17cf9d
Branch: refs/heads/master
Commit: 7f17cf9d6287bdc4d3a846944187955ac2b84d12
Parents: 88533b1
Author: ageery <an...@windsorsolutions.com>
Authored: Mon Jul 23 11:39:55 2018 -0400
Committer: Sven Meier <sv...@apache.org>
Committed: Tue Jul 24 15:15:17 2018 +0200
----------------------------------------------------------------------
.../request/resource/BaseDataResource.java | 33 ++++++++++++++------
1 file changed, 23 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/7f17cf9d/wicket-core/src/main/java/org/apache/wicket/request/resource/BaseDataResource.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/resource/BaseDataResource.java b/wicket-core/src/main/java/org/apache/wicket/request/resource/BaseDataResource.java
index 45fbd32..eff98e4 100644
--- a/wicket-core/src/main/java/org/apache/wicket/request/resource/BaseDataResource.java
+++ b/wicket-core/src/main/java/org/apache/wicket/request/resource/BaseDataResource.java
@@ -24,10 +24,11 @@ import org.apache.wicket.request.Response;
import org.apache.wicket.util.time.Time;
/**
- * An abstract resource that can deliver static data - passed to the constructor,
- * or dynamic - returned by {@link #getData(org.apache.wicket.request.resource.IResource.Attributes)}
+ * An abstract resource that can deliver static data - passed to the constructor, or dynamic -
+ * returned by {@link #getData(org.apache.wicket.request.resource.IResource.Attributes)}
*
- * @param <T> The type of the data this resource can deliver
+ * @param <T>
+ * The type of the data this resource can deliver
*/
public abstract class BaseDataResource<T> extends AbstractResource
{
@@ -45,8 +46,8 @@ public abstract class BaseDataResource<T> extends AbstractResource
private final String filename;
/**
- * Creates a {@link org.apache.wicket.request.resource.BaseDataResource} which will
- * provide its data dynamically with
+ * Creates a {@link org.apache.wicket.request.resource.BaseDataResource} which will provide its
+ * data dynamically with
* {@link #getData(org.apache.wicket.request.resource.IResource.Attributes)}
*
* @param contentType
@@ -91,9 +92,9 @@ public abstract class BaseDataResource<T> extends AbstractResource
* Post-configures the given response, e.g. set/override response headers.
*
* @param response
- * The response to configure
+ * The response to configure
* @param attributes
- * The request attributes (web request, web response, parameters)
+ * The request attributes (web request, web response, parameters)
*/
protected void configureResponse(final ResourceResponse response, final Attributes attributes)
{
@@ -105,6 +106,7 @@ public abstract class BaseDataResource<T> extends AbstractResource
final ResourceResponse response = new ResourceResponse();
String contentType = this.contentType;
+ String filename = getFilename();
if (contentType == null)
{
@@ -165,16 +167,17 @@ public abstract class BaseDataResource<T> extends AbstractResource
/**
* Writes the given data to the response
+ *
* @param response
- * The response to write to
+ * The response to write to
* @param data
- * The data to write
+ * The data to write
*/
protected abstract void writeData(Response response, T data);
/**
* @param data
- * The data to be written
+ * The data to be written
* @return The length of the data to be written. Used to set "Content-Length" response header
*/
protected abstract Long getLength(T data);
@@ -191,4 +194,14 @@ public abstract class BaseDataResource<T> extends AbstractResource
{
return data;
}
+
+ /**
+ * Returns the filename that will be set as the Content-Disposition header.
+ *
+ * @return the filename
+ */
+ protected String getFilename()
+ {
+ return filename;
+ }
}