summaryrefslogtreecommitdiffstats
path: root/uitest/src/com/vaadin/tests/integration
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2015-05-18 20:25:30 +0300
committerVaadin Code Review <review@vaadin.com>2015-05-19 06:44:47 +0000
commit851306745e0974669403ea0e9d07b08e9fbf979a (patch)
treed769b50a3f57d2f91ee0c0bb5e286e55133e1dcb /uitest/src/com/vaadin/tests/integration
parentba07f4f689b61f304f8b92696c8ce2d53724a311 (diff)
downloadvaadin-framework-851306745e0974669403ea0e9d07b08e9fbf979a.tar.gz
vaadin-framework-851306745e0974669403ea0e9d07b08e9fbf979a.zip
Add missing OSGi import to make designs work (#17377)
Change-Id: I28bbbc7a9079fc81e90d1d3f35f675234e560404
Diffstat (limited to 'uitest/src/com/vaadin/tests/integration')
-rw-r--r--uitest/src/com/vaadin/tests/integration/LabelFromDesign.html1
-rwxr-xr-xuitest/src/com/vaadin/tests/integration/ServletIntegrationUI.java11
2 files changed, 11 insertions, 1 deletions
diff --git a/uitest/src/com/vaadin/tests/integration/LabelFromDesign.html b/uitest/src/com/vaadin/tests/integration/LabelFromDesign.html
new file mode 100644
index 0000000000..370a03e990
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/integration/LabelFromDesign.html
@@ -0,0 +1 @@
+<v-label /> \ No newline at end of file
diff --git a/uitest/src/com/vaadin/tests/integration/ServletIntegrationUI.java b/uitest/src/com/vaadin/tests/integration/ServletIntegrationUI.java
index 6aec2c8e2a..b81d57eccd 100755
--- a/uitest/src/com/vaadin/tests/integration/ServletIntegrationUI.java
+++ b/uitest/src/com/vaadin/tests/integration/ServletIntegrationUI.java
@@ -1,5 +1,6 @@
package com.vaadin.tests.integration;
+import com.vaadin.annotations.DesignRoot;
import com.vaadin.data.Item;
import com.vaadin.data.Property.ValueChangeEvent;
import com.vaadin.data.Property.ValueChangeListener;
@@ -10,6 +11,7 @@ import com.vaadin.ui.Label;
import com.vaadin.ui.Table;
import com.vaadin.ui.UI;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.declarative.Design;
public class ServletIntegrationUI extends UI {
@@ -36,7 +38,7 @@ public class ServletIntegrationUI extends UI {
item.getItemProperty("icon").setValue(new FlagSeResource());
item.getItemProperty("country").setValue("Sweden");
- final Label selectedLabel = new Label();
+ final Label selectedLabel = new LabelFromDesign();
table.addValueChangeListener(new ValueChangeListener() {
@Override
public void valueChange(ValueChangeEvent event) {
@@ -45,4 +47,11 @@ public class ServletIntegrationUI extends UI {
});
layout.addComponent(selectedLabel);
}
+
+ @DesignRoot
+ public static class LabelFromDesign extends Label {
+ public LabelFromDesign() {
+ Design.read(this);
+ }
+ }
}