Merge remote-tracking branch 'origin/7.0'

Change-Id: Id48ccb3c400a78cddb8bb5c7bbcf2d65174e59d0

1 files changed, 4 insertions, 4 deletions

diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a1/CreatingPreserveState.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/CreatingPreserveState.java
index ecca98b884..48ccd217ca 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7a1/CreatingPreserveState.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/CreatingPreserveState.java
@@ -18,6 +18,7 @@ package com.vaadin.tests.minitutorials.v7a1;
 
 import com.vaadin.annotations.PreserveOnRefresh;
 import com.vaadin.server.VaadinRequest;
+import com.vaadin.ui.CssLayout;
 import com.vaadin.ui.TextField;
 import com.vaadin.ui.UI;
 
@@ -31,13 +32,12 @@ import com.vaadin.ui.UI;
  */
 @PreserveOnRefresh
 public class CreatingPreserveState extends UI {
-    private static int windowCounter = 0;
+    private static int instanceCounter = 0;
 
     @Override
     public void init(VaadinRequest request) {
-        TextField tf = new TextField("Window #" + (++windowCounter));
+        TextField tf = new TextField("Instance #" + (++instanceCounter));
         tf.setImmediate(true);
-        setContent(tf);
+        setContent(new CssLayout(tf));
     }
-
 }