Major layout API changes: Sizeable is now deprecated. Use HasSize-interface instead in combination with Size object (see ExpandLayout.java for example). OrderedLayout is no longer sizable. Table and Panel implement compatibility methods to proxy old size calls to the new Size object.

svn changeset:3228/svn branch:trunk

1 files changed, 9 insertions, 11 deletions

diff --git a/src/com/itmill/toolkit/tests/TestForBasicApplicationLayout.java b/src/com/itmill/toolkit/tests/TestForBasicApplicationLayout.java
index 8b0f6b5ca2..b2f90d2212 100644
--- a/src/com/itmill/toolkit/tests/TestForBasicApplicationLayout.java
+++ b/src/com/itmill/toolkit/tests/TestForBasicApplicationLayout.java
@@ -6,7 +6,7 @@ package com.itmill.toolkit.tests;
 

 import java.util.Locale;

 

-import com.itmill.toolkit.terminal.Sizeable;

+import com.itmill.toolkit.terminal.Size;

 import com.itmill.toolkit.ui.Button;

 import com.itmill.toolkit.ui.CustomComponent;

 import com.itmill.toolkit.ui.DateField;

@@ -31,7 +31,7 @@ public class TestForBasicApplicationLayout extends CustomComponent {
         click = new Button("Set height -1", new ClickListener() {

 

             public void buttonClick(ClickEvent event) {

-                tab.setHeight(-1);

+                tab.getSize().setHeight(-1);

             }

 

         });

@@ -39,23 +39,22 @@ public class TestForBasicApplicationLayout extends CustomComponent {
         click2 = new Button("Set height 100%", new ClickListener() {

 

             public void buttonClick(ClickEvent event) {

-                tab.setHeight(100);

-                tab.setHeightUnits(Sizeable.UNITS_PERCENTAGE);

+                tab.getSize().setHeight(100, Size.UNITS_PERCENTAGE);

             }

 

         });

 

         final SplitPanel sp = new SplitPanel(SplitPanel.ORIENTATION_HORIZONTAL);

-        sp.setSplitPosition(290, Sizeable.UNITS_PIXELS);

+        sp.setSplitPosition(290, Size.UNITS_PIXELS);

 

         final SplitPanel sp2 = new SplitPanel(SplitPanel.ORIENTATION_VERTICAL);

-        sp2.setSplitPosition(255, Sizeable.UNITS_PIXELS);

+        sp2.setSplitPosition(255, Size.UNITS_PIXELS);

 

         final Panel p = new Panel("Accordion Panel");

-        p.setSizeFull();

+        p.getSize().setSizeFull();

 

         tab = new TabSheet();

-        tab.setSizeFull();

+        tab.getSize().setSizeFull();

 

         final Panel report = new Panel("Monthly Program Runs",

                 new ExpandLayout());

@@ -71,8 +70,7 @@ public class TestForBasicApplicationLayout extends CustomComponent {
         report.addComponent(cal);

         ((ExpandLayout) report.getLayout()).expand(controls);

         report.addStyleName(Panel.STYLE_LIGHT);

-        report.setHeight(100);

-        report.setHeightUnits(Sizeable.UNITS_PERCENTAGE);

+        report.getSize().setHeight(100, Size.UNITS_PERCENTAGE);

 

         sp2.setFirstComponent(report);

 

@@ -84,7 +82,7 @@ public class TestForBasicApplicationLayout extends CustomComponent {
         table.setColumnCollapsingAllowed(true);

         table.setColumnReorderingAllowed(true);

         table.setSortDisabled(false);

-        table.setSizeFull();

+        table.getSize().setSizeFull();

         table.addStyleName("table-inline");

         sp2.setSecondComponent(table);