Repository: wicket Updated Branches: refs/heads/master 89b1cb163 -> 3734a1a0b
[WICKET-6355] It is now possible to set fileName to FileSystemResource Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/71d5be39 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/71d5be39 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/71d5be39 Branch: refs/heads/master Commit: 71d5be39df87875d3550a05f44df8ba3e6659036 Parents: 89b1cb1 Author: Maxim Solodovnik <[email protected]> Authored: Wed Apr 12 15:44:16 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Wed Apr 12 15:44:16 2017 +0700 ---------------------------------------------------------------------- .../java/org/apache/wicket/resource/FileSystemResource.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/71d5be39/wicket-core/src/main/java/org/apache/wicket/resource/FileSystemResource.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/resource/FileSystemResource.java b/wicket-core/src/main/java/org/apache/wicket/resource/FileSystemResource.java index b4b270e..77268ad 100644 --- a/wicket-core/src/main/java/org/apache/wicket/resource/FileSystemResource.java +++ b/wicket-core/src/main/java/org/apache/wicket/resource/FileSystemResource.java @@ -68,7 +68,7 @@ public class FileSystemResource extends AbstractResource @Override protected ResourceResponse newResourceResponse(Attributes attributes) { - return createResourceResponse(path); + return createResourceResponse(path, null); } /** @@ -76,9 +76,11 @@ public class FileSystemResource extends AbstractResource * * @param path * the path to create the resource response with + * @param fileName + * fileName to set, path.getFileName() will be used in case null passed * @return the actual resource response x */ - protected ResourceResponse createResourceResponse(Path path) + protected ResourceResponse createResourceResponse(Path path, String fileName) { try { @@ -93,6 +95,7 @@ public class FileSystemResource extends AbstractResource resourceResponse.setContentType(getMimeType()); resourceResponse.setAcceptRange(ContentRangeType.BYTES); resourceResponse.setContentLength(size); + resourceResponse.setFileName(fileName == null ? path.getFileName().toString() : fileName); RequestCycle cycle = RequestCycle.get(); Long startbyte = cycle.getMetaData(CONTENT_RANGE_STARTBYTE); Long endbyte = cycle.getMetaData(CONTENT_RANGE_ENDBYTE);
