Updated Branches: refs/heads/wicket-1.5.x 59fd045fb -> 864f0038a
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/864f0038 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/864f0038 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/864f0038 Branch: refs/heads/wicket-1.5.x Commit: 864f0038ab46633eb26fc9a6e9b60838092f55e8 Parents: 59fd045 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Fri Oct 5 14:31:26 2012 +0300 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Fri Oct 5 14:32:10 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/864f0038/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 9fdf1f1..df883ce 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() @@ -484,7 +504,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; } @@ -551,6 +571,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();
