Panel/Window setLayout() -> setContent()

svn changeset:15432/svn branch:6.5

53 files changed, 66 insertions, 67 deletions

diff --git a/tests/src/com/vaadin/tests/Parameters.java b/tests/src/com/vaadin/tests/Parameters.java
index faa318298b..7bc6fb5cc4 100644
--- a/tests/src/com/vaadin/tests/Parameters.java
+++ b/tests/src/com/vaadin/tests/Parameters.java
@@ -13,6 +13,7 @@ import com.vaadin.terminal.ExternalResource;
 import com.vaadin.terminal.ParameterHandler;
 import com.vaadin.terminal.URIHandler;
 import com.vaadin.ui.Label;
+import com.vaadin.ui.Layout;
 import com.vaadin.ui.Link;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.Table;
@@ -35,7 +36,6 @@ public class Parameters extends com.vaadin.Application implements URIHandler, Pa
     private final Table params = new Table();
 
     @Override
-    @SuppressWarnings("deprecation")
     public void init() {
         final Window main = new Window("Parameters demo");
         setMainWindow(main);
@@ -71,8 +71,8 @@ public class Parameters extends com.vaadin.Application implements URIHandler, Pa
         params.addContainerProperty("Value", String.class, "");
         final Panel panel2 = new Panel("Parameter Handler");
         params.setSizeFull();
-        panel2.setLayout(new VerticalLayout());
-        panel2.getLayout().setMargin(true);
+        panel2.setContent(new VerticalLayout());
+        ((Layout) panel2.getContent()).setMargin(true);
 
         params.setColumnHeaderMode(Table.COLUMN_HEADER_MODE_ID);
         panel2.addComponent(params);
@@ -84,7 +84,7 @@ public class Parameters extends com.vaadin.Application implements URIHandler, Pa
         layout.setMargin(true);
         layout.setSpacing(true);
 
-        main.setLayout(layout);
+        main.setContent(layout);
     }
 
     /**
diff --git a/tests/src/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java b/tests/src/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java
index 49f989e972..8d789c1b29 100644
--- a/tests/src/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java
+++ b/tests/src/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java
@@ -24,7 +24,7 @@ public class TestForApplicationLayoutThatUsesWholeBrosersSpace extends Applicati
         setMainWindow(main);
 
         rootLayout = new VerticalLayout();
-        main.setLayout(rootLayout);
+        main.setContent(rootLayout);
 
         rootLayout.addComponent(new Label("header"));
 
diff --git a/tests/src/com/vaadin/tests/TestForPreconfiguredComponents.java b/tests/src/com/vaadin/tests/TestForPreconfiguredComponents.java
index 0a2589770c..19ae601d36 100644
--- a/tests/src/com/vaadin/tests/TestForPreconfiguredComponents.java
+++ b/tests/src/com/vaadin/tests/TestForPreconfiguredComponents.java
@@ -121,7 +121,7 @@ public class TestForPreconfiguredComponents extends CustomComponent implements H
 
     public Panel createTestBench(Component t) {
         final Panel ol = new Panel();
-        ol.setLayout(new HorizontalLayout());
+        ol.setContent(new HorizontalLayout());
 
         ol.addComponent(t);
 
diff --git a/tests/src/com/vaadin/tests/TestSplitPanel.java b/tests/src/com/vaadin/tests/TestSplitPanel.java
index 628fec96d2..21e04154ad 100644
--- a/tests/src/com/vaadin/tests/TestSplitPanel.java
+++ b/tests/src/com/vaadin/tests/TestSplitPanel.java
@@ -22,7 +22,7 @@ public class TestSplitPanel extends com.vaadin.Application {
         verticalSplit.setFirstComponent(new Label("vertical first"));
         verticalSplit.setSecondComponent(new Label("vertical second"));
 
-        mainWindow.setLayout(verticalSplit);
+        mainWindow.setContent(verticalSplit);
 
     }
 
diff --git a/tests/src/com/vaadin/tests/components/form/FormRenderingFlicker.java b/tests/src/com/vaadin/tests/components/form/FormRenderingFlicker.java
index 6956eee017..5858366a63 100644
--- a/tests/src/com/vaadin/tests/components/form/FormRenderingFlicker.java
+++ b/tests/src/com/vaadin/tests/components/form/FormRenderingFlicker.java
@@ -32,7 +32,7 @@ public class FormRenderingFlicker extends TestBase {
         form = new Form();

 

         tablePanel = new Panel();

-        tablePanel.setLayout(tableLayout);

+        tablePanel.setContent(tableLayout);

 

         addComponent(tablePanel);

     }

diff --git a/tests/src/com/vaadin/tests/components/form/FormWithRelativelySizedLayout.java b/tests/src/com/vaadin/tests/components/form/FormWithRelativelySizedLayout.java
index 17fe4477c3..1c3736cb98 100644
--- a/tests/src/com/vaadin/tests/components/form/FormWithRelativelySizedLayout.java
+++ b/tests/src/com/vaadin/tests/components/form/FormWithRelativelySizedLayout.java
@@ -28,8 +28,7 @@ public class FormWithRelativelySizedLayout extends TestBase {
         f.setWidth("100%");
         f.setHeight("100%");
 
-        Label l = new Label(
-                "This green label should consume all available space, pushing ok button to bottom of the view");
+        Label l = new Label("This green label should consume all available space, pushing ok button to bottom of the view");
         l.setSizeFull();
 
         CssLayout lo = new CssLayout() {
diff --git a/tests/src/com/vaadin/tests/components/table/TestCurrentPageFirstItem.java b/tests/src/com/vaadin/tests/components/table/TestCurrentPageFirstItem.java
index 90add959f1..9c3b2de3e0 100644
--- a/tests/src/com/vaadin/tests/components/table/TestCurrentPageFirstItem.java
+++ b/tests/src/com/vaadin/tests/components/table/TestCurrentPageFirstItem.java
@@ -28,7 +28,7 @@ public class TestCurrentPageFirstItem extends Application implements
             main.setSizeFull();

             // setTheme("testtheme");

             VerticalLayout baseLayout = new VerticalLayout();

-            main.setLayout(baseLayout);

+            main.setContent(baseLayout);

 

             table = new Table();

             container.addContainerProperty("row", String.class, "");

diff --git a/tests/src/com/vaadin/tests/featurebrowser/FeaturesApplication.java b/tests/src/com/vaadin/tests/featurebrowser/FeaturesApplication.java
index 2b1f48075c..8bbbad5d31 100644
--- a/tests/src/com/vaadin/tests/featurebrowser/FeaturesApplication.java
+++ b/tests/src/com/vaadin/tests/featurebrowser/FeaturesApplication.java
@@ -17,7 +17,7 @@ public class FeaturesApplication extends com.vaadin.Application {
         final Window main = new Window("Vaadin Features Tour");
         setMainWindow(main);
 
-        main.setLayout(new FeatureBrowser());
+        main.setContent(new FeatureBrowser());
     }
 
     /**
diff --git a/tests/src/com/vaadin/tests/layouts/DeepComponentTrees.java b/tests/src/com/vaadin/tests/layouts/DeepComponentTrees.java
index fc280c0ce2..002ecfa561 100644
--- a/tests/src/com/vaadin/tests/layouts/DeepComponentTrees.java
+++ b/tests/src/com/vaadin/tests/layouts/DeepComponentTrees.java
@@ -90,7 +90,7 @@ public class DeepComponentTrees extends TestBase {
         }

         layout.addComponent(new Label(

                 "FF did it! Vaadin, Mozilla and you win! Dare to try again?"));

-        root.setLayout(r);

+        root.setContent(r);

     }

 

     Layout getTestLayout() {

diff --git a/tests/src/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java b/tests/src/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java
index 0a50dc326d..e9d206009a 100644
--- a/tests/src/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java
+++ b/tests/src/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java
@@ -23,7 +23,7 @@ public class GridLayoutExpandRatioModification extends TestBase implements
     public void setup() {
         Window main = new Window("The Main Window");
         mainLayout = new GridLayout(3, 3);
-        main.setLayout(mainLayout);
+        main.setContent(mainLayout);
         setMainWindow(main);
 
         // The upper layout
diff --git a/tests/src/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java b/tests/src/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java
index 699522e18b..bbac07d20f 100644
--- a/tests/src/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java
+++ b/tests/src/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java
@@ -22,7 +22,7 @@ public class VerticalLayoutExpandRatioModification extends TestBase implements
     public void setup() {

         Window main = new Window("The Main Window");

         mainLayout = new VerticalLayout();

-        main.setLayout(mainLayout);

+        main.setContent(mainLayout);

         setMainWindow(main);

 

         // The upper layout

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1230.java b/tests/src/com/vaadin/tests/tickets/Ticket1230.java
index 82cc3748e2..5b08107df0 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1230.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket1230.java
@@ -22,7 +22,7 @@ public class Ticket1230 extends Application {
         setMainWindow(w);
 
         GridLayout layout = new GridLayout(5, 5);
-        w.setLayout(layout);
+        w.setContent(layout);
 
         layout.setSpacing(true);
 
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1362Login.java b/tests/src/com/vaadin/tests/tickets/Ticket1362Login.java
index a6f9cbf2af..ff21ce479d 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1362Login.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket1362Login.java
@@ -215,7 +215,7 @@ public class Ticket1362Login extends Application {
         el.addComponent(loginBox);
         el.setExpandRatio(loginBox, 1);
 
-        mainWin.setLayout(el);
+        mainWin.setContent(el);
 
         setMainWindow(mainWin);
 
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1572.java b/tests/src/com/vaadin/tests/tickets/Ticket1572.java
index 7905328f8e..8a2a39a169 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1572.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket1572.java
@@ -22,7 +22,7 @@ public class Ticket1572 extends com.vaadin.Application {
 

         Panel p = new Panel("Test wrapper for gridlayout margin/spacing");

 

-        p.setLayout(new HorizontalLayout());

+        p.setContent(new HorizontalLayout());

 

         gl = new GridLayout(3, 3);

         gl.setMargin(true);

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1737.java b/tests/src/com/vaadin/tests/tickets/Ticket1737.java
index 5e29182b7a..f90ccc48b2 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1737.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket1737.java
@@ -32,7 +32,7 @@ public class Ticket1737 extends Application {
         setMainWindow(main);
 
         VerticalLayout el = new VerticalLayout();
-        main.setLayout(el);
+        main.setContent(el);
 
         Panel p = new Panel("Test panel");
         p.setSizeFull();
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1878.java b/tests/src/com/vaadin/tests/tickets/Ticket1878.java
index ecc076ee15..549ab2126d 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1878.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket1878.java
@@ -44,7 +44,7 @@ public class Ticket1878 extends Application {
         // setTheme("tests-tickets");

 

         mainLayout = new GridLayout(1, 2);

-        w.setLayout(mainLayout);

+        w.setContent(mainLayout);

         orderedLayout = createOL();

         gridLayout = createGL();

         formLayout = createForms();

@@ -80,7 +80,7 @@ public class Ticket1878 extends Application {
 

         mainLayout.addComponent(buttonLayout);

         mainLayout.addComponent(orderedLayout);

-        // w.setLayout(orderedLayout);

+        // w.setContent(orderedLayout);

     }

 

     private static Layout createOL() {

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1919.java b/tests/src/com/vaadin/tests/tickets/Ticket1919.java
index 02935f9ea1..0733d0c9f0 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1919.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket1919.java
@@ -28,7 +28,7 @@ public class Ticket1919 extends com.vaadin.Application {
         lo.addComponent(getTestComponent());

         lo.addComponent(getTestComponent());

 

-        main.setLayout(lo);

+        main.setContent(lo);

 

     }

 

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1923.java b/tests/src/com/vaadin/tests/tickets/Ticket1923.java
index 6ba41cad8b..c819d4c6b5 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1923.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket1923.java
@@ -19,7 +19,7 @@ public class Ticket1923 extends com.vaadin.Application {
         p = new Panel("TestPanel 250x300");

         // p.getLayout().setWidth("100%");

         p.setScrollable(true);

-        // p.setLayout(new GridLayout(1, 100));

+        // p.setContent(new GridLayout(1, 100));

         for (int i = 0; i < ROWS; i++) {

             p.addComponent(new Label("Label" + i + " 5067w09adsfasdjfahlsdfjhalfjhaldjfhalsjdfhlajdhflajhdfljahdslfjahldsjfhaljdfhaljfdhlajsdhflajshdflkajhsdlfkjahsldfkjahsldfhalskjfdhlksjfdh857idifhaljsdfhlajsdhflajhdflajhdfljahldfjhaljdfhalsjdfhalkjdhflkajhdfljahsdlfjahlsdjfhaldjfhaljfdhlajdhflajshdfljahsdlfjhalsjdfhalskjhfdlhusfglksuhdflgjshflgjhslfghslfjghsljfglsjhfglsjhfgljshfgljshflgjhslfghsljfgsljdfglsdjhfglsjhflgkjshfldjgh"));

         }

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1966_2.java b/tests/src/com/vaadin/tests/tickets/Ticket1966_2.java
index ce9e936fc0..2c639f73b6 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1966_2.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket1966_2.java
@@ -18,12 +18,12 @@ public class Ticket1966_2 extends Application {
     public void init() {

         Window w = new Window(getClass().getName());

         setMainWindow(w);

-        w.setLayout(new GridLayout(2, 2));

+        w.setContent(new GridLayout(2, 2));

 

         // Panel p = new Panel("test");

         // p.setWidth(500);

         // p.setHeight(500);

-        // p.setLayout(new GridLayout(1, 2));

+        // p.setContent(new GridLayout(1, 2));

         // p.getLayout().setSizeFull();

         //

         // p.addComponent(new Button("asjkdfhakshdf"));

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1966_3.java b/tests/src/com/vaadin/tests/tickets/Ticket1966_3.java
index 4a4b336eb9..e8a2c2bc3c 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1966_3.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket1966_3.java
@@ -18,7 +18,7 @@ public class Ticket1966_3 extends Application {
         setMainWindow(w);

         // setTheme("tests-tickets");

         GridLayout layout = new GridLayout(10, 10);

-        w.setLayout(layout);

+        w.setContent(layout);

         createUI(layout);

     }

 

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1972.java b/tests/src/com/vaadin/tests/tickets/Ticket1972.java
index 6cbbbb9f92..86d5b0f11d 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1972.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket1972.java
@@ -24,7 +24,7 @@ public class Ticket1972 extends Application {
         layout.space();

         layout.addComponent(new Label("3-3"));

 

-        w.setLayout(layout);

+        w.setContent(layout);

     }

 

 }

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1975.java b/tests/src/com/vaadin/tests/tickets/Ticket1975.java
index 2ea60f314f..3391aa1f30 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1975.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket1975.java
@@ -24,7 +24,7 @@ public class Ticket1975 extends Application {
         setMainWindow(w);

         setTheme("tests-tickets");

         GridLayout layout = new GridLayout(1, 10);

-        w.setLayout(layout);

+        w.setContent(layout);

         createUI(layout);

     }

 

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1982.java b/tests/src/com/vaadin/tests/tickets/Ticket1982.java
index 68bdbeb388..8d066c0938 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1982.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket1982.java
@@ -23,7 +23,7 @@ public class Ticket1982 extends Application {
 
         GridLayout gl = new GridLayout(2, 2);
         gl.setSizeFull();
-        main.setLayout(gl);
+        main.setContent(gl);
         gl.setMargin(true);
 
         TitleBar t1 = new TitleBar("Title 1", gl);
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1983.java b/tests/src/com/vaadin/tests/tickets/Ticket1983.java
index be4e5f3fcf..6ffd6ddb9f 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1983.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket1983.java
@@ -19,7 +19,7 @@ public class Ticket1983 extends Application {
     @Override
     public void init() {
         Window main = new Window("Test for ticket 1983");
-        main.setLayout(new TestLayout());
+        main.setContent(new TestLayout());
         setMainWindow(main);
     }
 
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1986.java b/tests/src/com/vaadin/tests/tickets/Ticket1986.java
index 1b96f7bd39..f2a173bcb0 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1986.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket1986.java
@@ -72,7 +72,7 @@ public class Ticket1986 extends Application {
         layout.addComponent(f2);

         layout.addComponent(f1);

 

-        w.setLayout(layout);

+        w.setContent(layout);

 

     }

 

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2002.java b/tests/src/com/vaadin/tests/tickets/Ticket2002.java
index 1e3b4e241a..b5db161b8b 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2002.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket2002.java
@@ -44,6 +44,6 @@ public class Ticket2002 extends Application {
         layout.addComponent(f1);

         layout.addComponent(f2);

 

-        w.setLayout(layout);

+        w.setContent(layout);

     }

 }

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2009.java b/tests/src/com/vaadin/tests/tickets/Ticket2009.java
index 8aa55db731..7e5cea3c43 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2009.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket2009.java
@@ -24,7 +24,7 @@ public class Ticket2009 extends com.vaadin.Application {
         setMainWindow(main);

 

         HorizontalLayout ol = new HorizontalLayout();

-        main.setLayout(ol);

+        main.setContent(ol);

         ol.setSizeFull();

 

         Panel p = new Panel("Tree test");

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2011.java b/tests/src/com/vaadin/tests/tickets/Ticket2011.java
index d4e5890635..e28ee9b4e2 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2011.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket2011.java
@@ -13,7 +13,7 @@ public class Ticket2011 extends Application {
         setMainWindow(w);

         // setTheme("tests-ticket");

         GridLayout layout = new GridLayout(10, 10);

-        w.setLayout(layout);

+        w.setContent(layout);

         createUI(layout);

     }

 

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2022.java b/tests/src/com/vaadin/tests/tickets/Ticket2022.java
index 9dfcabc208..17df2a2700 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2022.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket2022.java
@@ -20,7 +20,7 @@ public class Ticket2022 extends Application {
         l = new CustomLayout("Ticket2022");

         // try {

         // l = new CustomLayout(new FileInputStream(f));

-        w.setLayout(l);

+        w.setContent(l);

         // } catch (FileNotFoundException e) {

         // // TODO Auto-generated catch block

         // e.printStackTrace();

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2026.java b/tests/src/com/vaadin/tests/tickets/Ticket2026.java
index 4bbb9057ff..be329eb5b5 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2026.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket2026.java
@@ -30,6 +30,6 @@ public class Ticket2026 extends Application {
         tf.setTabIndex(2);

         layout.addComponent(tf);

 

-        w.setLayout(layout);

+        w.setContent(layout);

     }

 }

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2029.java b/tests/src/com/vaadin/tests/tickets/Ticket2029.java
index e79db104ad..4e2dee5191 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2029.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket2029.java
@@ -42,7 +42,7 @@ public class Ticket2029 extends Application {
         p.setHeight(DIM2 + "px");

 

         HorizontalLayout layout = new HorizontalLayout();

-        p.setLayout(layout);

+        p.setContent(layout);

         p.getLayout().setSizeFull();

 

         for (int i = 0; i < COMPONENTS; i++) {

@@ -71,7 +71,7 @@ public class Ticket2029 extends Application {
         p.setHeight("" + DIM2 + "px");

 

         GridLayout layout = new GridLayout(COMPONENTS, 1);

-        p.setLayout(layout);

+        p.setContent(layout);

         p.getLayout().setSizeFull();

 

         for (int i = 0; i < COMPONENTS; i++) {

@@ -109,7 +109,7 @@ public class Ticket2029 extends Application {
         p.setHeight("" + DIM1 + "px");

 

         VerticalLayout layout = new VerticalLayout();

-        p.setLayout(layout);

+        p.setContent(layout);

         p.getLayout().setSizeFull();

 

         for (int i = 0; i < COMPONENTS; i++) {

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2042.java b/tests/src/com/vaadin/tests/tickets/Ticket2042.java
index 0c7bede4b8..2dfe4a1cb5 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2042.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket2042.java
@@ -18,7 +18,7 @@ public class Ticket2042 extends Application {
         // setTheme("tests-tickets");

         GridLayout layout = new GridLayout(1, 2);

         layout.setHeight("2000px");

-        w.setLayout(layout);

+        w.setContent(layout);

         createUI(layout);

     }

 

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2043.java b/tests/src/com/vaadin/tests/tickets/Ticket2043.java
index 3a2ce269de..c502803c65 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2043.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket2043.java
@@ -14,7 +14,7 @@ public class Ticket2043 extends Application {
         setMainWindow(w);

         // setTheme("tests-tickets");

         GridLayout layout = new GridLayout(10, 10);

-        w.setLayout(layout);

+        w.setContent(layout);

         createUI(layout);

     }

 

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2048.java b/tests/src/com/vaadin/tests/tickets/Ticket2048.java
index 5ad2ef79c4..0c41153001 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2048.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket2048.java
@@ -28,15 +28,15 @@ public class Ticket2048 extends Application {
         setMainWindow(w);

         // setTheme("tests-tickets");

         // splitPanel = new SplitPanel(SplitPanel.ORIENTATION_HORIZONTAL);

-        // getMainWindow().setLayout(splitPanel);

+        // getMainWindow().setContent(splitPanel);

 

         // GridLayout layout = new GridLayout(10, 10);

-        // w.setLayout(layout);

+        // w.setContent(layout);

         // gridLayout = new GridLayout(1, 1);

         orderedLayout = new VerticalLayout();

 

-        getMainWindow().setLayout(orderedLayout);

-        // getMainWindow().setLayout(new GridLayout(1, 1));

+        getMainWindow().setContent(orderedLayout);

+        // getMainWindow().setContent(new GridLayout(1, 1));

         getMainWindow().setSizeFull();

         getMainWindow().getLayout().setSizeFull();

 

@@ -51,9 +51,9 @@ public class Ticket2048 extends Application {
         // public void buttonClick(ClickEvent event) {

         // Layout l = getMainWindow().getLayout();

         // if (l == orderedLayout) {

-        // getMainWindow().setLayout(gridLayout);

+        // getMainWindow().setContent(gridLayout);

         // } else {

-        // getMainWindow().setLayout(orderedLayout);

+        // getMainWindow().setContent(orderedLayout);

         // }

         //

         // }

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2051.java b/tests/src/com/vaadin/tests/tickets/Ticket2051.java
index b31acbde11..e901ebc343 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2051.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket2051.java
@@ -22,7 +22,7 @@ public class Ticket2051 extends Application {
         setMainWindow(w);

         // setTheme("tests-tickets");

         GridLayout layout = new GridLayout(10, 10);

-        w.setLayout(layout);

+        w.setContent(layout);

         createUI(layout);

     }

 

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2060.java b/tests/src/com/vaadin/tests/tickets/Ticket2060.java
index 672c0b8957..63bf5b3ff7 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2060.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket2060.java
@@ -20,7 +20,7 @@ public class Ticket2060 extends Application {
         setMainWindow(w);

         // setTheme("tests-tickets");

         GridLayout layout = new GridLayout(10, 10);

-        w.setLayout(layout);

+        w.setContent(layout);

         createUI(layout);

     }

 

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2062.java b/tests/src/com/vaadin/tests/tickets/Ticket2062.java
index e5650ae18c..8c459d367d 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2062.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket2062.java
@@ -17,7 +17,7 @@ public class Ticket2062 extends Application {
 

         SplitPanel p = new SplitPanel(SplitPanel.ORIENTATION_HORIZONTAL);

         p.setSizeFull();

-        getMainWindow().setLayout(p);

+        getMainWindow().setContent(p);

 

         TextField tf1 = new TextField("Tab 1");

         tf1.setValue("Field 1");

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2083.java b/tests/src/com/vaadin/tests/tickets/Ticket2083.java
index fd9c94743b..2eae3aa0ed 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2083.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket2083.java
@@ -14,7 +14,7 @@ public class Ticket2083 extends Application {
         setMainWindow(w);

         // setTheme("tests-tickets");

         GridLayout layout = new GridLayout(10, 10);

-        w.setLayout(layout);

+        w.setContent(layout);

         createUI(layout);

     }

 

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2095.java b/tests/src/com/vaadin/tests/tickets/Ticket2095.java
index 5fcab528c1..240d21facd 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2095.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket2095.java
@@ -13,7 +13,7 @@ public class Ticket2095 extends Application {
         setMainWindow(w);

 

         // uncomment to workaround iorderedlayout bug in current trunk

-        // w.setLayout(new ExpandLayout());

+        // w.setContent(new ExpandLayout());

         w.getLayout().setSizeFull();

 

         Embedded em = new Embedded();

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2099.java b/tests/src/com/vaadin/tests/tickets/Ticket2099.java
index b4a5f2c450..4f79eb7e64 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2099.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket2099.java
@@ -22,7 +22,7 @@ public class Ticket2099 extends Application {
         setMainWindow(w);

         // setTheme("tests-tickets");

         GridLayout layout = new GridLayout(10, 10);

-        w.setLayout(layout);

+        w.setContent(layout);

         createUI(layout);

     }

 

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2119.java b/tests/src/com/vaadin/tests/tickets/Ticket2119.java
index 3c516a6ee5..903d442218 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2119.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket2119.java
@@ -43,7 +43,7 @@ public class Ticket2119 extends Application {
 
     private Window createWindow() {
         Window main = new Window("Test for ticket XXX");
-        main.setLayout(testLayout());
+        main.setContent(testLayout());
         return main;
     }
 
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2186.java b/tests/src/com/vaadin/tests/tickets/Ticket2186.java
index ce06f4576b..bc9ff8c27d 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2186.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket2186.java
@@ -16,7 +16,7 @@ public class Ticket2186 extends Application {
         setMainWindow(main);
 
         HorizontalLayout base = new HorizontalLayout();
-        main.setLayout(base);
+        main.setContent(base);
 
         VerticalLayout content = new VerticalLayout();
 
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2267.java b/tests/src/com/vaadin/tests/tickets/Ticket2267.java
index b55776be79..020ea5c7c6 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2267.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket2267.java
@@ -35,7 +35,7 @@ public class Ticket2267 extends Application {
         gl.addComponent(new Label("3"));
         gl.addComponent(new Label("4"));
 
-        w.setLayout(gl);
+        w.setContent(gl);
 
     }
 }
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2283.java b/tests/src/com/vaadin/tests/tickets/Ticket2283.java
index 6bc578099d..7a78928161 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2283.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket2283.java
@@ -21,7 +21,7 @@ public class Ticket2283 extends Application {
         Label l = new Label("Colspan2, align right");
         gl.addComponent(l, 0, 1, 1, 1);
         gl.setComponentAlignment(l, AlignmentHandler.ALIGNMENT_RIGHT, AlignmentHandler.ALIGNMENT_TOP);
-        w.setLayout(gl);
+        w.setContent(gl);
 
     }
 
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2289.java b/tests/src/com/vaadin/tests/tickets/Ticket2289.java
index 177ec74fc1..19574b50fb 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2289.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket2289.java
@@ -22,7 +22,7 @@ public class Ticket2289 extends Application {
         Window w = new Window();
         setMainWindow(w);
         VerticalLayout ol = new VerticalLayout();
-        w.setLayout(ol);
+        w.setContent(ol);
         Button b = new Button("close current tab");
         b.addListener(new Button.ClickListener() {
             public void buttonClick(ClickEvent event) {
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2296.java b/tests/src/com/vaadin/tests/tickets/Ticket2296.java
index e4eb3e7a1d..1503811341 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2296.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket2296.java
@@ -27,7 +27,7 @@ public class Ticket2296 extends Application {
         b.setHeight("50%");
         cl.addComponent(b, "button3");
 
-        w.setLayout(cl);
+        w.setContent(cl);
     }
 
 }
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2303.java b/tests/src/com/vaadin/tests/tickets/Ticket2303.java
index ec00f17bc5..35260509aa 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2303.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket2303.java
@@ -24,10 +24,10 @@ public class Ticket2303 extends Application {
             e.printStackTrace();

         }

         cl.setWidth("100%");

-        w.setLayout(cl);

+        w.setContent(cl);

 

         // VerticalLayout ol = new VerticalLayout();

-        // w.setLayout(ol);

+        // w.setContent(ol);

         VerticalLayout hugeLayout = new VerticalLayout();

         hugeLayout.setMargin(true);

         hugeLayout.setSpacing(true);

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2344.java b/tests/src/com/vaadin/tests/tickets/Ticket2344.java
index cb36fbca9e..6e4a427db7 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2344.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket2344.java
@@ -23,7 +23,7 @@ public class Ticket2344 extends Application {
 
         VerticalLayout hl = new VerticalLayout();
         hl.setWidth("400px");
-        main.setLayout(hl);
+        main.setContent(hl);
 
         Table t = new Table();
         t.setWidth("100%");
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2365.java b/tests/src/com/vaadin/tests/tickets/Ticket2365.java
index bd8bbc05af..2d82d056f4 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2365.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket2365.java
@@ -17,7 +17,7 @@ public class Ticket2365 extends Application {
 
         VerticalLayout lo = new VerticalLayout();
         lo.setSizeFull();
-        mainWin.setLayout(lo);
+        mainWin.setContent(lo);
 
         final Panel p = createMultilevelPanel(5, (Panel) null);
 
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2406.java b/tests/src/com/vaadin/tests/tickets/Ticket2406.java
index 22ff32d036..78ffa8a231 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2406.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket2406.java
@@ -26,7 +26,7 @@ public class Ticket2406 extends Application {
 
         VerticalLayout l = new VerticalLayout();
         l.setSizeFull();
-        w.setLayout(l);
+        w.setContent(l);
 
         Button b = new Button("Button 1");
         b.setSizeFull();
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2411.java b/tests/src/com/vaadin/tests/tickets/Ticket2411.java
index 89279002f5..5fa84d3699 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2411.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket2411.java
@@ -14,7 +14,7 @@ public class Ticket2411 extends Application {
 

         // VerticalLayout l = new VerticalLayout();

         GridLayout l = new GridLayout();

-        w.setLayout(l);

+        w.setContent(l);

 

         l.setHeight("504px");

 

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2998.java b/tests/src/com/vaadin/tests/tickets/Ticket2998.java
index a5bb5a56b5..958b4c51ed 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2998.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket2998.java
@@ -262,7 +262,7 @@ public class Ticket2998 extends Application {
         p.setStyleName(Panel.STYLE_LIGHT);

         w.addComponent(p);

         mainLayout = new VerticalLayout();

-        p.setLayout(mainLayout);

+        p.setContent(mainLayout);

 

         populateAndConfigureTable();

 

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket677.java b/tests/src/com/vaadin/tests/tickets/Ticket677.java
index 3e853f3504..691dbadd22 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket677.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket677.java
@@ -66,7 +66,7 @@ public class Ticket677 extends Application {
             }

         }));

 

-        root.setLayout(new GridLayout(2, 3));

+        root.setContent(new GridLayout(2, 3));

         main.addComponent(root);

 

         TextField tf = new TextField("Enabled");