You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by ts...@apache.org on 2015/12/04 18:48:44 UTC
[3/7] wicket git commit: WICKET-6042 - Constructor changes / typo
WICKET-6042 - Constructor changes / typo
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/a1b19493
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/a1b19493
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/a1b19493
Branch: refs/heads/master
Commit: a1b19493da671dce33f258de8021713fdc45234a
Parents: 93fe70d
Author: Tobias Soloschenko <ts...@apache.org>
Authored: Wed Dec 2 21:40:07 2015 +0100
Committer: Tobias Soloschenko <ts...@apache.org>
Committed: Fri Dec 4 18:47:41 2015 +0100
----------------------------------------------------------------------
.../wicket/markup/html/image/ExternalImage.java | 97 ++++++++++++--------
.../markup/html/image/ExternalSource.java | 28 +++++-
.../markup/html/image/ExternalImageTest.java | 3 +-
.../html/image/ExternalImageTestPage.java | 7 +-
4 files changed, 88 insertions(+), 47 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/a1b19493/wicket-core/src/main/java/org/apache/wicket/markup/html/image/ExternalImage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/image/ExternalImage.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/image/ExternalImage.java
index 832c711..407229e 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/image/ExternalImage.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/image/ExternalImage.java
@@ -19,6 +19,7 @@ package org.apache.wicket.markup.html.image;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import org.apache.wicket.markup.ComponentTag;
@@ -28,9 +29,14 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
/**
- * A component to display external images. The src / srcset information are hold in models
+ * A component to display external images. The src / srcSet information are hold in models
+ *
+ * @see org.apache.wicket.markup.html.image.Image
*
* @author Tobias Soloschenko
+ * @author Sebastien Briquet
+ * @author Sven Meier
+ * @author Martin Grigorov
*
*/
public class ExternalImage extends WebComponent
@@ -49,7 +55,18 @@ public class ExternalImage extends WebComponent
*/
private Cors crossOrigin = null;
- private IModel<List<Serializable>> srcSetModels;
+ private IModel<List<Serializable>> srcSetModel;
+
+ /**
+ * Creates an external image
+ *
+ * @param id
+ * the component id
+ */
+ public ExternalImage(String id)
+ {
+ this(id, null, Model.ofList(Collections.<Serializable> emptyList()));
+ }
/**
* Creates an external image
@@ -61,7 +78,7 @@ public class ExternalImage extends WebComponent
*/
public ExternalImage(String id, Serializable src)
{
- this(id, src, (List<Serializable>)null);
+ this(id, Model.of(src), Model.ofList(Collections.<Serializable> emptyList()));
}
/**
@@ -72,7 +89,7 @@ public class ExternalImage extends WebComponent
* @param src
* the source URL
* @param srcSet
- * a list of URLs placed in the srcset attribute
+ * a list of URLs placed in the srcSet attribute
*/
public ExternalImage(String id, Serializable src, List<Serializable> srcSet)
{
@@ -86,12 +103,10 @@ public class ExternalImage extends WebComponent
* the component id
* @param srcModel
* the model source URL
- * @param srcSetModels
- * a model list of URLs placed in the srcset attribute
*/
public ExternalImage(String id, IModel<Serializable> srcModel)
{
- this(id, srcModel, (IModel<List<Serializable>>)null);
+ this(id, srcModel, Model.ofList(Collections.<Serializable> emptyList()));
}
/**
@@ -101,14 +116,14 @@ public class ExternalImage extends WebComponent
* the component id
* @param srcModel
* the model source URL
- * @param srcSetModels
- * a model list of URLs placed in the srcset attribute
+ * @param srcSetModel
+ * a model list of URLs placed in the srcSet attribute
*/
public ExternalImage(String id, IModel<Serializable> srcModel,
- IModel<List<Serializable>> srcSetModels)
+ IModel<List<Serializable>> srcSetModel)
{
super(id, srcModel);
- this.srcSetModels = srcSetModels;
+ this.srcSetModel = srcSetModel;
}
@Override
@@ -118,13 +133,13 @@ public class ExternalImage extends WebComponent
if ("source".equals(tag.getName()))
{
- buildSrcSetAttribute(tag, getSrcSet());
+ buildSrcSetAttribute(tag, getSrcSetModel());
}
else
{
checkComponentTag(tag, "img");
buildSrcAttribute(tag, getDefaultModel());
- buildSrcSetAttribute(tag, getSrcSet());
+ buildSrcSetAttribute(tag, getSrcSetModel());
}
buildSizesAttribute(tag);
@@ -146,10 +161,7 @@ public class ExternalImage extends WebComponent
*/
protected void buildSrcAttribute(final ComponentTag tag, IModel<?> srcModel)
{
- if (srcModel != null)
- {
- tag.put("src", srcModel.getObject().toString());
- }
+ tag.put("src", srcModel.getObject().toString());
}
/**
@@ -157,32 +169,28 @@ public class ExternalImage extends WebComponent
*
* @param tag
* the component tag
- * @param srcSetModels
+ * @param srcSetModel
* the models containing the src set URLs
*/
protected void buildSrcSetAttribute(final ComponentTag tag,
- IModel<List<Serializable>> srcSetModels)
+ IModel<List<Serializable>> srcSetModel)
{
int srcSetPosition = 0;
- List<Serializable> srcSetItems = srcSetModels.getObject();
- if (srcSetItems != null)
+ List<Serializable> srcSetItems = srcSetModel.getObject();
+ for (Serializable srcSet : srcSetItems)
{
- for (Serializable srcSetModel : srcSetItems)
- {
- String srcset = tag.getAttribute("srcset");
- String xValue = "";
+ String srcset = tag.getAttribute("srcset");
+ String xValue = "";
- // If there are xValues set process them in the applied order to the srcset
- // attribute.
- if (xValues != null)
- {
- xValue = xValues.size() > srcSetPosition && xValues.get(srcSetPosition) != null
- ? " " + xValues.get(srcSetPosition)
- : "";
- }
- tag.put("srcset", (srcset != null ? srcset + ", " : "") + srcSetModel + xValue);
- srcSetPosition++;
+ // If there are xValues set process them in the applied order to the srcset
+ // attribute.
+ if (xValues != null)
+ {
+ xValue = xValues.size() > srcSetPosition && xValues.get(srcSetPosition) != null
+ ? " " + xValues.get(srcSetPosition) : "";
}
+ tag.put("srcset", (srcset != null ? srcset + ", " : "") + srcSet + xValue);
+ srcSetPosition++;
}
}
@@ -278,9 +286,20 @@ public class ExternalImage extends WebComponent
*
* @return a list of models containing the src set values
*/
- public IModel<List<Serializable>> getSrcSet()
+ public IModel<List<Serializable>> getSrcSetModel()
+ {
+ return srcSetModel;
+ }
+
+ /**
+ * Sets the source set model
+ *
+ * @param srcSetModel
+ * the model of a list of src set entries
+ */
+ public void setSrcSetModel(IModel<List<Serializable>> srcSetModel)
{
- return srcSetModels;
+ this.srcSetModel = srcSetModel;
}
/**
@@ -289,9 +308,9 @@ public class ExternalImage extends WebComponent
@Override
protected void onDetach()
{
- if (srcSetModels != null)
+ if (srcSetModel != null)
{
- srcSetModels.detach();
+ srcSetModel.detach();
}
super.onDetach();
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/a1b19493/wicket-core/src/main/java/org/apache/wicket/markup/html/image/ExternalSource.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/image/ExternalSource.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/image/ExternalSource.java
index 3485f9d..a1bf59a 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/image/ExternalSource.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/image/ExternalSource.java
@@ -17,11 +17,13 @@
package org.apache.wicket.markup.html.image;
import java.io.Serializable;
+import java.util.Collections;
import java.util.List;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.image.Image.Cors;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
/**
* A component which displays external images within a picture tag.
@@ -29,6 +31,9 @@ import org.apache.wicket.model.IModel;
* @see org.apache.wicket.markup.html.image.Source
*
* @author Tobias Soloschenko
+ * @author Sebastien Briquet
+ * @author Sven Meier
+ * @author Martin Grigorov
*
*/
public class ExternalSource extends ExternalImage
@@ -48,9 +53,24 @@ public class ExternalSource extends ExternalImage
* @param srcSet
* a list of URLs placed in the srcset attribute
*/
+ public ExternalSource(String id)
+ {
+ super(id, null, Model.ofList(Collections.<Serializable> emptyList()));
+ }
+
+ /**
+ * Creates an external source
+ *
+ * @param id
+ * the component id
+ * @param src
+ * the source URL
+ * @param srcSet
+ * a list of URLs placed in the srcset attribute
+ */
public ExternalSource(String id, List<Serializable> srcSet)
{
- super(id, null, srcSet);
+ super(id, null, Model.ofList(srcSet));
}
/**
@@ -60,12 +80,12 @@ public class ExternalSource extends ExternalImage
* the component id
* @param src
* the model source URL
- * @param srcSetModels
+ * @param srcSetModel
* a model list of URLs placed in the srcset attribute
*/
- public ExternalSource(String id, IModel<List<Serializable>> srcSetModels)
+ public ExternalSource(String id, IModel<List<Serializable>> srcSetModel)
{
- super(id, null, srcSetModels);
+ super(id, null, srcSetModel);
}
@Override
http://git-wip-us.apache.org/repos/asf/wicket/blob/a1b19493/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ExternalImageTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ExternalImageTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ExternalImageTest.java
index d520f7c..c761513 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ExternalImageTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ExternalImageTest.java
@@ -40,6 +40,7 @@ public class ExternalImageTest extends WicketTestCase
{
tester.startPage(ExternalImageTestPage.class);
String lastResponseAsString = tester.getLastResponse().getDocument();
+ System.out.println(lastResponseAsString);
Assert.assertTrue(lastResponseAsString.contains(
"<img wicket:id=\"externalImage1\" src=\"http://wicket.apache.org/img/wicket-7-bg.jpg\"/>"));
Assert.assertTrue(lastResponseAsString.contains(
@@ -58,7 +59,7 @@ public class ExternalImageTest extends WicketTestCase
ExternalImage externalImage2 = (ExternalImage)externalImage2Component;
TagTester tagById = tester.getTagById("externalImage2");
- IModel<List<Serializable>> srcSet = externalImage2.getSrcSet();
+ IModel<List<Serializable>> srcSet = externalImage2.getSrcSetModel();
for (Serializable model :srcSet.getObject())
{
String attribute = tagById.getAttribute("srcset");
http://git-wip-us.apache.org/repos/asf/wicket/blob/a1b19493/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ExternalImageTestPage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ExternalImageTestPage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ExternalImageTestPage.java
index 753d487..0beeb1a 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ExternalImageTestPage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ExternalImageTestPage.java
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.markup.html.image;
+import java.io.Serializable;
import java.util.Arrays;
import org.apache.wicket.markup.html.WebPage;
@@ -39,14 +40,14 @@ public class ExternalImageTestPage extends WebPage
add(new ExternalImage("externalImage1", "http://wicket.apache.org/img/wicket-7-bg.jpg"));
ExternalImage externalImage2 = new ExternalImage("externalImage2",
"http://wicket.apache.org/img/wicket-7-bg.jpg",
- Arrays.asList("http://wicket.apache.org/img/wicket-7-bg-1.jpg",
+ Arrays.<Serializable>asList("http://wicket.apache.org/img/wicket-7-bg-1.jpg",
"http://wicket.apache.org/img/wicket-7-bg-2.jpg"));
externalImage2.setSizes("s1", "s2");
externalImage2.setXValues("x1", "x2");
add(externalImage2);
Picture picture = new Picture("externalPicture");
ExternalSource externalSource = new ExternalSource("externalSource",
- Model.ofList(Arrays.asList("http://wicket.apache.org/img/wicket-7-bg-1.jpg",
+ Model.ofList(Arrays.<Serializable>asList("http://wicket.apache.org/img/wicket-7-bg-1.jpg",
"http://wicket.apache.org/img/wicket-7-bg-2.jpg")));
externalSource.setXValues("", "x2");
externalSource.setSizes("1");
@@ -54,7 +55,7 @@ public class ExternalImageTestPage extends WebPage
picture.add(externalSource);
ExternalImage externalImage3 = new ExternalImage("externalImage3",
"http://wicket.apache.org/img/wicket-7-bg.jpg",
- Arrays.asList("http://wicket.apache.org/img/wicket-7-bg-1.jpg",
+ Arrays.<Serializable>asList("http://wicket.apache.org/img/wicket-7-bg-1.jpg",
"http://wicket.apache.org/img/wicket-7-bg-2.jpg"));
picture.add(externalImage3);
add(picture);