aboutsummaryrefslogtreecommitdiffstats
path: root/uitest
diff options
context:
space:
mode:
authorJohannes Dahlström <johannesd@vaadin.com>2014-09-23 17:52:44 +0300
committerJohannes Dahlström <johannesd@vaadin.com>2014-09-23 18:48:18 +0300
commitd156b34db4aad889e5dcdfe6de660826e53de050 (patch)
tree272be49c88c03ff5b59a5b8a8ea4cc740daf3689 /uitest
parentdd26a0da34260f0ad303b820e8a1624ca13de04a (diff)
downloadvaadin-framework-d156b34db4aad889e5dcdfe6de660826e53de050.tar.gz
vaadin-framework-d156b34db4aad889e5dcdfe6de660826e53de050.zip
Add default implementation of Renderer.encode to AbstractRenderer (#13334)
Change-Id: I74a0960bbe56e71702762e4cf1067098dd428125
Diffstat (limited to 'uitest')
-rw-r--r--uitest/src/com/vaadin/tests/components/grid/IntArrayRenderer.java13
-rw-r--r--uitest/src/com/vaadin/tests/components/grid/RowAwareRenderer.java8
2 files changed, 2 insertions, 19 deletions
diff --git a/uitest/src/com/vaadin/tests/components/grid/IntArrayRenderer.java b/uitest/src/com/vaadin/tests/components/grid/IntArrayRenderer.java
index ccedcc908a..737dccbc82 100644
--- a/uitest/src/com/vaadin/tests/components/grid/IntArrayRenderer.java
+++ b/uitest/src/com/vaadin/tests/components/grid/IntArrayRenderer.java
@@ -17,21 +17,8 @@ package com.vaadin.tests.components.grid;
import com.vaadin.ui.components.grid.AbstractRenderer;
-import elemental.json.Json;
-import elemental.json.JsonArray;
-import elemental.json.JsonValue;
-
public class IntArrayRenderer extends AbstractRenderer<int[]> {
public IntArrayRenderer() {
super(int[].class);
}
-
- @Override
- public JsonValue encode(int[] value) {
- JsonArray valueArray = Json.createArray();
- for (int i = 0; i < value.length; ++i) {
- valueArray.set(i, value[i]);
- }
- return valueArray;
- }
}
diff --git a/uitest/src/com/vaadin/tests/components/grid/RowAwareRenderer.java b/uitest/src/com/vaadin/tests/components/grid/RowAwareRenderer.java
index 41ccddc2cf..2b89d2ea99 100644
--- a/uitest/src/com/vaadin/tests/components/grid/RowAwareRenderer.java
+++ b/uitest/src/com/vaadin/tests/components/grid/RowAwareRenderer.java
@@ -19,9 +19,6 @@ import com.vaadin.tests.widgetset.client.grid.RowAwareRendererConnector.RowAware
import com.vaadin.ui.Label;
import com.vaadin.ui.components.grid.AbstractRenderer;
-import elemental.json.Json;
-import elemental.json.JsonValue;
-
public class RowAwareRenderer extends AbstractRenderer<Void> {
public RowAwareRenderer(final Label debugLabel) {
super(Void.class);
@@ -35,8 +32,7 @@ public class RowAwareRenderer extends AbstractRenderer<Void> {
}
@Override
- public JsonValue encode(Void value) {
- return Json.createNull();
+ protected Object doEncode(Void value) {
+ return null;
}
-
}