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/01/27 16:06:43 UTC
git commit: WICKET-4267 Descendants of DynamicImageResource don't
pass PageParameters to rendering code
Updated Branches:
refs/heads/wicket-1.5.x 7ed9335c8 -> cb325505b
WICKET-4267
Descendants of DynamicImageResource don't pass PageParameters to rendering code
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/cb325505
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/cb325505
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/cb325505
Branch: refs/heads/wicket-1.5.x
Commit: cb325505b954204c00fca9f8560c4543fea42f11
Parents: 7ed9335
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Jan 27 17:06:37 2012 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Jan 27 17:06:37 2012 +0200
----------------------------------------------------------------------
.../html/image/resource/BlobImageResource.java | 21 ++++++++++++++-
.../image/resource/ThumbnailImageResource.java | 3 +-
2 files changed, 22 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/cb325505/wicket-core/src/main/java/org/apache/wicket/markup/html/image/resource/BlobImageResource.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/image/resource/BlobImageResource.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/image/resource/BlobImageResource.java
index 73116fc..c102717 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/image/resource/BlobImageResource.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/image/resource/BlobImageResource.java
@@ -63,7 +63,11 @@ public abstract class BlobImageResource extends DynamicImageResource
{
try
{
- Blob blob = getBlob();
+ Blob blob = getBlob(attributes);
+ if (blob == null)
+ {
+ blob = getBlob();
+ }
if (blob != null)
{
InputStream in = blob.getBinaryStream();
@@ -87,6 +91,21 @@ public abstract class BlobImageResource extends DynamicImageResource
* Gets the BLOB (Binary Large OBject) that holds the raw image data.
*
* @return the BLOB
+ * @deprecated Use #getBlob(Attributes) instead.
*/
+ @Deprecated
protected abstract Blob getBlob();
+
+
+ /**
+ * Gets the BLOB (Binary Large OBject) that holds the raw image data.
+ *
+ * @param attributes
+ * the current web attributes (request, response, parameters)
+ * @return the BLOB
+ */
+ protected Blob getBlob(Attributes attributes)
+ {
+ return null;
+ }
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/cb325505/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/image/resource/ThumbnailImageResource.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/image/resource/ThumbnailImageResource.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/image/resource/ThumbnailImageResource.java
index 7785046..329d800 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/image/resource/ThumbnailImageResource.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/image/resource/ThumbnailImageResource.java
@@ -110,7 +110,8 @@ public class ThumbnailImageResource extends DynamicImageResource
{
// read original image
ByteArrayResponse byteResponse = new ByteArrayResponse();
- Attributes dispatchAttributes = new Attributes(attributes.getRequest(), byteResponse);
+ Attributes dispatchAttributes = new Attributes(attributes.getRequest(), byteResponse,
+ attributes.getParameters());
unscaledImageResource.respond(dispatchAttributes);
is = new ByteArrayInputStream(byteResponse.getBytes());
originalImage = ImageIO.read(is);