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 2015/02/01 13:11:53 UTC
wicket git commit: WICKET-5801 Revert the existence of
Image#setImageResourceReference(ResourceReference)
Repository: wicket
Updated Branches:
refs/heads/master 5f1a81676 -> 73c6f52b9
WICKET-5801 Revert the existence of Image#setImageResourceReference(ResourceReference)
Swap the order of the parameters in #setImageResourceReference(PageParameters, ResourceReference) to #setImageResourceReference(ResourceReference, PageParameters). There is no need of API break here.
The new #setImageResourceReferences(PageParameters, ResourceReference...) needs to have this signature because varargs have to be the last argument
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/73c6f52b
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/73c6f52b
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/73c6f52b
Branch: refs/heads/master
Commit: 73c6f52b90f570c6401ee479f8463b13e541aa6a
Parents: 5f1a816
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sun Feb 1 14:09:09 2015 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sun Feb 1 14:11:47 2015 +0200
----------------------------------------------------------------------
.../org/apache/wicket/markup/html/image/Image.java | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/73c6f52b/wicket-core/src/main/java/org/apache/wicket/markup/html/image/Image.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/image/Image.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/image/Image.java
index 6c650cb..fdf1f76 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/image/Image.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/image/Image.java
@@ -77,7 +77,7 @@ public class Image extends WebComponent implements IResourceListener
/** The image resource this image component references (src attribute) */
private final LocalizedImageResource localizedImageResource = new LocalizedImageResource(this);
- /** The image resources this image component references (srcset attribute) */
+ /** The extra image resources this image component references (srcset attribute) */
private final List<LocalizedImageResource> localizedImageResources = new ArrayList<>();
/** The x values to be used within the srcset */
@@ -148,7 +148,7 @@ public class Image extends WebComponent implements IResourceListener
PageParameters resourceParameters, final ResourceReference... resourceReferences)
{
super(id);
- setImageResourceReference(resourceParameters, resourceReference);
+ setImageResourceReference(resourceReference, resourceParameters);
setImageResourceReferences(resourceParameters, resourceReferences);
}
@@ -237,10 +237,18 @@ public class Image extends WebComponent implements IResourceListener
/**
* @param resourceReference
+ * The shared ImageResource to set.
+ */
+ public void setImageResourceReference(final ResourceReference resourceReference)
+ {
+ setImageResourceReference(resourceReference, null);
+ }
+
+ /**
+ * @param resourceReference
* The resource reference to set.
*/
- public void setImageResourceReference(final PageParameters parameters,
- final ResourceReference resourceReference)
+ public void setImageResourceReference(final ResourceReference resourceReference, final PageParameters parameters)
{
if (localizedImageResource != null)
{