Panel/Window setLayout() -> setContent()

svn changeset:15432/svn branch:6.5

diff --git a/tests/src/com/vaadin/tests/Parameters.java b/tests/src/com/vaadin/tests/Parameters.java
index faa318298b85e53d0f08f330f83dc376e564fd53..7bc6fb5cc43d33094e8828acc79153e2e8452615 100644 (file)
--- 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 49f989e972b9e003cb4891e2caaf9d47c524bb4f..8d789c1b29b824bdbe30659a404c90a02269802a 100644 (file)
--- 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 0a2589770cc634960f192c2ce8752b2c735ea2f6..19ae601d36e24432fae8661f8150cec7721ef919 100644 (file)
--- 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 628fec96d29fe8f17933361f6494b751c2547105..21e04154adc5c7633d5215f4643e3c88924cc0a2 100644 (file)
--- 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 6956eee017d354699989680f1ab6b09761b0e919..5858366a638c6d6b19932ee5b1ca263443eab3fc 100644 (file)
--- 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();\r
 \r
         tablePanel = new Panel();\r
-        tablePanel.setLayout(tableLayout);\r
+        tablePanel.setContent(tableLayout);\r
 \r
         addComponent(tablePanel);\r
     }\r

diff --git a/tests/src/com/vaadin/tests/components/form/FormWithRelativelySizedLayout.java b/tests/src/com/vaadin/tests/components/form/FormWithRelativelySizedLayout.java
index 17fe4477c351a7ab1cb7e964951c90bb5b46250a..1c3736cb98d89881869ad2b4977a39f7fb6584d7 100644 (file)
--- 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 90add959f1f9be31c1724e83436edc7e8198e4c5..9c3b2de3e007c90341e41e570cf7083cb6843d67 100644 (file)
--- 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();\r
             // setTheme("testtheme");\r
             VerticalLayout baseLayout = new VerticalLayout();\r
-            main.setLayout(baseLayout);\r
+            main.setContent(baseLayout);\r
 \r
             table = new Table();\r
             container.addContainerProperty("row", String.class, "");\r

diff --git a/tests/src/com/vaadin/tests/featurebrowser/FeaturesApplication.java b/tests/src/com/vaadin/tests/featurebrowser/FeaturesApplication.java
index 2b1f48075cb14daf7c8f6189d53f250cba5d06b5..8bbbad5d3141b6c3014baa437ebfe47c7d72e0ae 100644 (file)
--- 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 fc280c0ce240ca4a8d0b38760500ad8e0abd6b9f..002ecfa56153cd5cc557f7a73b2d8000908a632c 100644 (file)
--- 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 {
         }\r
         layout.addComponent(new Label(\r
                 "FF did it! Vaadin, Mozilla and you win! Dare to try again?"));\r
-        root.setLayout(r);\r
+        root.setContent(r);\r
     }\r
 \r
     Layout getTestLayout() {\r

diff --git a/tests/src/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java b/tests/src/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java
index 0a50dc326dd037a9dfe90d0a0c88e1ca2b9b89a4..e9d206009ae9be807ac99dc8f1a1a9182103c069 100644 (file)
--- 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 699522e18bf1ca326257b71f1b4bef128f0f5605..bbac07d20f4745376c5af7beceaea4585a6270a2 100644 (file)
--- 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() {\r
         Window main = new Window("The Main Window");\r
         mainLayout = new VerticalLayout();\r
-        main.setLayout(mainLayout);\r
+        main.setContent(mainLayout);\r
         setMainWindow(main);\r
 \r
         // The upper layout\r

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1230.java b/tests/src/com/vaadin/tests/tickets/Ticket1230.java
index 82cc3748e226b5891e7cbf3a2ca1ea9592f6b68c..5b08107df0a1ef714c0430c94e93fb13ad2e0948 100644 (file)
--- 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 a6f9cbf2af3f4367afb38fbb236f38ba2d8ea0b3..ff21ce479d37dfdeb61475185df09f5f754ba51b 100644 (file)
--- 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 7905328f8e03fc09b3385524f72a1e66e135d245..8a2a39a16944dbeee8f5f7dd9077313c0cdb539f 100644 (file)
--- 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 {
 \r
         Panel p = new Panel("Test wrapper for gridlayout margin/spacing");\r
 \r
-        p.setLayout(new HorizontalLayout());\r
+        p.setContent(new HorizontalLayout());\r
 \r
         gl = new GridLayout(3, 3);\r
         gl.setMargin(true);\r

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1737.java b/tests/src/com/vaadin/tests/tickets/Ticket1737.java
index 5e29182b7ac1e255e0e95782343a89badb59da64..f90ccc48b23caeaa19d8572aaba284e159454870 100644 (file)
--- 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 ecc076ee155305820a5074500611a7cc24abe593..549ab2126d4032ab09de2d39e1438540e29e7bed 100644 (file)
--- 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");\r
 \r
         mainLayout = new GridLayout(1, 2);\r
-        w.setLayout(mainLayout);\r
+        w.setContent(mainLayout);\r
         orderedLayout = createOL();\r
         gridLayout = createGL();\r
         formLayout = createForms();\r
@@ -80,7 +80,7 @@ public class Ticket1878 extends Application {
 \r
         mainLayout.addComponent(buttonLayout);\r
         mainLayout.addComponent(orderedLayout);\r
-        // w.setLayout(orderedLayout);\r
+        // w.setContent(orderedLayout);\r
     }\r
 \r
     private static Layout createOL() {\r

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1919.java b/tests/src/com/vaadin/tests/tickets/Ticket1919.java
index 02935f9ea19019ca2ca0fad14bb874eb83c5f2c4..0733d0c9f00439719efe28488215daae5f0d21bb 100644 (file)
--- 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());\r
         lo.addComponent(getTestComponent());\r
 \r
-        main.setLayout(lo);\r
+        main.setContent(lo);\r
 \r
     }\r
 \r

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1923.java b/tests/src/com/vaadin/tests/tickets/Ticket1923.java
index 6ba41cad8ba1418cd5ff7ec2b06fabfd6ea77c3e..c819d4c6b5b116d0d8968b7b9ef9a7afebbbac57 100644 (file)
--- 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");\r
         // p.getLayout().setWidth("100%");\r
         p.setScrollable(true);\r
-        // p.setLayout(new GridLayout(1, 100));\r
+        // p.setContent(new GridLayout(1, 100));\r
         for (int i = 0; i < ROWS; i++) {\r
             p.addComponent(new Label("Label" + i + " 5067w09adsfasdjfahlsdfjhalfjhaldjfhalsjdfhlajdhflajhdfljahdslfjahldsjfhaljdfhaljfdhlajsdhflajshdflkajhsdlfkjahsldfkjahsldfhalskjfdhlksjfdh857idifhaljsdfhlajsdhflajhdflajhdfljahldfjhaljdfhalsjdfhalkjdhflkajhdfljahsdlfjahlsdjfhaldjfhaljfdhlajdhflajshdfljahsdlfjhalsjdfhalskjhfdlhusfglksuhdflgjshflgjhslfghslfjghsljfglsjhfglsjhfgljshfgljshflgjhslfghsljfgsljdfglsdjhfglsjhflgkjshfldjgh"));\r
         }\r

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1966_2.java b/tests/src/com/vaadin/tests/tickets/Ticket1966_2.java
index ce9e936fc05340ebc775102053ab5ca92a21bd4b..2c639f73b6f270df439a84c2a0cd18a409bc260a 100644 (file)
--- 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() {\r
         Window w = new Window(getClass().getName());\r
         setMainWindow(w);\r
-        w.setLayout(new GridLayout(2, 2));\r
+        w.setContent(new GridLayout(2, 2));\r
 \r
         // Panel p = new Panel("test");\r
         // p.setWidth(500);\r
         // p.setHeight(500);\r
-        // p.setLayout(new GridLayout(1, 2));\r
+        // p.setContent(new GridLayout(1, 2));\r
         // p.getLayout().setSizeFull();\r
         //\r
         // p.addComponent(new Button("asjkdfhakshdf"));\r

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1966_3.java b/tests/src/com/vaadin/tests/tickets/Ticket1966_3.java
index 4a4b336eb99de7040514942448d86a5d61f70790..e8a2c2bc3cd057f4ed75f60a302514dd048e0c2a 100644 (file)
--- 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);\r
         // setTheme("tests-tickets");\r
         GridLayout layout = new GridLayout(10, 10);\r
-        w.setLayout(layout);\r
+        w.setContent(layout);\r
         createUI(layout);\r
     }\r
 \r

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1972.java b/tests/src/com/vaadin/tests/tickets/Ticket1972.java
index 6cbbbb9f9294e39ccbc4b1845fded7dc4852489f..86d5b0f11d3c615eeabbd34afb837c9a65cfc9fa 100644 (file)
--- 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();\r
         layout.addComponent(new Label("3-3"));\r
 \r
-        w.setLayout(layout);\r
+        w.setContent(layout);\r
     }\r
 \r
 }\r

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1975.java b/tests/src/com/vaadin/tests/tickets/Ticket1975.java
index 2ea60f314fbec5ba0ef24fd77f919f179fdc5e2b..3391aa1f3008c9ab488b478ba4e84d2d46d815ca 100644 (file)
--- 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);\r
         setTheme("tests-tickets");\r
         GridLayout layout = new GridLayout(1, 10);\r
-        w.setLayout(layout);\r
+        w.setContent(layout);\r
         createUI(layout);\r
     }\r
 \r

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1982.java b/tests/src/com/vaadin/tests/tickets/Ticket1982.java
index 68bdbeb38891c9c950d71350f87998fed84993be..8d066c0938686ee866edf7487e1b8f50d5cbca92 100644 (file)
--- 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 be4e5f3fcf558bb005430553980977f4ea176401..6ffd6ddb9f50e5505ce7cbfed452237f55c71d1c 100644 (file)
--- 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 1b96f7bd39afa904fe346098789941b384a3427e..f2a173bcb02b0dd384f2ab82bff527498715062e 100644 (file)
--- 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);\r
         layout.addComponent(f1);\r
 \r
-        w.setLayout(layout);\r
+        w.setContent(layout);\r
 \r
     }\r
 \r

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2002.java b/tests/src/com/vaadin/tests/tickets/Ticket2002.java
index 1e3b4e241a3650c4b9b79067c7cfab7213e87485..b5db161b8b66c28efd6b5cb769d4fa3e64d02de9 100644 (file)
--- 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);\r
         layout.addComponent(f2);\r
 \r
-        w.setLayout(layout);\r
+        w.setContent(layout);\r
     }\r
 }\r

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2009.java b/tests/src/com/vaadin/tests/tickets/Ticket2009.java
index 8aa55db731b868df83ad2e297663777f9e65d397..7e5cea3c43d5eabf801a6b80baf9fff97d65663b 100644 (file)
--- 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);\r
 \r
         HorizontalLayout ol = new HorizontalLayout();\r
-        main.setLayout(ol);\r
+        main.setContent(ol);\r
         ol.setSizeFull();\r
 \r
         Panel p = new Panel("Tree test");\r

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2011.java b/tests/src/com/vaadin/tests/tickets/Ticket2011.java
index d4e5890635483627f05347a42318d263b854c337..e28ee9b4e2c042456fd633208663ffc5d1156d62 100644 (file)
--- 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);\r
         // setTheme("tests-ticket");\r
         GridLayout layout = new GridLayout(10, 10);\r
-        w.setLayout(layout);\r
+        w.setContent(layout);\r
         createUI(layout);\r
     }\r
 \r

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2022.java b/tests/src/com/vaadin/tests/tickets/Ticket2022.java
index 9dfcabc20812662055656dcab0470c7864c9a6e4..17df2a27005f51a13c6732540e07675e1f5f0597 100644 (file)
--- 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");\r
         // try {\r
         // l = new CustomLayout(new FileInputStream(f));\r
-        w.setLayout(l);\r
+        w.setContent(l);\r
         // } catch (FileNotFoundException e) {\r
         // // TODO Auto-generated catch block\r
         // e.printStackTrace();\r

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2026.java b/tests/src/com/vaadin/tests/tickets/Ticket2026.java
index 4bbb9057ff3c3bc02ec9f6adba49569c6bb24560..be329eb5b597be5910164be98f5e12d3ac756955 100644 (file)
--- 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);\r
         layout.addComponent(tf);\r
 \r
-        w.setLayout(layout);\r
+        w.setContent(layout);\r
     }\r
 }\r

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2029.java b/tests/src/com/vaadin/tests/tickets/Ticket2029.java
index e79db104ad0a910b0a1ce93554dd2ff894cba896..4e2dee51914a88a7ca124736ca7520cbf288db04 100644 (file)
--- 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");\r
 \r
         HorizontalLayout layout = new HorizontalLayout();\r
-        p.setLayout(layout);\r
+        p.setContent(layout);\r
         p.getLayout().setSizeFull();\r
 \r
         for (int i = 0; i < COMPONENTS; i++) {\r
@@ -71,7 +71,7 @@ public class Ticket2029 extends Application {
         p.setHeight("" + DIM2 + "px");\r
 \r
         GridLayout layout = new GridLayout(COMPONENTS, 1);\r
-        p.setLayout(layout);\r
+        p.setContent(layout);\r
         p.getLayout().setSizeFull();\r
 \r
         for (int i = 0; i < COMPONENTS; i++) {\r
@@ -109,7 +109,7 @@ public class Ticket2029 extends Application {
         p.setHeight("" + DIM1 + "px");\r
 \r
         VerticalLayout layout = new VerticalLayout();\r
-        p.setLayout(layout);\r
+        p.setContent(layout);\r
         p.getLayout().setSizeFull();\r
 \r
         for (int i = 0; i < COMPONENTS; i++) {\r

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2042.java b/tests/src/com/vaadin/tests/tickets/Ticket2042.java
index 0c7bede4b852125dd32f41a0de04a9e6dffc9c45..2dfe4a1cb547fb165e859592d5a22202395479e4 100644 (file)
--- 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");\r
         GridLayout layout = new GridLayout(1, 2);\r
         layout.setHeight("2000px");\r
-        w.setLayout(layout);\r
+        w.setContent(layout);\r
         createUI(layout);\r
     }\r
 \r

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2043.java b/tests/src/com/vaadin/tests/tickets/Ticket2043.java
index 3a2ce269de8b29235c32fafa6f3abcd2ffd5b23a..c502803c652ee8f5b36c7bedda9660f91d876b09 100644 (file)
--- 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);\r
         // setTheme("tests-tickets");\r
         GridLayout layout = new GridLayout(10, 10);\r
-        w.setLayout(layout);\r
+        w.setContent(layout);\r
         createUI(layout);\r
     }\r
 \r

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2048.java b/tests/src/com/vaadin/tests/tickets/Ticket2048.java
index 5ad2ef79c443ab8662fd22963db51f26efc1d22c..0c411530013b7a125d289be42447fdf5765970dc 100644 (file)
--- 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);\r
         // setTheme("tests-tickets");\r
         // splitPanel = new SplitPanel(SplitPanel.ORIENTATION_HORIZONTAL);\r
-        // getMainWindow().setLayout(splitPanel);\r
+        // getMainWindow().setContent(splitPanel);\r
 \r
         // GridLayout layout = new GridLayout(10, 10);\r
-        // w.setLayout(layout);\r
+        // w.setContent(layout);\r
         // gridLayout = new GridLayout(1, 1);\r
         orderedLayout = new VerticalLayout();\r
 \r
-        getMainWindow().setLayout(orderedLayout);\r
-        // getMainWindow().setLayout(new GridLayout(1, 1));\r
+        getMainWindow().setContent(orderedLayout);\r
+        // getMainWindow().setContent(new GridLayout(1, 1));\r
         getMainWindow().setSizeFull();\r
         getMainWindow().getLayout().setSizeFull();\r
 \r
@@ -51,9 +51,9 @@ public class Ticket2048 extends Application {
         // public void buttonClick(ClickEvent event) {\r
         // Layout l = getMainWindow().getLayout();\r
         // if (l == orderedLayout) {\r
-        // getMainWindow().setLayout(gridLayout);\r
+        // getMainWindow().setContent(gridLayout);\r
         // } else {\r
-        // getMainWindow().setLayout(orderedLayout);\r
+        // getMainWindow().setContent(orderedLayout);\r
         // }\r
         //\r
         // }\r

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2051.java b/tests/src/com/vaadin/tests/tickets/Ticket2051.java
index b31acbde114a415e69d6c4d01e5e524f8c8ad1bf..e901ebc343a55c750a4ae9aa13aec3e481dee681 100644 (file)
--- 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);\r
         // setTheme("tests-tickets");\r
         GridLayout layout = new GridLayout(10, 10);\r
-        w.setLayout(layout);\r
+        w.setContent(layout);\r
         createUI(layout);\r
     }\r
 \r

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2060.java b/tests/src/com/vaadin/tests/tickets/Ticket2060.java
index 672c0b8957d175c923f54ccf9b4f50ba357dd80d..63bf5b3ff7011ac265fd772445eadb85b111e6b4 100644 (file)
--- 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);\r
         // setTheme("tests-tickets");\r
         GridLayout layout = new GridLayout(10, 10);\r
-        w.setLayout(layout);\r
+        w.setContent(layout);\r
         createUI(layout);\r
     }\r
 \r

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2062.java b/tests/src/com/vaadin/tests/tickets/Ticket2062.java
index e5650ae18cba560bf0d0858d347299f3ca15c32a..8c459d367db3d067673a71033eb97b6042764624 100644 (file)
--- 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 {
 \r
         SplitPanel p = new SplitPanel(SplitPanel.ORIENTATION_HORIZONTAL);\r
         p.setSizeFull();\r
-        getMainWindow().setLayout(p);\r
+        getMainWindow().setContent(p);\r
 \r
         TextField tf1 = new TextField("Tab 1");\r
         tf1.setValue("Field 1");\r

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2083.java b/tests/src/com/vaadin/tests/tickets/Ticket2083.java
index fd9c94743bf25b1511dea904567a021c46955de7..2eae3aa0ed6cc7bd34afe9ef4337bdddf9032694 100644 (file)
--- 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);\r
         // setTheme("tests-tickets");\r
         GridLayout layout = new GridLayout(10, 10);\r
-        w.setLayout(layout);\r
+        w.setContent(layout);\r
         createUI(layout);\r
     }\r
 \r

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2095.java b/tests/src/com/vaadin/tests/tickets/Ticket2095.java
index 5fcab528c1841b4eb78e4ec236e25f957be350cc..240d21facdd4ca893f6fcff6db78e03cdee146ab 100644 (file)
--- 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);\r
 \r
         // uncomment to workaround iorderedlayout bug in current trunk\r
-        // w.setLayout(new ExpandLayout());\r
+        // w.setContent(new ExpandLayout());\r
         w.getLayout().setSizeFull();\r
 \r
         Embedded em = new Embedded();\r

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2099.java b/tests/src/com/vaadin/tests/tickets/Ticket2099.java
index b4a5f2c450059b49038456c711f40d0b30d582d9..4f79eb7e64e44b4b40ee126229a6a5ffbd751895 100644 (file)
--- 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);\r
         // setTheme("tests-tickets");\r
         GridLayout layout = new GridLayout(10, 10);\r
-        w.setLayout(layout);\r
+        w.setContent(layout);\r
         createUI(layout);\r
     }\r
 \r

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2119.java b/tests/src/com/vaadin/tests/tickets/Ticket2119.java
index 3c516a6ee56d92b6d153d70a9fe67b2427cfbe58..903d4422181b5383dfe81ac913ce7bbe67307fab 100644 (file)
--- 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 ce06f4576bbb8e8f4824d5637fff303dc7da1068..bc9ff8c27d13c060e8ae024cd5ad3f0098abd6bb 100644 (file)
--- 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 b55776be7941aa1295a535b2ed3b1a250cf8f72d..020ea5c7c618c1fe3f14856c256da3673578aaa3 100644 (file)
--- 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 6bc578099d04481d8da5ca2c60542c520fd0eae7..7a7892816161e3e7584f4b07af730ec8bcd48fc0 100644 (file)
--- 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 177ec74fc18819660c622927ccfe6f230f07b1ae..19574b50fb7df9ac4c0dc8ae53f2d9c1fad382f3 100644 (file)
--- 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 e4eb3e7a1dd9126557dff6e7aa2ff1b5a1128e13..15038113414211114e72fe62c441786f0474beb4 100644 (file)
--- 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 ec00f17bc52070c08defaceca00c038fba0e933c..35260509aa6f59dddee4c0cd57b987174938f7ba 100644 (file)
--- 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();\r
         }\r
         cl.setWidth("100%");\r
-        w.setLayout(cl);\r
+        w.setContent(cl);\r
 \r
         // VerticalLayout ol = new VerticalLayout();\r
-        // w.setLayout(ol);\r
+        // w.setContent(ol);\r
         VerticalLayout hugeLayout = new VerticalLayout();\r
         hugeLayout.setMargin(true);\r
         hugeLayout.setSpacing(true);\r

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2344.java b/tests/src/com/vaadin/tests/tickets/Ticket2344.java
index cb36fbca9e5a4ce87f4bfcdec7f6bb27d0c4cbd5..6e4a427db7727285501647b79fa2c14a443df063 100644 (file)
--- 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 bd8bbc05afd8dfb8d30b182542673c9a443b0748..2d82d056f48af3c3fe602fba31cd0d8adb746989 100644 (file)
--- 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 22ff32d036078115e218b60759cfbee0cfdc9ab6..78ffa8a231739856d8087c8fc16df71fc19cb954 100644 (file)
--- 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 89279002f51f6f915555867a569cbf37571dbe81..5fa84d369931dac6aaa43bc2ef0e38acfbc8fdfc 100644 (file)
--- 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 {
 \r
         // VerticalLayout l = new VerticalLayout();\r
         GridLayout l = new GridLayout();\r
-        w.setLayout(l);\r
+        w.setContent(l);\r
 \r
         l.setHeight("504px");\r
 \r

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2998.java b/tests/src/com/vaadin/tests/tickets/Ticket2998.java
index a5bb5a56b5cc00e4115091ac4d6691e4ee246838..958b4c51ed26a518ad65ac5251661f996ace38d8 100644 (file)
--- 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);\r
         w.addComponent(p);\r
         mainLayout = new VerticalLayout();\r
-        p.setLayout(mainLayout);\r
+        p.setContent(mainLayout);\r
 \r
         populateAndConfigureTable();\r
 \r

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket677.java b/tests/src/com/vaadin/tests/tickets/Ticket677.java
index 3e853f3504840d9cd4849e86d85c4b70d0ca1423..691dbadd226d14afbe24ba2c39c1d3fab7631565 100644 (file)
--- 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 {
             }\r
         }));\r
 \r
-        root.setLayout(new GridLayout(2, 3));\r
+        root.setContent(new GridLayout(2, 3));\r
         main.addComponent(root);\r
 \r
         TextField tf = new TextField("Enabled");\r