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/10/05 13:32:08 UTC
[1/3] git commit: WICKET-4804 Add #setStatus(int) in
AbstractResource.ResourceResponse
Updated Branches:
refs/heads/master 44783fe1c -> 4258d3a9f
WICKET-4804 Add #setStatus(int) in AbstractResource.ResourceResponse
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/4258d3a9
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/4258d3a9
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/4258d3a9
Branch: refs/heads/master
Commit: 4258d3a9f9b548f354329083cfa0118137ab655c
Parents: e8786a5
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Oct 5 14:31:26 2012 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Oct 5 14:31:26 2012 +0300
----------------------------------------------------------------------
.../wicket/request/resource/AbstractResource.java | 28 ++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/4258d3a9/wicket-core/src/main/java/org/apache/wicket/request/resource/AbstractResource.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/resource/AbstractResource.java b/wicket-core/src/main/java/org/apache/wicket/request/resource/AbstractResource.java
index b59c505..f91c61e 100644
--- a/wicket-core/src/main/java/org/apache/wicket/request/resource/AbstractResource.java
+++ b/wicket-core/src/main/java/org/apache/wicket/request/resource/AbstractResource.java
@@ -90,6 +90,7 @@ public abstract class AbstractResource implements IResource
public static class ResourceResponse
{
private Integer errorCode;
+ private Integer statusCode;
private String errorMessage;
private String fileName = null;
private ContentDisposition contentDisposition = ContentDisposition.INLINE;
@@ -152,6 +153,25 @@ public abstract class AbstractResource implements IResource
}
/**
+ * Sets the status code for resource.
+ *
+ * @param statusCode
+ * status code
+ */
+ public void setStatusCode(Integer statusCode)
+ {
+ this.statusCode = statusCode;
+ }
+
+ /**
+ * @return status code or <code>null</code>
+ */
+ public Integer getStatusCode()
+ {
+ return statusCode;
+ }
+
+ /**
* @return error message or <code>null</code>
*/
public String getErrorMessage()
@@ -492,7 +512,7 @@ public abstract class AbstractResource implements IResource
// set response header
setResponseHeaders(data, attributes);
- if (!data.dataNeedsToBeWritten(attributes) || data.getErrorCode() != null)
+ if (!data.dataNeedsToBeWritten(attributes) || data.getErrorCode() != null || data.getStatusCode() != null)
{
return;
}
@@ -566,6 +586,12 @@ public abstract class AbstractResource implements IResource
return;
}
+ if (data.getStatusCode() != null)
+ {
+ webResponse.setStatus(data.getStatusCode());
+ return;
+ }
+
String fileName = data.getFileName();
ContentDisposition disposition = data.getContentDisposition();
String mimeType = data.getContentType();