component implements sizeable and simple general terminal implementation

svn changeset:3662/svn branch:trunk

60 files changed, 441 insertions, 717 deletions

diff --git a/src/com/itmill/toolkit/demo/BrowserDemo.java b/src/com/itmill/toolkit/demo/BrowserDemo.java
index e4b70b2bee..13d4bc5d0c 100644
--- a/src/com/itmill/toolkit/demo/BrowserDemo.java
+++ b/src/com/itmill/toolkit/demo/BrowserDemo.java
@@ -37,7 +37,7 @@ public class BrowserDemo extends com.itmill.toolkit.Application implements
         // possible.
         final ExpandLayout exl = new ExpandLayout();
         browser.setLayout(exl);
-        exl.getSize().setSizeFull();
+        exl.setSizeFull();
 
         // create the address combobox
         final Select select = new Select();
diff --git a/src/com/itmill/toolkit/demo/LayoutDemo.java b/src/com/itmill/toolkit/demo/LayoutDemo.java
index 0704a22dcd..a3a671dffe 100644
--- a/src/com/itmill/toolkit/demo/LayoutDemo.java
+++ b/src/com/itmill/toolkit/demo/LayoutDemo.java
@@ -127,7 +127,7 @@ public class LayoutDemo extends com.itmill.toolkit.Application {
                                 + " Panel contains an layout where the actual contained components are added, "
                                 + "this layout may be switched on the fly.",
                         Label.CONTENT_XHTML));
-        panel.getSize().setWidth(222);
+        panel.setWidth(222);
         return panel;
     }
 
diff --git a/src/com/itmill/toolkit/demo/NativeWindowing.java b/src/com/itmill/toolkit/demo/NativeWindowing.java
index 4d98203cdc..7dadd7c4bb 100644
--- a/src/com/itmill/toolkit/demo/NativeWindowing.java
+++ b/src/com/itmill/toolkit/demo/NativeWindowing.java
@@ -29,11 +29,11 @@ public class NativeWindowing extends Application {
                         main.addWindow(w);
                         w.setPositionX(100);
                         w.setPositionY(100);
-                        w.getSize().setWidth(200);
-                        w.getSize().setHeight(200);
+                        w.setWidth(200);
+                        w.setHeight(200);
 
-                        w.getSize().setWidth(100);
-                        w.getSize().setHeight(400);
+                        w.setWidth(100);
+                        w.setHeight(400);
 
                         final Button closebutton = new Button("Close "
                                 + w.getCaption(), new Button.ClickListener() {
diff --git a/src/com/itmill/toolkit/demo/Parameters.java b/src/com/itmill/toolkit/demo/Parameters.java
index 65e203c729..5c306b6461 100644
--- a/src/com/itmill/toolkit/demo/Parameters.java
+++ b/src/com/itmill/toolkit/demo/Parameters.java
@@ -73,7 +73,7 @@ public class Parameters extends com.itmill.toolkit.Application implements
         params.addContainerProperty("Key", String.class, "");
         params.addContainerProperty("Value", String.class, "");
         final Panel panel2 = new Panel("Parameter Handler");
-        params.getSize().setSizeFull();
+        params.setSizeFull();
         panel2.setLayout(new ExpandLayout());
         panel2.getLayout().setMargin(true);
 
diff --git a/src/com/itmill/toolkit/demo/TreeFilesystem.java b/src/com/itmill/toolkit/demo/TreeFilesystem.java
index 79f7c3624d..7fa1f3a1f4 100644
--- a/src/com/itmill/toolkit/demo/TreeFilesystem.java
+++ b/src/com/itmill/toolkit/demo/TreeFilesystem.java
@@ -42,7 +42,7 @@ public class TreeFilesystem extends com.itmill.toolkit.Application implements
         // configure file structure panel
         main.addComponent(explorerPanel);
         explorerPanel.addComponent(tree);
-        explorerPanel.getSize().setHeight(400);
+        explorerPanel.setHeight(400);
 
         // "this" handles tree's expand event
         tree.addListener(this);
diff --git a/src/com/itmill/toolkit/demo/TreeFilesystemContainer.java b/src/com/itmill/toolkit/demo/TreeFilesystemContainer.java
index 972af336b9..efff2932f6 100644
--- a/src/com/itmill/toolkit/demo/TreeFilesystemContainer.java
+++ b/src/com/itmill/toolkit/demo/TreeFilesystemContainer.java
@@ -9,7 +9,6 @@ import java.io.File;
 import com.itmill.toolkit.data.util.FilesystemContainer;
 import com.itmill.toolkit.data.util.FilesystemContainer.FileItem;
 import com.itmill.toolkit.demo.util.SampleDirectory;
-import com.itmill.toolkit.terminal.Size;
 import com.itmill.toolkit.ui.ExpandLayout;
 import com.itmill.toolkit.ui.Field;
 import com.itmill.toolkit.ui.Label;
@@ -51,10 +50,10 @@ public class TreeFilesystemContainer extends com.itmill.toolkit.Application
         main.setMargin(true);
         main.setSpacing(true);
 
-        propertyPanel.getSize().setHeight(120);
+        propertyPanel.setHeight(120);
         main.addComponent(propertyPanel);
-        explorerPanel.getSize().setHeight(100);
-        explorerPanel.getSize().setHeightUnits(Size.UNITS_PERCENTAGE);
+        explorerPanel.setHeight(100);
+        explorerPanel.setHeightUnits(Panel.UNITS_PERCENTAGE);
         main.addComponent(explorerPanel);
         main.expand(explorerPanel);
 
diff --git a/src/com/itmill/toolkit/demo/WindowedDemos.java b/src/com/itmill/toolkit/demo/WindowedDemos.java
index f0102ac110..6ec59bf629 100644
--- a/src/com/itmill/toolkit/demo/WindowedDemos.java
+++ b/src/com/itmill/toolkit/demo/WindowedDemos.java
@@ -45,8 +45,8 @@ public class WindowedDemos extends com.itmill.toolkit.Application {
 
         // Create menu window.
         final Window menu = new Window("Select demo");
-        menu.getSize().setWidth(200);
-        menu.getSize().setHeight(400);
+        menu.setWidth(200);
+        menu.setHeight(400);
         main.addWindow(menu); // add to layout
 
         // Create a menu button for each demo
@@ -75,8 +75,8 @@ public class WindowedDemos extends com.itmill.toolkit.Application {
         Window w = (Window) windows.get(demoName);
         if (w == null) {
             w = new Window(demoName);
-            w.getSize().setWidth(520);
-            w.getSize().setHeight(500);
+            w.setWidth(520);
+            w.setHeight(500);
             w.setPositionX(202);
             windows.put(demoName, w);
             getMainWindow().addWindow(w);
diff --git a/src/com/itmill/toolkit/demo/featurebrowser/EmbeddedBrowserExample.java b/src/com/itmill/toolkit/demo/featurebrowser/EmbeddedBrowserExample.java
index d592be5b53..7391fc135e 100644
--- a/src/com/itmill/toolkit/demo/featurebrowser/EmbeddedBrowserExample.java
+++ b/src/com/itmill/toolkit/demo/featurebrowser/EmbeddedBrowserExample.java
@@ -34,7 +34,7 @@ public class EmbeddedBrowserExample extends ExpandLayout implements
     }
 
     public EmbeddedBrowserExample(String[] urls) {
-        getSize().setSizeFull();
+        setSizeFull();
 
         // create the address combobox
         final Select select = new Select();
diff --git a/src/com/itmill/toolkit/demo/featurebrowser/FeatureBrowser.java b/src/com/itmill/toolkit/demo/featurebrowser/FeatureBrowser.java
index c1989d597a..14f7ab0442 100644
--- a/src/com/itmill/toolkit/demo/featurebrowser/FeatureBrowser.java
+++ b/src/com/itmill/toolkit/demo/featurebrowser/FeatureBrowser.java
@@ -12,7 +12,6 @@ import com.itmill.toolkit.data.Property.ValueChangeEvent;
 import com.itmill.toolkit.data.util.HierarchicalContainer;
 import com.itmill.toolkit.data.util.IndexedContainer;
 import com.itmill.toolkit.terminal.ExternalResource;
-import com.itmill.toolkit.terminal.Size;
 import com.itmill.toolkit.terminal.ThemeResource;
 import com.itmill.toolkit.ui.AbstractSelect;
 import com.itmill.toolkit.ui.Button;
@@ -118,7 +117,7 @@ public class FeatureBrowser extends com.itmill.toolkit.Application implements
 
         final SplitPanel split = new SplitPanel(
                 SplitPanel.ORIENTATION_HORIZONTAL);
-        split.setSplitPosition(200, Size.UNITS_PIXELS);
+        split.setSplitPosition(200, SplitPanel.UNITS_PIXELS);
         main.setLayout(split);
 
         final HashMap sectionIds = new HashMap();
@@ -162,12 +161,12 @@ public class FeatureBrowser extends com.itmill.toolkit.Application implements
         split.addComponent(tree);
 
         final SplitPanel split2 = new SplitPanel();
-        split2.setSplitPosition(200, Size.UNITS_PIXELS);
+        split2.setSplitPosition(200, SplitPanel.UNITS_PIXELS);
         split.addComponent(split2);
 
         table = new Table();
         table.setDebugId("FeatureBrowser: Main Table");
-        table.getSize().setSizeFull();
+        table.setSizeFull();
         table.setColumnReorderingAllowed(true);
         table.setColumnCollapsingAllowed(true);
         table.setSelectable(true);
@@ -203,7 +202,7 @@ public class FeatureBrowser extends com.itmill.toolkit.Application implements
                     return;
                 }
                 Window w = new Window(caption);
-                w.getSize().setWidth(640);
+                w.setWidth(640);
                 if (Layout.class.isAssignableFrom(component.getClass())) {
                     w.setLayout((Layout) component);
                 } else {
@@ -250,7 +249,7 @@ public class FeatureBrowser extends com.itmill.toolkit.Application implements
                 OrderedLayout.ALIGNMENT_TOP);
 
         ts = new TabSheet();
-        ts.getSize().setSizeFull();
+        ts.setSizeFull();
         ts.addTab(new Label(""), "Choose example", null);
         exp.addComponent(ts);
         exp.expand(ts);
diff --git a/src/com/itmill/toolkit/demo/featurebrowser/TableExample.java b/src/com/itmill/toolkit/demo/featurebrowser/TableExample.java
index dc0c225467..4b3e1b758e 100644
--- a/src/com/itmill/toolkit/demo/featurebrowser/TableExample.java
+++ b/src/com/itmill/toolkit/demo/featurebrowser/TableExample.java
@@ -58,7 +58,7 @@ public class TableExample extends CustomComponent implements Action.Handler,
         // "source" table with bells & whistlesenabled

         source = new Table("All creatures");

         source.setPageLength(7);

-        source.getSize().setWidth(550);

+        source.setWidth(550);

         source.setColumnCollapsingAllowed(true);

         source.setColumnReorderingAllowed(true);

         source.setSelectable(true);

@@ -102,7 +102,7 @@ public class TableExample extends CustomComponent implements Action.Handler,
         // "saved" table, minimalistic

         saved = new Table("Saved creatures");

         saved.setPageLength(5);

-        saved.getSize().setWidth(550);

+        saved.setWidth(550);

         saved.setSelectable(false);

         saved.setColumnHeaderMode(Table.COLUMN_HEADER_MODE_HIDDEN);

         saved.setRowHeaderMode(Table.ROW_HEADER_MODE_ID);

diff --git a/src/com/itmill/toolkit/demo/featurebrowser/TreeExample.java b/src/com/itmill/toolkit/demo/featurebrowser/TreeExample.java
index fb9f0a34ff..694c839fb4 100644
--- a/src/com/itmill/toolkit/demo/featurebrowser/TreeExample.java
+++ b/src/com/itmill/toolkit/demo/featurebrowser/TreeExample.java
@@ -45,7 +45,7 @@ public class TreeExample extends CustomComponent implements Action.Handler,
         // Panel w/ Tree
         Panel p = new Panel("Select item");
         p.setStyleName(Panel.STYLE_LIGHT);
-        p.getSize().setWidth(250);
+        p.setWidth(250);
         // Description
         p.addComponent(new Label(desc));
         // Tree with a few items
diff --git a/src/com/itmill/toolkit/demo/reservation/ReservationApplication.java b/src/com/itmill/toolkit/demo/reservation/ReservationApplication.java
index d53c7fd1d1..58264f4da4 100644
--- a/src/com/itmill/toolkit/demo/reservation/ReservationApplication.java
+++ b/src/com/itmill/toolkit/demo/reservation/ReservationApplication.java
@@ -176,8 +176,8 @@ public class ReservationApplication extends Application {
         allLayout.setMargin(true);

 

         allTable = new Table();

-        allTable.getSize().setHeight(300);

-        allTable.getSize().setWidth(700);

+        allTable.setHeight(300);

+        allTable.setWidth(700);

         allTable.setColumnCollapsingAllowed(true);

         allTable.setColumnReorderingAllowed(true);

         allLayout.addComponent(allTable);

diff --git a/src/com/itmill/toolkit/terminal/HasSize.java b/src/com/itmill/toolkit/terminal/HasSize.java
deleted file mode 100644
index d740924b04..0000000000
--- a/src/com/itmill/toolkit/terminal/HasSize.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.itmill.toolkit.terminal;
-
-public interface HasSize {
-    
-    public Size getSize();
-
-}
diff --git a/src/com/itmill/toolkit/terminal/Size.java b/src/com/itmill/toolkit/terminal/Size.java
deleted file mode 100644
index c8af640f0a..0000000000
--- a/src/com/itmill/toolkit/terminal/Size.java
+++ /dev/null
@@ -1,217 +0,0 @@
-package com.itmill.toolkit.terminal;
-
-import com.itmill.toolkit.ui.Component;
-
-public class Size {
-
-    private Component component;
-    private int width;
-    private int height;
-    private int widthUnit;
-    private int heightUnit;
-
-    /**
-     * Unit code representing pixels.
-     */
-    public static final int UNITS_PIXELS = 0;
-
-    /**
-     * Unit code representing points (1/72nd of an inch).
-     */
-    public static final int UNITS_POINTS = 1;
-
-    /**
-     * Unit code representing picas (12 points).
-     */
-    public static final int UNITS_PICAS = 2;
-
-    /**
-     * Unit code representing the font-size of the relevant font.
-     */
-    public static final int UNITS_EM = 3;
-
-    /**
-     * Unit code representing the x-height of the relevant font.
-     */
-    public static final int UNITS_EX = 4;
-
-    /**
-     * Unit code representing millimeters.
-     */
-    public static final int UNITS_MM = 5;
-
-    /**
-     * Unit code representing centimeters.
-     */
-    public static final int UNITS_CM = 6;
-
-    /**
-     * Unit code representing inches.
-     */
-    public static final int UNITS_INCH = 7;
-
-    /**
-     * Unit code representing in percentage of the containing element defined by
-     * terminal.
-     */
-    public static final int UNITS_PERCENTAGE = 8;
-
-    /**
-     * Unit code representing in rows of text. This unit is only applicable to
-     * some components can it's meaning is specified by component
-     * implementation.
-     */
-    public static final int UNITS_ROWS = 9;
-
-    /**
-     * Textual representations of units symbols. Supported units and their
-     * symbols are:
-     * <ul>
-     * <li><code>UNITS_PIXELS</code>: "px"</li>
-     * <li><code>UNITS_POINTS</code>: "pt"</li>
-     * <li><code>UNITS_PICAS</code>: "pc"</li>
-     * <li><code>UNITS_EM</code>: "em"</li>
-     * <li><code>UNITS_EX</code>: "ex"</li>
-     * <li><code>UNITS_MM</code>: "mm"</li>
-     * <li><code>UNITS_CM</code>. "cm"</li>
-     * <li><code>UNITS_INCH</code>: "in"</li>
-     * <li><code>UNITS_PERCENTAGE</code>: "%"</li>
-     * <li><code>UNITS_ROWS</code>: "rows"</li>
-     * </ul>
-     * These can be used like <code>Size.UNIT_SYMBOLS[UNITS_PIXELS]</code>.
-     */
-    public static final String[] UNIT_SYMBOLS = { "px", "pt", "pc", "em", "ex",
-            "mm", "cm", "in", "%", "rows" };
-
-    public Size(Component c) {
-        component = c;
-        width = -1;
-        height = -1;
-        widthUnit = UNITS_PIXELS;
-        heightUnit = UNITS_PIXELS;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.itmill.toolkit.terminal.Sizeable#getHeight()
-     */
-    public int getHeight() {
-        return height;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.itmill.toolkit.terminal.Sizeable#getHeightUnits()
-     */
-    public int getHeightUnits() {
-        return heightUnit;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.itmill.toolkit.terminal.Sizeable#getWidth()
-     */
-    public int getWidth() {
-        return width;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.itmill.toolkit.terminal.Sizeable#getWidthUnits()
-     */
-    public int getWidthUnits() {
-        return widthUnit;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.itmill.toolkit.terminal.Sizeable#setHeight(int)
-     */
-    public void setHeight(int height) {
-        this.height = height;
-        component.requestRepaint();
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.itmill.toolkit.terminal.Sizeable#setHeightUnits(int)
-     */
-    public void setHeightUnits(int unit) {
-        heightUnit = unit;
-        component.requestRepaint();
-    }
-
-    public void setHeight(int height, int unit) {
-        setHeight(height);
-        setHeightUnits(unit);
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.itmill.toolkit.terminal.Sizeable#setSizeFull()
-     */
-    public void setSizeFull() {
-        height = 100;
-        width = 100;
-        heightUnit = UNITS_PERCENTAGE;
-        widthUnit = UNITS_PERCENTAGE;
-        component.requestRepaint();
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.itmill.toolkit.terminal.Sizeable#setSizeUndefined()
-     */
-    public void setSizeUndefined() {
-        height = -1;
-        width = -1;
-        heightUnit = UNITS_PIXELS;
-        widthUnit = UNITS_PIXELS;
-        component.requestRepaint();
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.itmill.toolkit.terminal.Sizeable#setWidth(int)
-     */
-    public void setWidth(int width) {
-        this.width = width;
-        component.requestRepaint();
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.itmill.toolkit.terminal.Sizeable#setWidthUnits(int)
-     */
-    public void setWidthUnits(int unit) {
-        widthUnit = unit;
-        component.requestRepaint();
-    }
-
-    public void setWidth(int width, int unit) {
-        setWidth(width);
-        setWidthUnits(unit);
-    }
-
-    public void paint(PaintTarget target) throws PaintException {
-        if (getHeight() >= 0) {
-            target.addAttribute("height", "" + getHeight()
-                    + UNIT_SYMBOLS[getHeightUnits()]);
-        }
-        if (getWidth() >= 0) {
-            target.addAttribute("width", "" + getWidth()
-                    + UNIT_SYMBOLS[getWidthUnits()]);
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/src/com/itmill/toolkit/terminal/Sizeable.java b/src/com/itmill/toolkit/terminal/Sizeable.java
index 8e17e9f269..c5cb14acd2 100644
--- a/src/com/itmill/toolkit/terminal/Sizeable.java
+++ b/src/com/itmill/toolkit/terminal/Sizeable.java
@@ -12,7 +12,6 @@ package com.itmill.toolkit.terminal;
  * @version
  * @VERSION@
  * @since 3.0
- * @deprecated
  */
 public interface Sizeable {
 
@@ -69,6 +68,8 @@ public interface Sizeable {
      */
     public static final int UNITS_ROWS = 9;
 
+    public static final int SIZE_UNDEFINED = -1;
+
     /**
      * Textual representations of units symbols. Supported units and their
      * symbols are:
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java
index 1c016d560a..af03bf7a46 100755
--- a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java
@@ -595,6 +595,8 @@ public class ApplicationConnection {
             }
         }
 
+        updateComponentSize(component, uidl);
+
         // Styles + disabled & readonly
         component.setStyleName(component.getStylePrimaryName());
 
@@ -628,6 +630,15 @@ public class ApplicationConnection {
         return false;
     }
 
+    private void updateComponentSize(Widget component, UIDL uidl) {
+        String w = uidl.hasAttribute("width") ? uidl
+                .getStringAttribute("width") : "";
+        component.setWidth(w);
+        String h = uidl.hasAttribute("height") ? uidl
+                .getStringAttribute("height") : "";
+        component.setHeight(h);
+    }
+
     /**
      * Get either existing or new Paintable for given UIDL.
      * 
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IEmbedded.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IEmbedded.java
index 97491aafdc..1efdc41f90 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IEmbedded.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IEmbedded.java
@@ -4,7 +4,6 @@
 
 package com.itmill.toolkit.terminal.gwt.client.ui;
 
-import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.ui.HTML;
 import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
 import com.itmill.toolkit.terminal.gwt.client.Paintable;
@@ -12,16 +11,13 @@ import com.itmill.toolkit.terminal.gwt.client.UIDL;
 
 public class IEmbedded extends HTML implements Paintable {
 
+    private String heigth;
+    private String width;
+
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
         if (client.updateComponent(this, uidl, true)) {
             return;
         }
-        final String w = uidl.hasAttribute("width") ? uidl
-                .getStringAttribute("width") : "100%";
-        final String h = uidl.hasAttribute("height") ? uidl
-                .getStringAttribute("height") : "100%";
-        DOM.setStyleAttribute(getElement(), "width", w);
-        DOM.setStyleAttribute(getElement(), "height", h);
 
         if (uidl.hasAttribute("type")) {
             final String type = uidl.getStringAttribute("type");
@@ -37,11 +33,11 @@ public class IEmbedded extends HTML implements Paintable {
         } else if (uidl.hasAttribute("mimetype")) {
             final String mime = uidl.getStringAttribute("mimetype");
             if (mime.equals("application/x-shockwave-flash")) {
-                setHTML("<object width=\"" + w + "\" height=\"" + h
+                setHTML("<object width=\"" + width + "\" height=\"" + heigth
                         + "\"><param name=\"movie\" value=\""
                         + getSrc(uidl, client) + "\"><embed src=\""
-                        + getSrc(uidl, client) + "\" width=\"" + w
-                        + "\" height=\"" + h + "\"></embed></object>");
+                        + getSrc(uidl, client) + "\" width=\"" + width
+                        + "\" height=\"" + heigth + "\"></embed></object>");
             } else {
                 ApplicationConnection.getConsole().log(
                         "Unknown Embedded mimetype '" + mime + "'");
@@ -63,4 +59,20 @@ public class IEmbedded extends HTML implements Paintable {
     private String getSrc(UIDL uidl, ApplicationConnection client) {
         return client.translateToolkitUri(uidl.getStringAttribute("src"));
     }
+
+    public void setWidth(String width) {
+        if (width == null || width.equals("")) {
+            width = "100%";
+        }
+        this.width = width;
+        super.setHeight(width);
+    }
+
+    public void setHeight(String height) {
+        if (height == null || height.equals("")) {
+            height = "100%";
+        }
+        heigth = height;
+        super.setHeight(height);
+    }
 }
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IExpandLayout.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IExpandLayout.java
index 3c4e6f5459..6977406230 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IExpandLayout.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IExpandLayout.java
@@ -327,16 +327,18 @@ public class IExpandLayout extends ComplexPanel implements
     }
 
     protected void handleMargins(UIDL uidl) {
-        final MarginInfo margins = new MarginInfo(uidl
-                .getIntAttribute("margins"));
-        setStyleName(marginElement,
-                CLASSNAME + "-" + StyleConstants.MARGIN_TOP, margins.hasTop());
-        setStyleName(marginElement, CLASSNAME + "-"
-                + StyleConstants.MARGIN_RIGHT, margins.hasRight());
-        setStyleName(marginElement, CLASSNAME + "-"
-                + StyleConstants.MARGIN_BOTTOM, margins.hasBottom());
-        setStyleName(marginElement, CLASSNAME + "-"
-                + StyleConstants.MARGIN_LEFT, margins.hasLeft());
+        if (uidl.hasAttribute("margins")) {
+            final MarginInfo margins = new MarginInfo(uidl
+                    .getIntAttribute("margins"));
+            setStyleName(marginElement, CLASSNAME + "-"
+                    + StyleConstants.MARGIN_TOP, margins.hasTop());
+            setStyleName(marginElement, CLASSNAME + "-"
+                    + StyleConstants.MARGIN_RIGHT, margins.hasRight());
+            setStyleName(marginElement, CLASSNAME + "-"
+                    + StyleConstants.MARGIN_BOTTOM, margins.hasBottom());
+            setStyleName(marginElement, CLASSNAME + "-"
+                    + StyleConstants.MARGIN_LEFT, margins.hasLeft());
+        }
     }
 
     public boolean hasChildComponent(Widget component) {
@@ -588,20 +590,14 @@ public class IExpandLayout extends ComplexPanel implements
 
         this.client = client;
 
+        // Modify layout margins
+        handleMargins(uidl);
+
         // Ensure correct implementation
         if (client.updateComponent(this, uidl, false)) {
             return;
         }
 
-        // Modify layout margins
-        handleMargins(uidl);
-
-        setWidth(uidl.hasAttribute("width") ? uidl.getStringAttribute("width")
-                : "");
-
-        setHeight(uidl.hasAttribute("height") ? uidl
-                .getStringAttribute("height") : "");
-
         hasComponentSpacing = uidl.getBooleanAttribute("spacing");
 
         final ArrayList uidlWidgets = new ArrayList();
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IPanel.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IPanel.java
index 4ae766c366..8ec49570ee 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IPanel.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IPanel.java
@@ -82,7 +82,7 @@ public class IPanel extends SimplePanel implements Paintable,
                 .getStringVariable("width") : null;
         height = uidl.hasVariable("height") ? uidl.getStringVariable("height")
                 : null;
-        setWidth(w != null ? w : "");
+        super.setWidth(w != null ? w : "");
 
         // Restore default stylenames
         DOM
@@ -279,4 +279,18 @@ public class IPanel extends SimplePanel implements Paintable,
         }
     }
 
+    /**
+     * Panal handles dimensions by itself
+     */
+    public void setHeight(String height) {
+        // NOP
+    }
+
+    /**
+     * Panal handles dimensions by itself
+     */
+    public void setWidth(String width) {
+        // NOP
+    }
+
 }
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java
index e54df00594..b144e6c8be 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java
@@ -514,7 +514,7 @@ public class IScrollTable extends Composite implements Table, ScrollListener,
         if (height == null) {
             bodyContainer.setHeight((tBody.getRowHeight() * pageLength) + "px");
         } else {
-            setHeight(height);
+            mySetHeight(height);
             iLayout();
         }
 
@@ -523,15 +523,15 @@ public class IScrollTable extends Composite implements Table, ScrollListener,
             w += getScrollbarWidth();
             bodyContainer.setWidth(w + "px");
             tHead.setWidth(w + "px");
-            setWidth(w + "px");
+            super.setWidth(w + "px");
         } else {
             if (width.indexOf("px") > 0) {
                 bodyContainer.setWidth(width);
                 tHead.setWidth(width);
-                setWidth(width);
+                super.setWidth(width);
             } else if (width.indexOf("%") > 0) {
                 if (!width.equals("100%")) {
-                    setWidth(width);
+                    super.setWidth(width);
                 }
                 // contained blocks are relative to parents
                 bodyContainer.setWidth("100%");
@@ -618,7 +618,7 @@ public class IScrollTable extends Composite implements Table, ScrollListener,
                  * which is what users usually want. So recalculate pixels via
                  * setHeight.
                  */
-                setHeight(height);
+                mySetHeight(height);
             }
 
             int contentH = (DOM.getElementPropertyInt(getElement(),
@@ -2007,7 +2007,7 @@ public class IScrollTable extends Composite implements Table, ScrollListener,
         return panel.remove(w);
     }
 
-    public void setHeight(String height) {
+    public void mySetHeight(String height) {
         // workaround very common 100% height problem - extract borders
         if (height.equals("100%")) {
             final int borders = getBorderSpace();
@@ -2039,4 +2039,12 @@ public class IScrollTable extends Composite implements Table, ScrollListener,
                 - DOM.getElementPropertyInt(el, "clientHeight");
     }
 
+    public void setWidth(String width) {
+        // NOP size handled internally
+    }
+
+    public void setHeight(String height) {
+        // NOP size handled internally
+    }
+
 }
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ISplitPanel.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ISplitPanel.java
index ddad482c67..1fc864c1ff 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ISplitPanel.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ISplitPanel.java
@@ -115,14 +115,11 @@ public class ISplitPanel extends ComplexPanel implements Paintable,
             return;
         }
 
-        setWidth(uidl.getStringAttribute("width"));
-        setHeight(uidl.getStringAttribute("height"));
-
         setSplitPosition(uidl.getStringAttribute("position"));
 
-        final Paintable newFirstChild = (Paintable) client.getPaintable(uidl
+        final Paintable newFirstChild = client.getPaintable(uidl
                 .getChildUIDL(0));
-        final Paintable newSecondChild = (Paintable) client.getPaintable(uidl
+        final Paintable newSecondChild = client.getPaintable(uidl
                 .getChildUIDL(1));
         if (firstChild != newFirstChild) {
             if (firstChild != null) {
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheet.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheet.java
index 4a93978981..7724bd0e03 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheet.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheet.java
@@ -225,6 +225,8 @@ public class ITabsheet extends ITabsheetBase implements
 
             // Set proper values for content element
             DOM.setStyleAttribute(contentNode, "height", newHeight + "px");
+            tp.setHeight("100%");
+
             DOM.setStyleAttribute(contentNode, "overflow", "auto");
 
             // Restore content to normal flow
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheetBase.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheetBase.java
index 61f957da3f..a045358b2c 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheetBase.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheetBase.java
@@ -36,18 +36,6 @@ abstract class ITabsheetBase extends FlowPanel implements Paintable {
         id = uidl.getId();
         disabled = uidl.hasAttribute("disabled");
 
-        // Adjust width and height
-        if (uidl.hasAttribute("height")) {
-            setHeight(uidl.getStringAttribute("height"));
-        } else {
-            setHeight("");
-        }
-        if (uidl.hasAttribute("width")) {
-            setWidth(uidl.getStringAttribute("width"));
-        } else {
-            setWidth("");
-        }
-
         // Render content
         final UIDL tabs = uidl.getChildUIDL(0);
         if (keepCurrentTabs(uidl)) {
diff --git a/src/com/itmill/toolkit/tests/BasicRandomTest.java b/src/com/itmill/toolkit/tests/BasicRandomTest.java
index acc9beab7d..8eac734448 100644
--- a/src/com/itmill/toolkit/tests/BasicRandomTest.java
+++ b/src/com/itmill/toolkit/tests/BasicRandomTest.java
@@ -127,7 +127,7 @@ public class BasicRandomTest extends com.itmill.toolkit.Application implements
         final OrderedLayout setupLayout = new OrderedLayout(
                 OrderedLayout.ORIENTATION_HORIZONTAL);
         final Panel statusPanel = new Panel("Status");
-        statusPanel.getSize().setWidth(200);
+        statusPanel.setWidth(200);
         setupLayout.addComponent(statusPanel);
         statusPanel.addComponent(statusLabel);
         setupLayout.addComponent(randomSeedValue);
@@ -383,7 +383,7 @@ public class BasicRandomTest extends com.itmill.toolkit.Application implements
                         tabCaption, null);
             }
             ts.setSelectedTab((ComponentContainer) tabs.get(selectedTab));
-            result = (ComponentContainer) ts;
+            result = ts;
             break;
         }
 
diff --git a/src/com/itmill/toolkit/tests/RandomLayoutStress.java b/src/com/itmill/toolkit/tests/RandomLayoutStress.java
index 6b66f39c5d..5925fb69ec 100644
--- a/src/com/itmill/toolkit/tests/RandomLayoutStress.java
+++ b/src/com/itmill/toolkit/tests/RandomLayoutStress.java
@@ -154,7 +154,7 @@ public class RandomLayoutStress extends com.itmill.toolkit.Application {
                                     + "extremities and may have a caption to clarify the nature of the contained components' purpose."
                                     + " Panel contains an layout where the actual contained components are added, "
                                     + "this layout may be switched on the fly."));
-            ((Panel) result).getSize().setWidth(250);
+            ((Panel) result).setWidth(250);
             break;
         case 6:
             // Datefield
diff --git a/src/com/itmill/toolkit/tests/TableChangingDatasource.java b/src/com/itmill/toolkit/tests/TableChangingDatasource.java
index cbcd60e7e3..0956a832e0 100644
--- a/src/com/itmill/toolkit/tests/TableChangingDatasource.java
+++ b/src/com/itmill/toolkit/tests/TableChangingDatasource.java
@@ -26,8 +26,8 @@ public class TableChangingDatasource extends CustomComponent implements
 

         t = new Table();

 

-        t.getSize().setWidth(500);

-        t.getSize().setHeight(300);

+        t.setWidth(500);

+        t.setHeight(300);

 

         ta[0] = TestForTablesInitialColumnWidthLogicRendering

                 .getTestTable(3, 0);

diff --git a/src/com/itmill/toolkit/tests/TestBench.java b/src/com/itmill/toolkit/tests/TestBench.java
index 92575cda82..c2e15b3b56 100644
--- a/src/com/itmill/toolkit/tests/TestBench.java
+++ b/src/com/itmill/toolkit/tests/TestBench.java
@@ -15,7 +15,6 @@ import java.util.List;
 import com.itmill.toolkit.Application;
 import com.itmill.toolkit.data.Property;
 import com.itmill.toolkit.data.util.HierarchicalContainer;
-import com.itmill.toolkit.terminal.Size;
 import com.itmill.toolkit.ui.Component;
 import com.itmill.toolkit.ui.CustomComponent;
 import com.itmill.toolkit.ui.ExpandLayout;
@@ -108,11 +107,12 @@ public class TestBench extends com.itmill.toolkit.Application implements
 
         menu.addListener(this);
         menu.setImmediate(true);
+        menu.setNullSelectionAllowed(false);
 
         mainLayout.addComponent(menu);
 
         bodyLayout.addStyleName("light");
-        bodyLayout.getSize().setHeight(100, Size.UNITS_PERCENTAGE);
+        bodyLayout.setHeight(100, Component.UNITS_PERCENTAGE);
         bodyLayout.setLayout(new ExpandLayout());
 
         mainLayout.addComponent(bodyLayout);
diff --git a/src/com/itmill/toolkit/tests/TestComponentsAndLayouts.java b/src/com/itmill/toolkit/tests/TestComponentsAndLayouts.java
index 62beab9aee..98fcff5e2a 100644
--- a/src/com/itmill/toolkit/tests/TestComponentsAndLayouts.java
+++ b/src/com/itmill/toolkit/tests/TestComponentsAndLayouts.java
@@ -17,7 +17,6 @@ import com.itmill.toolkit.event.Action;
 import com.itmill.toolkit.terminal.ClassResource;
 import com.itmill.toolkit.terminal.ErrorMessage;
 import com.itmill.toolkit.terminal.ExternalResource;
-import com.itmill.toolkit.terminal.Size;
 import com.itmill.toolkit.terminal.UserError;
 import com.itmill.toolkit.ui.AbstractComponent;
 import com.itmill.toolkit.ui.Button;
@@ -141,7 +140,7 @@ public class TestComponentsAndLayouts extends Application implements Listener,
                             "<hr /><h1>Components inside ExpandLayout (height 250px)</h3>",
                             Label.CONTENT_XHTML));
             final ExpandLayout el = new ExpandLayout();
-            el.getSize().setHeight(250, Size.UNITS_PIXELS);
+            el.setHeight(250, Component.UNITS_PIXELS);
             populateLayout(el);
             target.addComponent(el);
         }
@@ -163,7 +162,7 @@ public class TestComponentsAndLayouts extends Application implements Listener,
                             "<hr /><h1>Components inside vertical SplitPanel (splitpanel is under 250height ExpandLayout)</h3>",
                             Label.CONTENT_XHTML));
             final ExpandLayout sp1l = new ExpandLayout();
-            sp1l.getSize().setHeight(250, Size.UNITS_PIXELS);
+            sp1l.setHeight(250, ExpandLayout.UNITS_PIXELS);
             final SplitPanel sp1 = new SplitPanel(
                     SplitPanel.ORIENTATION_VERTICAL);
             sp1l.addComponent(sp1);
@@ -183,7 +182,7 @@ public class TestComponentsAndLayouts extends Application implements Listener,
                             "<hr /><h1>Components inside horizontal SplitPanel (splitpanel is under 250px height ExpandLayout)</h3>",
                             Label.CONTENT_XHTML));
             final ExpandLayout sp2l = new ExpandLayout();
-            sp2l.getSize().setHeight(250, Size.UNITS_PIXELS);
+            sp2l.setHeight(250, SplitPanel.UNITS_PIXELS);
             final SplitPanel sp2 = new SplitPanel(
                     SplitPanel.ORIENTATION_HORIZONTAL);
             sp2l.addComponent(sp2);
diff --git a/src/com/itmill/toolkit/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java b/src/com/itmill/toolkit/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java
index 5890cef052..e8692f1241 100644
--- a/src/com/itmill/toolkit/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java
+++ b/src/com/itmill/toolkit/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java
@@ -39,7 +39,7 @@ public class TestForApplicationLayoutThatUsesWholeBrosersSpace extends
 
         final Table t = TestForTablesInitialColumnWidthLogicRendering
                 .getTestTable(4, 100);
-        t.getSize().setSizeFull();
+        t.setSizeFull();
         topRight.addComponent(t);
         topRight.expand(t);
 
diff --git a/src/com/itmill/toolkit/tests/TestForBasicApplicationLayout.java b/src/com/itmill/toolkit/tests/TestForBasicApplicationLayout.java
index b2f90d2212..d497d96df0 100644
--- a/src/com/itmill/toolkit/tests/TestForBasicApplicationLayout.java
+++ b/src/com/itmill/toolkit/tests/TestForBasicApplicationLayout.java
@@ -6,7 +6,6 @@ package com.itmill.toolkit.tests;
 

 import java.util.Locale;

 

-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 +30,7 @@ public class TestForBasicApplicationLayout extends CustomComponent {
         click = new Button("Set height -1", new ClickListener() {

 

             public void buttonClick(ClickEvent event) {

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

+                tab.setHeight(-1);

             }

 

         });

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

 

             public void buttonClick(ClickEvent event) {

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

+                tab.setHeight(100, TabSheet.UNITS_PERCENTAGE);

             }

 

         });

 

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

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

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

 

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

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

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

 

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

-        p.getSize().setSizeFull();

+        p.setSizeFull();

 

         tab = new TabSheet();

-        tab.getSize().setSizeFull();

+        tab.setSizeFull();

 

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

                 new ExpandLayout());

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

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

         report.addStyleName(Panel.STYLE_LIGHT);

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

+        report.setHeight(100, SplitPanel.UNITS_PERCENTAGE);

 

         sp2.setFirstComponent(report);

 

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

         table.setColumnReorderingAllowed(true);

         table.setSortDisabled(false);

-        table.getSize().setSizeFull();

+        table.setSizeFull();

         table.addStyleName("table-inline");

         sp2.setSecondComponent(table);

 

diff --git a/src/com/itmill/toolkit/tests/TestForContainerFilterable.java b/src/com/itmill/toolkit/tests/TestForContainerFilterable.java
index 844168f941..05ca867979 100644
--- a/src/com/itmill/toolkit/tests/TestForContainerFilterable.java
+++ b/src/com/itmill/toolkit/tests/TestForContainerFilterable.java
@@ -5,7 +5,6 @@
 package com.itmill.toolkit.tests;
 
 import com.itmill.toolkit.data.util.IndexedContainer;
-import com.itmill.toolkit.terminal.Size;
 import com.itmill.toolkit.ui.Button;
 import com.itmill.toolkit.ui.CustomComponent;
 import com.itmill.toolkit.ui.Label;
@@ -42,7 +41,7 @@ public class TestForContainerFilterable extends CustomComponent {
         // Init filtering view
         final Panel filterPanel = new Panel("Filter", new OrderedLayout(
                 OrderedLayout.ORIENTATION_HORIZONTAL));
-        filterPanel.getSize().setWidth(100, Size.UNITS_PERCENTAGE);
+        filterPanel.setWidth(100, Panel.UNITS_PERCENTAGE);
         lo.addComponent(filterPanel);
         filterPanel.addComponent(fooFilter);
         filterPanel.addComponent(barFilter);
@@ -56,7 +55,7 @@ public class TestForContainerFilterable extends CustomComponent {
         // Table
         lo.addComponent(t);
         t.setPageLength(12);
-        t.getSize().setWidth(100, Size.UNITS_PERCENTAGE);
+        t.setWidth(100, Table.UNITS_PERCENTAGE);
         t.setContainerDataSource(ic);
 
         // Handler
diff --git a/src/com/itmill/toolkit/tests/TestForExpandLayout.java b/src/com/itmill/toolkit/tests/TestForExpandLayout.java
index c3bb09a4ae..c077390b2a 100644
--- a/src/com/itmill/toolkit/tests/TestForExpandLayout.java
+++ b/src/com/itmill/toolkit/tests/TestForExpandLayout.java
@@ -4,7 +4,6 @@
 

 package com.itmill.toolkit.tests;

 

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

 import com.itmill.toolkit.ui.CustomComponent;

 import com.itmill.toolkit.ui.DateField;

 import com.itmill.toolkit.ui.ExpandLayout;

@@ -36,7 +35,7 @@ public class TestForExpandLayout extends CustomComponent {
                 el.addComponent(l);

             }

             if (i > 0) {

-                el.getSize().setHeight(1, Size.UNITS_EM);

+                el.setHeight(1, ExpandLayout.UNITS_EM);

             }

             main.addComponent(el);

         }

diff --git a/src/com/itmill/toolkit/tests/TestForExpandLayout2.java b/src/com/itmill/toolkit/tests/TestForExpandLayout2.java
index fa668139b2..f929729a72 100644
--- a/src/com/itmill/toolkit/tests/TestForExpandLayout2.java
+++ b/src/com/itmill/toolkit/tests/TestForExpandLayout2.java
@@ -4,7 +4,6 @@
 

 package com.itmill.toolkit.tests;

 

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

 import com.itmill.toolkit.ui.Button;

 import com.itmill.toolkit.ui.CustomComponent;

 import com.itmill.toolkit.ui.ExpandLayout;

@@ -28,8 +27,8 @@ public class TestForExpandLayout2 extends CustomComponent {
         main = new ExpandLayout(ExpandLayout.ORIENTATION_HORIZONTAL);

 

         Panel left = new Panel("Left column");

-        left.getSize().setHeight(100, Size.UNITS_PERCENTAGE);

-        left.getSize().setWidth(150);

+        left.setHeight(100, Panel.UNITS_PERCENTAGE);

+        left.setWidth(150);

         main.addComponent(left);

 

         ExpandLayout center = new ExpandLayout();

@@ -37,11 +36,11 @@ public class TestForExpandLayout2 extends CustomComponent {
         Panel mainContent = new Panel();

         center.addComponent(mainContent);

         center.expand(mainContent);

-        mainContent.getSize().setSizeFull();

+        mainContent.setSizeFull();

 

         ExpandLayout buttons = new ExpandLayout(

                 ExpandLayout.ORIENTATION_HORIZONTAL);

-        buttons.getSize().setHeight(30, Size.UNITS_PIXELS);

+        buttons.setHeight(30, ExpandLayout.UNITS_PIXELS);

         Button b1 = new Button("Save");

         Button b2 = new Button("Cancel");

         Button b3 = new Button("Logout");

@@ -56,8 +55,8 @@ public class TestForExpandLayout2 extends CustomComponent {
         main.expand(center);

 

         Panel right = new Panel("Right column");

-        right.getSize().setHeight(100, Size.UNITS_PERCENTAGE);

-        right.getSize().setWidth(200);

+        right.setHeight(100, Panel.UNITS_PERCENTAGE);

+        right.setWidth(200);

 

         main.addComponent(right);

 

diff --git a/src/com/itmill/toolkit/tests/TestForExpandLayout3.java b/src/com/itmill/toolkit/tests/TestForExpandLayout3.java
index 08c4bb0c98..c23ca34373 100644
--- a/src/com/itmill/toolkit/tests/TestForExpandLayout3.java
+++ b/src/com/itmill/toolkit/tests/TestForExpandLayout3.java
@@ -4,7 +4,6 @@
 

 package com.itmill.toolkit.tests;

 

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

 import com.itmill.toolkit.ui.Button;

 import com.itmill.toolkit.ui.CustomComponent;

 import com.itmill.toolkit.ui.DateField;

@@ -56,7 +55,7 @@ public class TestForExpandLayout3 extends CustomComponent {
         el.expand(b);

         el.setComponentAlignment(b, ExpandLayout.ALIGNMENT_HORIZONTAL_CENTER,

                 ExpandLayout.ALIGNMENT_VERTICAL_CENTER);

-        el.getSize().setHeight(60, Size.UNITS_PIXELS);

+        el.setHeight(60, ExpandLayout.UNITS_PIXELS);

         el.setMargin(true);

         main.addComponent(el);

 

@@ -71,7 +70,7 @@ public class TestForExpandLayout3 extends CustomComponent {
         el.expand(b);

         el.setComponentAlignment(b, ExpandLayout.ALIGNMENT_RIGHT,

                 ExpandLayout.ALIGNMENT_BOTTOM);

-        el.getSize().setHeight(100, Size.UNITS_PIXELS);

+        el.setHeight(100, ExpandLayout.UNITS_PIXELS);

         el.setSpacing(true);

 

         main.addComponent(el);

diff --git a/src/com/itmill/toolkit/tests/TestForNativeWindowing.java b/src/com/itmill/toolkit/tests/TestForNativeWindowing.java
index dd872fc0da..5e7216101b 100644
--- a/src/com/itmill/toolkit/tests/TestForNativeWindowing.java
+++ b/src/com/itmill/toolkit/tests/TestForNativeWindowing.java
@@ -29,11 +29,11 @@ public class TestForNativeWindowing extends Application {
                         main.addWindow(w);
                         w.setPositionX(100);
                         w.setPositionY(100);
-                        w.getSize().setWidth(200);
-                        w.getSize().setHeight(200);
+                        w.setWidth(200);
+                        w.setHeight(200);
 
-                        w.getSize().setWidth(100);
-                        w.getSize().setHeight(400);
+                        w.setWidth(100);
+                        w.setHeight(400);
 
                         final Button closebutton = new Button("Close "
                                 + w.getCaption(), new Button.ClickListener() {
diff --git a/src/com/itmill/toolkit/tests/TestForPreconfiguredComponents.java b/src/com/itmill/toolkit/tests/TestForPreconfiguredComponents.java
index 0bff19a18b..47c435ad82 100644
--- a/src/com/itmill/toolkit/tests/TestForPreconfiguredComponents.java
+++ b/src/com/itmill/toolkit/tests/TestForPreconfiguredComponents.java
@@ -154,8 +154,8 @@ public class TestForPreconfiguredComponents extends CustomComponent implements
         ol2.addComponent(commit);
         status.addComponent(ol2);
 
-        status.getSize().setHeight(300);
-        status.getSize().setWidth(400);
+        status.setHeight(300);
+        status.setWidth(400);
 
         ol.addComponent(status);
 
diff --git a/src/com/itmill/toolkit/tests/TestForTablesInitialColumnWidthLogicRendering.java b/src/com/itmill/toolkit/tests/TestForTablesInitialColumnWidthLogicRendering.java
index 6abe000224..8a235ff226 100644
--- a/src/com/itmill/toolkit/tests/TestForTablesInitialColumnWidthLogicRendering.java
+++ b/src/com/itmill/toolkit/tests/TestForTablesInitialColumnWidthLogicRendering.java
@@ -6,12 +6,12 @@ package com.itmill.toolkit.tests;
 
 import java.util.Vector;
 
-import com.itmill.toolkit.terminal.Size;
 import com.itmill.toolkit.ui.Button;
 import com.itmill.toolkit.ui.CustomComponent;
 import com.itmill.toolkit.ui.Label;
 import com.itmill.toolkit.ui.OrderedLayout;
 import com.itmill.toolkit.ui.Table;
+import com.itmill.toolkit.ui.Button.ClickEvent;
 
 /**
  * 
@@ -57,18 +57,18 @@ public class TestForTablesInitialColumnWidthLogicRendering extends
         t = getTestTable(3, 40);
         t
                 .setCaption("Table with some columns and wide explicit width. (Ought to widen columns to use all space)");
-        t.getSize().setWidth(1000);
+        t.setWidth(1000);
         main.addComponent(t);
 
         t = getTestTable(12, 4);
         t.setCaption("Table with  some rows and lot of columns, width == 100%");
-        t.getSize().setWidth(100, Size.UNITS_PERCENTAGE);
+        t.setWidth(100, Table.UNITS_PERCENTAGE);
         main.addComponent(t);
 
         t = getTestTable(12, 100);
         t
                 .setCaption("Table with  lot of rows and lot of columns, width == 50%");
-        t.getSize().setWidth(50, Size.UNITS_PERCENTAGE);
+        t.setWidth(50, Table.UNITS_PERCENTAGE);
         main.addComponent(t);
 
         t = getTestTable(5, 100);
@@ -78,7 +78,7 @@ public class TestForTablesInitialColumnWidthLogicRendering extends
         t = getTestTable(4, 4);
         t.setCaption("Table with some rows and width = 200px");
 
-        t.getSize().setWidth(200);
+        t.setWidth(200);
         main.addComponent(t);
 
         final Button b = new Button("refresh view", this, "createNewView");
@@ -92,11 +92,19 @@ public class TestForTablesInitialColumnWidthLogicRendering extends
         for (int i = 0; i < cols; i++) {
             t.addContainerProperty(testString[i], String.class, "");
         }
+        t.addContainerProperty("button", Button.class, null);
         for (int i = 0; i < rows; i++) {
             final Vector content = new Vector();
             for (int j = 0; j < cols; j++) {
                 content.add(rndString());
             }
+            content.add(new Button("b", new Button.ClickListener() {
+
+                public void buttonClick(ClickEvent event) {
+                    System.out.println("b click");
+
+                }
+            }));
             t.addItem(content.toArray(), "" + i);
         }
         return t;
diff --git a/src/com/itmill/toolkit/tests/TestForTrees.java b/src/com/itmill/toolkit/tests/TestForTrees.java
index 30658f8ffa..fd7624fce4 100644
--- a/src/com/itmill/toolkit/tests/TestForTrees.java
+++ b/src/com/itmill/toolkit/tests/TestForTrees.java
@@ -134,8 +134,8 @@ public class TestForTrees extends CustomComponent implements Handler {
         });
         status.addComponent(clear);
 
-        status.getSize().setHeight(300);
-        status.getSize().setWidth(400);
+        status.setHeight(300);
+        status.setWidth(400);
 
         ol.addComponent(status);
 
diff --git a/src/com/itmill/toolkit/tests/TestForUpload.java b/src/com/itmill/toolkit/tests/TestForUpload.java
index 0d8cbb52a2..aa89b3c649 100644
--- a/src/com/itmill/toolkit/tests/TestForUpload.java
+++ b/src/com/itmill/toolkit/tests/TestForUpload.java
@@ -246,8 +246,6 @@ public class TestForUpload extends CustomComponent implements
 
         private File file;
 
-        private FileInputStream stream;
-
         public TmpFileBuffer() {
             final String tempFileName = "upload_tmpfile_"
                     + System.currentTimeMillis();
diff --git a/src/com/itmill/toolkit/tests/featurebrowser/Feature.java b/src/com/itmill/toolkit/tests/featurebrowser/Feature.java
index a6f62c6d1b..80b85a5298 100644
--- a/src/com/itmill/toolkit/tests/featurebrowser/Feature.java
+++ b/src/com/itmill/toolkit/tests/featurebrowser/Feature.java
@@ -78,7 +78,7 @@ public abstract class Feature extends CustomComponent {
 
         ts = new TabSheet();
 
-        ts.getSize().setSizeFull();
+        ts.setSizeFull();
 
         // Description tab
         final String title = getTitle();
diff --git a/src/com/itmill/toolkit/tests/featurebrowser/FeatureEmbedded.java b/src/com/itmill/toolkit/tests/featurebrowser/FeatureEmbedded.java
index 0cf915a0fe..380131a653 100644
--- a/src/com/itmill/toolkit/tests/featurebrowser/FeatureEmbedded.java
+++ b/src/com/itmill/toolkit/tests/featurebrowser/FeatureEmbedded.java
@@ -5,7 +5,6 @@
 package com.itmill.toolkit.tests.featurebrowser;
 
 import com.itmill.toolkit.terminal.ClassResource;
-import com.itmill.toolkit.terminal.Sizeable;
 import com.itmill.toolkit.ui.Component;
 import com.itmill.toolkit.ui.Embedded;
 import com.itmill.toolkit.ui.Form;
@@ -40,11 +39,11 @@ public class FeatureEmbedded extends Feature {
                 new Integer(Embedded.TYPE_IMAGE),
                 new Integer(Embedded.TYPE_OBJECT) }, new Object[] { "Image",
                 "Object" });
-        final Object[] units = new Object[Sizeable.UNIT_SYMBOLS.length];
-        final Object[] symbols = new Object[Sizeable.UNIT_SYMBOLS.length];
+        final Object[] units = new Object[Embedded.UNIT_SYMBOLS.length];
+        final Object[] symbols = new Object[Embedded.UNIT_SYMBOLS.length];
         for (int i = 0; i < units.length; i++) {
             units[i] = new Integer(i);
-            symbols[i] = Sizeable.UNIT_SYMBOLS[i];
+            symbols[i] = Embedded.UNIT_SYMBOLS[i];
         }
         ap.replaceWithSelect("heightUnits", units, symbols);
         ap.replaceWithSelect("widthUnits", units, symbols);
diff --git a/src/com/itmill/toolkit/tests/featurebrowser/FeatureWindow.java b/src/com/itmill/toolkit/tests/featurebrowser/FeatureWindow.java
index 1aaacf329e..7e357e0e00 100644
--- a/src/com/itmill/toolkit/tests/featurebrowser/FeatureWindow.java
+++ b/src/com/itmill/toolkit/tests/featurebrowser/FeatureWindow.java
@@ -35,8 +35,8 @@ public class FeatureWindow extends Feature implements Window.CloseListener {
 
         demoWindow = new Window("Feature Test Window");
         demoWindow.addListener(this);
-        demoWindow.getSize().setWidth(400);
-        demoWindow.getSize().setHeight(200);
+        demoWindow.setWidth(400);
+        demoWindow.setHeight(200);
         demoWindow.setTheme("default");
 
         layoutUpper.addComponent(addButton);
diff --git a/src/com/itmill/toolkit/tests/featurebrowser/PropertyPanel.java b/src/com/itmill/toolkit/tests/featurebrowser/PropertyPanel.java
index 1ce835b80d..9faefae180 100644
--- a/src/com/itmill/toolkit/tests/featurebrowser/PropertyPanel.java
+++ b/src/com/itmill/toolkit/tests/featurebrowser/PropertyPanel.java
@@ -67,7 +67,7 @@ public class PropertyPanel extends Panel implements Button.ClickListener,
         setCaption("Properties");
         addComponent(formsLayout);
 
-        getSize().setSizeFull();
+        setSizeFull();
 
         // Target object
         this.objectToConfigure = objectToConfigure;
@@ -103,7 +103,7 @@ public class PropertyPanel extends Panel implements Button.ClickListener,
                 Table.ALIGN_LEFT, Table.ALIGN_CENTER, Table.ALIGN_CENTER });
         allProperties.setColumnHeaderMode(Table.COLUMN_HEADER_MODE_ID);
         allProperties.setPageLength(0);
-        allProperties.getSize().setSizeFull();
+        allProperties.setSizeFull();
         updatePropertyList();
 
     }
diff --git a/src/com/itmill/toolkit/tests/magi/MagiTestApplication.java b/src/com/itmill/toolkit/tests/magi/MagiTestApplication.java
index 6780c7d1c2..3217143b1c 100644
--- a/src/com/itmill/toolkit/tests/magi/MagiTestApplication.java
+++ b/src/com/itmill/toolkit/tests/magi/MagiTestApplication.java
@@ -15,7 +15,7 @@ import com.itmill.toolkit.data.validator.StringLengthValidator;
 import com.itmill.toolkit.terminal.ClassResource;
 import com.itmill.toolkit.terminal.DownloadStream;
 import com.itmill.toolkit.terminal.ExternalResource;
-import com.itmill.toolkit.terminal.Size;
+import com.itmill.toolkit.terminal.Sizeable;
 import com.itmill.toolkit.terminal.StreamResource;
 import com.itmill.toolkit.terminal.UserError;
 import com.itmill.toolkit.ui.AbstractSelect;
@@ -63,8 +63,9 @@ public class MagiTestApplication extends com.itmill.toolkit.Application {
     public DownloadStream handleURI(URL context, String relativeUri) {
         // Let default implementation handle requests for
         // application resources.
-        if (relativeUri.startsWith("APP"))
+        if (relativeUri.startsWith("APP")) {
             return super.handleURI(context, relativeUri);
+        }
 
         String example;
         String param = null;
@@ -229,14 +230,18 @@ public class MagiTestApplication extends com.itmill.toolkit.Application {
 
     void example_Tree(Window main, String param) {
         final Object[][] planets = new Object[][] {
-            new Object[] {"Mercury"},
-            new Object[] {"Venus"},
-            new Object[] {"Earth", "The Moon"},
-            new Object[] {"Mars", "Phobos", "Deimos"},
-            new Object[] {"Jupiter", "Io", "Europa", "Ganymedes", "Callisto"},
-            new Object[] {"Saturn", "Titan", "Tethys", "Dione", "Rhea", "Iapetus"},
-            new Object[] {"Uranus", "Miranda", "Ariel", "Umbriel", "Titania", "Oberon"},
-            new Object[] {"Neptune", "Triton", "Proteus", "Nereid", "Larissa"}};
+                new Object[] { "Mercury" },
+                new Object[] { "Venus" },
+                new Object[] { "Earth", "The Moon" },
+                new Object[] { "Mars", "Phobos", "Deimos" },
+                new Object[] { "Jupiter", "Io", "Europa", "Ganymedes",
+                        "Callisto" },
+                new Object[] { "Saturn", "Titan", "Tethys", "Dione", "Rhea",
+                        "Iapetus" },
+                new Object[] { "Uranus", "Miranda", "Ariel", "Umbriel",
+                        "Titania", "Oberon" },
+                new Object[] { "Neptune", "Triton", "Proteus", "Nereid",
+                        "Larissa" } };
 
         final Tree tree = new Tree("The Planets and Major Moons");
 
@@ -366,23 +371,25 @@ public class MagiTestApplication extends com.itmill.toolkit.Application {
     void example_UserError(final Window main, String param) {
         if (param != null) {
             if (param.equals("form")) {
-         
+
                 final FormLayout layout = new FormLayout();
                 main.addComponent(layout);
-        
+
                 final TextField textfield = new TextField("Enter name");
                 layout.addComponent(textfield);
                 textfield.setComponentError(null);
 
                 final Button button = new Button("Click me!");
                 layout.addComponent(button);
-        
+
                 button.addListener(new Button.ClickListener() {
                     public void buttonClick(ClickEvent event) {
-                        if (((String)textfield.getValue()).length() == 0)
-                            textfield.setComponentError(new UserError("Must not be empty"));
-                        else // Clear the error
+                        if (((String) textfield.getValue()).length() == 0) {
+                            textfield.setComponentError(new UserError(
+                                    "Must not be empty"));
+                        } else {
                             textfield.setComponentError(null);
+                        }
                     }
                 });
             }
@@ -393,18 +400,20 @@ public class MagiTestApplication extends com.itmill.toolkit.Application {
 
             final Button button = new Button("Click me!");
             main.addComponent(button);
-    
+
             button.addListener(new Button.ClickListener() {
                 public void buttonClick(ClickEvent event) {
-                    if (((String)textfield.getValue()).length() == 0)
-                        textfield.setComponentError(new UserError("Must not be empty"));
-                    else // Clear the error
+                    if (((String) textfield.getValue()).length() == 0) {
+                        textfield.setComponentError(new UserError(
+                                "Must not be empty"));
+                    } else {
                         textfield.setComponentError(null);
+                    }
                 }
             });
         }
     }
-    
+
     void example_DateField(Window main, String param) {
         /* Create a DateField with the calendar style. */
         final DateField date = new DateField("Here is a calendar field");
@@ -502,13 +511,13 @@ public class MagiTestApplication extends com.itmill.toolkit.Application {
     void example_Panel(Window main, String param) {
         // Create a panel with a caption.
         final Panel panel = new Panel("Contact Information");
-        
+
         // Create a layout inside the panel
         final OrderedLayout form = new FormLayout();
-           
+
         // Set the layout as the root layout of the panel
         panel.setLayout(form);
-        
+
         // Add some components
         form.addComponent(new TextField("Name"));
         form.addComponent(new TextField("Email"));
@@ -557,8 +566,8 @@ public class MagiTestApplication extends com.itmill.toolkit.Application {
             main.setLayout(layout);
             layout.addStyleName("example-alignment");
 
-            layout.getSize().setWidth(400, Size.UNITS_PIXELS);
-            layout.getSize().setHeight(400, Size.UNITS_PIXELS);
+            layout.setWidth(400, Sizeable.UNITS_PIXELS);
+            layout.setHeight(400, Sizeable.UNITS_PIXELS);
 
             /* Define cells and their layouts to create. */
             /*
@@ -636,7 +645,7 @@ public class MagiTestApplication extends com.itmill.toolkit.Application {
             layout.expand(table);
 
             /* Set it to use all available area. */
-            table.getSize().setSizeFull();
+            table.setSizeFull();
 
             /* Add some component below the expanding one. */
             final Button button2 = new Button("Ok");
@@ -675,7 +684,8 @@ public class MagiTestApplication extends com.itmill.toolkit.Application {
         image.addStyleName("omaimage");
         main.addComponent(image);
 
-        final EmbeddedButton button = new EmbeddedButton(new ClassResource("smiley.jpg", this));
+        final EmbeddedButton button = new EmbeddedButton(new ClassResource(
+                "smiley.jpg", this));
         main.addComponent(button);
     }
 
@@ -694,10 +704,11 @@ public class MagiTestApplication extends com.itmill.toolkit.Application {
 
                 /* Add link to the second window in the main window. */
                 main.addComponent(new Label("Second window: <a href='"
-                                            + mywindow.getURL() + "'>middle-click to open</a>",
-                                  Label.CONTENT_XHTML));
-                main.addComponent(new Label("The second window can be accessed through URL: "
-                                            + mywindow.getURL()));
+                        + mywindow.getURL() + "'>middle-click to open</a>",
+                        Label.CONTENT_XHTML));
+                main.addComponent(new Label(
+                        "The second window can be accessed through URL: "
+                                + mywindow.getURL()));
             }
             return;
         }
@@ -712,8 +723,8 @@ public class MagiTestApplication extends com.itmill.toolkit.Application {
         mywindow.addComponent(okbutton);
 
         /* Set window size. */
-        mywindow.getSize().setHeight(200);
-        mywindow.getSize().setWidth(400);
+        mywindow.setHeight(200);
+        mywindow.setWidth(400);
 
         /* Set window position. */
         mywindow.setPositionX(200);
diff --git a/src/com/itmill/toolkit/tests/testbench/TestBench.java b/src/com/itmill/toolkit/tests/testbench/TestBench.java
index fc18e8efb8..9393eba5b8 100644
--- a/src/com/itmill/toolkit/tests/testbench/TestBench.java
+++ b/src/com/itmill/toolkit/tests/testbench/TestBench.java
@@ -15,7 +15,6 @@ import java.util.List;
 import com.itmill.toolkit.Application;
 import com.itmill.toolkit.data.Property;
 import com.itmill.toolkit.data.util.HierarchicalContainer;
-import com.itmill.toolkit.terminal.Size;
 import com.itmill.toolkit.ui.Component;
 import com.itmill.toolkit.ui.CustomComponent;
 import com.itmill.toolkit.ui.ExpandLayout;
@@ -108,7 +107,7 @@ public class TestBench extends com.itmill.toolkit.Application implements
         mainLayout.addComponent(menu);
 
         bodyLayout.addStyleName("light");
-        bodyLayout.getSize().setHeight(100, Size.UNITS_PERCENTAGE);
+        bodyLayout.setHeight(100, Component.UNITS_PERCENTAGE);
         bodyLayout.setLayout(new ExpandLayout());
 
         mainLayout.addComponent(bodyLayout);
diff --git a/src/com/itmill/toolkit/tests/testbench/TestForBasicApplicationLayout.java b/src/com/itmill/toolkit/tests/testbench/TestForBasicApplicationLayout.java
index cd41e345e9..eab315506f 100644
--- a/src/com/itmill/toolkit/tests/testbench/TestForBasicApplicationLayout.java
+++ b/src/com/itmill/toolkit/tests/testbench/TestForBasicApplicationLayout.java
@@ -9,8 +9,8 @@ import java.util.Locale;
 

 import com.itmill.toolkit.data.util.QueryContainer;

 import com.itmill.toolkit.demo.util.SampleDatabase;

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

 import com.itmill.toolkit.ui.Button;

+import com.itmill.toolkit.ui.Component;

 import com.itmill.toolkit.ui.CustomComponent;

 import com.itmill.toolkit.ui.DateField;

 import com.itmill.toolkit.ui.ExpandLayout;

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

 

             public void buttonClick(ClickEvent event) {

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

+                tab.setHeight(-1);

             }

 

         });

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

 

             public void buttonClick(ClickEvent event) {

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

+                tab.setHeight(100, TabSheet.UNITS_PERCENTAGE);

             }

 

         });

 

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

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

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

 

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

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

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

 

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

-        p.getSize().setSizeFull();

+        p.setSizeFull();

 

         tab = new TabSheet();

-        tab.getSize().setSizeFull();

+        tab.setSizeFull();

 

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

                 new ExpandLayout());

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

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

         report.addStyleName(Panel.STYLE_LIGHT);

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

+        report.setHeight(100, Component.UNITS_PERCENTAGE);

 

         sp2.setFirstComponent(report);

 

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

         table.setColumnReorderingAllowed(true);

         table.setSortDisabled(false);

-        table.getSize().setSizeFull();

+        table.setSizeFull();

         table.addStyleName("table-inline");

         sp2.setSecondComponent(table);

 

diff --git a/src/com/itmill/toolkit/tests/testbench/TestForContainerFilterable.java b/src/com/itmill/toolkit/tests/testbench/TestForContainerFilterable.java
index 705d4881dc..b507fcb446 100644
--- a/src/com/itmill/toolkit/tests/testbench/TestForContainerFilterable.java
+++ b/src/com/itmill/toolkit/tests/testbench/TestForContainerFilterable.java
@@ -5,8 +5,8 @@
 package com.itmill.toolkit.tests.testbench;
 
 import com.itmill.toolkit.data.util.IndexedContainer;
-import com.itmill.toolkit.terminal.Size;
 import com.itmill.toolkit.ui.Button;
+import com.itmill.toolkit.ui.Component;
 import com.itmill.toolkit.ui.CustomComponent;
 import com.itmill.toolkit.ui.Label;
 import com.itmill.toolkit.ui.OrderedLayout;
@@ -42,7 +42,7 @@ public class TestForContainerFilterable extends CustomComponent {
         // Init filtering view
         final Panel filterPanel = new Panel("Filter", new OrderedLayout(
                 OrderedLayout.ORIENTATION_HORIZONTAL));
-        filterPanel.getSize().setWidth(100, Size.UNITS_PERCENTAGE);
+        filterPanel.setWidth(100, Component.UNITS_PERCENTAGE);
         lo.addComponent(filterPanel);
         filterPanel.addComponent(firstFilter);
         filterPanel.addComponent(secondFilter);
@@ -56,7 +56,7 @@ public class TestForContainerFilterable extends CustomComponent {
         // Table
         lo.addComponent(t);
         t.setPageLength(12);
-        t.getSize().setWidth(100, Size.UNITS_PERCENTAGE);
+        t.setWidth(100, Component.UNITS_PERCENTAGE);
         t.setContainerDataSource(ic);
 
         // Handler
diff --git a/src/com/itmill/toolkit/tests/testbench/TestForPreconfiguredComponents.java b/src/com/itmill/toolkit/tests/testbench/TestForPreconfiguredComponents.java
index 144640460a..7ab15d7360 100644
--- a/src/com/itmill/toolkit/tests/testbench/TestForPreconfiguredComponents.java
+++ b/src/com/itmill/toolkit/tests/testbench/TestForPreconfiguredComponents.java
@@ -154,8 +154,8 @@ public class TestForPreconfiguredComponents extends CustomComponent implements
         ol2.addComponent(commit);
         status.addComponent(ol2);
 
-        status.getSize().setHeight(300);
-        status.getSize().setWidth(400);
+        status.setHeight(300);
+        status.setWidth(400);
 
         ol.addComponent(status);
 
diff --git a/src/com/itmill/toolkit/tests/testbench/TestForTrees.java b/src/com/itmill/toolkit/tests/testbench/TestForTrees.java
index 1ea7ee2da8..71884144db 100644
--- a/src/com/itmill/toolkit/tests/testbench/TestForTrees.java
+++ b/src/com/itmill/toolkit/tests/testbench/TestForTrees.java
@@ -134,8 +134,8 @@ public class TestForTrees extends CustomComponent implements Handler {
         });
         status.addComponent(clear);
 
-        status.getSize().setHeight(300);
-        status.getSize().setWidth(400);
+        status.setHeight(300);
+        status.setWidth(400);
 
         ol.addComponent(status);
 
diff --git a/src/com/itmill/toolkit/ui/AbstractComponent.java b/src/com/itmill/toolkit/ui/AbstractComponent.java
index 90099eecc7..137e48a0c2 100644
--- a/src/com/itmill/toolkit/ui/AbstractComponent.java
+++ b/src/com/itmill/toolkit/ui/AbstractComponent.java
@@ -115,6 +115,13 @@ public abstract class AbstractComponent implements Component, MethodEventSource
 
     private String testingId;
 
+    /* Sizeable fields */
+
+    private int width = SIZE_UNDEFINED;
+    private int height = SIZE_UNDEFINED;
+    private int widthUnit = UNITS_PIXELS;
+    private int heightUnit = UNITS_PIXELS;
+
     /* Constructor ***************************************************** */
 
     /**
@@ -576,6 +583,15 @@ public abstract class AbstractComponent implements Component, MethodEventSource
 
             // Paint the contents of the component
 
+            if (getHeight() >= 0) {
+                target.addAttribute("height", "" + getHeight()
+                        + UNIT_SYMBOLS[getHeightUnits()]);
+            }
+            if (getWidth() >= 0) {
+                target.addAttribute("width", "" + getWidth()
+                        + UNIT_SYMBOLS[getWidthUnits()]);
+            }
+
             if (styles != null && styles.size() > 0) {
                 target.addAttribute("style", getStyle());
             }
@@ -979,4 +995,118 @@ public abstract class AbstractComponent implements Component, MethodEventSource
     public Object getData() {
         return applicationData;
     }
+
+    /* Sizeable and other size related methods */
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see com.itmill.toolkit.terminal.Sizeable#getHeight()
+     */
+    public int getHeight() {
+        return height;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see com.itmill.toolkit.terminal.Sizeable#getHeightUnits()
+     */
+    public int getHeightUnits() {
+        return heightUnit;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see com.itmill.toolkit.terminal.Sizeable#getWidth()
+     */
+    public int getWidth() {
+        return width;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see com.itmill.toolkit.terminal.Sizeable#getWidthUnits()
+     */
+    public int getWidthUnits() {
+        return widthUnit;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see com.itmill.toolkit.terminal.Sizeable#setHeight(int)
+     */
+    public void setHeight(int height) {
+        this.height = height;
+        requestRepaint();
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see com.itmill.toolkit.terminal.Sizeable#setHeightUnits(int)
+     */
+    public void setHeightUnits(int unit) {
+        heightUnit = unit;
+        requestRepaint();
+    }
+
+    public void setHeight(int height, int unit) {
+        setHeight(height);
+        setHeightUnits(unit);
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see com.itmill.toolkit.terminal.Sizeable#setSizeFull()
+     */
+    public void setSizeFull() {
+        height = 100;
+        width = 100;
+        heightUnit = UNITS_PERCENTAGE;
+        widthUnit = UNITS_PERCENTAGE;
+        requestRepaint();
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see com.itmill.toolkit.terminal.Sizeable#setSizeUndefined()
+     */
+    public void setSizeUndefined() {
+        height = -1;
+        width = -1;
+        heightUnit = UNITS_PIXELS;
+        widthUnit = UNITS_PIXELS;
+        requestRepaint();
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see com.itmill.toolkit.terminal.Sizeable#setWidth(int)
+     */
+    public void setWidth(int width) {
+        this.width = width;
+        requestRepaint();
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see com.itmill.toolkit.terminal.Sizeable#setWidthUnits(int)
+     */
+    public void setWidthUnits(int unit) {
+        widthUnit = unit;
+        requestRepaint();
+    }
+
+    public void setWidth(int width, int unit) {
+        setWidth(width);
+        setWidthUnits(unit);
+    }
 }
\ No newline at end of file
diff --git a/src/com/itmill/toolkit/ui/Component.java b/src/com/itmill/toolkit/ui/Component.java
index a0cfe3338f..032f45c283 100644
--- a/src/com/itmill/toolkit/ui/Component.java
+++ b/src/com/itmill/toolkit/ui/Component.java
@@ -13,6 +13,7 @@ import com.itmill.toolkit.Application;
 import com.itmill.toolkit.terminal.ErrorMessage;
 import com.itmill.toolkit.terminal.Paintable;
 import com.itmill.toolkit.terminal.Resource;
+import com.itmill.toolkit.terminal.Sizeable;
 import com.itmill.toolkit.terminal.VariableOwner;
 
 /**
@@ -24,7 +25,7 @@ import com.itmill.toolkit.terminal.VariableOwner;
  * @VERSION@
  * @since 3.0
  */
-public interface Component extends Paintable, VariableOwner {
+public interface Component extends Paintable, VariableOwner, Sizeable {
 
     /**
      * Gets style for component. Multiple styles are joined with spaces.
diff --git a/src/com/itmill/toolkit/ui/CustomComponent.java b/src/com/itmill/toolkit/ui/CustomComponent.java
index 2deec9aedd..27c99f2f5c 100644
--- a/src/com/itmill/toolkit/ui/CustomComponent.java
+++ b/src/com/itmill/toolkit/ui/CustomComponent.java
@@ -507,4 +507,56 @@ public class CustomComponent implements Component {
         return testingId;
     }
 
+    // TODO bridge sizeable methods to composition root and documentate
+
+    public int getHeight() {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    public int getHeightUnits() {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    public int getWidth() {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    public int getWidthUnits() {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    public void setHeight(int height) {
+        // TODO Auto-generated method stub
+
+    }
+
+    public void setHeightUnits(int units) {
+        // TODO Auto-generated method stub
+
+    }
+
+    public void setSizeFull() {
+        // TODO Auto-generated method stub
+
+    }
+
+    public void setSizeUndefined() {
+        // TODO Auto-generated method stub
+
+    }
+
+    public void setWidth(int width) {
+        // TODO Auto-generated method stub
+
+    }
+
+    public void setWidthUnits(int units) {
+        // TODO Auto-generated method stub
+
+    }
+
 }
diff --git a/src/com/itmill/toolkit/ui/CustomLayout.java b/src/com/itmill/toolkit/ui/CustomLayout.java
index 4fff2c9e10..2b4ea0d481 100644
--- a/src/com/itmill/toolkit/ui/CustomLayout.java
+++ b/src/com/itmill/toolkit/ui/CustomLayout.java
@@ -7,10 +7,8 @@ package com.itmill.toolkit.ui;
 import java.util.HashMap;
 import java.util.Iterator;
 
-import com.itmill.toolkit.terminal.HasSize;
 import com.itmill.toolkit.terminal.PaintException;
 import com.itmill.toolkit.terminal.PaintTarget;
-import com.itmill.toolkit.terminal.Size;
 
 /**
  * <p>
@@ -39,7 +37,7 @@ import com.itmill.toolkit.terminal.Size;
  * @VERSION@
  * @since 3.0
  */
-public class CustomLayout extends AbstractLayout implements HasSize {
+public class CustomLayout extends AbstractLayout {
 
     /**
      * Custom layout slots containing the components.
@@ -48,14 +46,11 @@ public class CustomLayout extends AbstractLayout implements HasSize {
 
     private String templateName;
 
-    private Size size;
-
     /**
      * Constructor for custom layout with given template name.
      */
     public CustomLayout(String template) {
         templateName = template;
-        size = new Size(this);
     }
 
     /**
@@ -157,9 +152,6 @@ public class CustomLayout extends AbstractLayout implements HasSize {
     public void paintContent(PaintTarget target) throws PaintException {
         super.paintContent(target);
 
-        // Size
-        size.paint(target);
-
         target.addAttribute("template", templateName);
         // Adds all items in all the locations
         for (final Iterator i = slots.keySet().iterator(); i.hasNext();) {
@@ -260,8 +252,4 @@ public class CustomLayout extends AbstractLayout implements HasSize {
                 "CustomLayout does not support margins.");
     }
 
-    public Size getSize() {
-        return size;
-    }
-
 }
diff --git a/src/com/itmill/toolkit/ui/Embedded.java b/src/com/itmill/toolkit/ui/Embedded.java
index cc47ab10f3..92736e18da 100644
--- a/src/com/itmill/toolkit/ui/Embedded.java
+++ b/src/com/itmill/toolkit/ui/Embedded.java
@@ -7,11 +7,9 @@ package com.itmill.toolkit.ui;
 import java.util.Hashtable;
 import java.util.Iterator;
 
-import com.itmill.toolkit.terminal.HasSize;
 import com.itmill.toolkit.terminal.PaintException;
 import com.itmill.toolkit.terminal.PaintTarget;
 import com.itmill.toolkit.terminal.Resource;
-import com.itmill.toolkit.terminal.Size;
 
 /**
  * Component for embedding external objects.
@@ -21,7 +19,7 @@ import com.itmill.toolkit.terminal.Size;
  * @VERSION@
  * @since 3.0
  */
-public class Embedded extends AbstractComponent implements HasSize {
+public class Embedded extends AbstractComponent {
 
     /**
      * General object type.
@@ -71,8 +69,6 @@ public class Embedded extends AbstractComponent implements HasSize {
 
     private String archive = null;
 
-    private Size size = new Size(this);
-
     /**
      * Creates a new empty Embedded object.
      */
@@ -116,8 +112,6 @@ public class Embedded extends AbstractComponent implements HasSize {
      */
     public void paintContent(PaintTarget target) throws PaintException {
 
-        size.paint(target);
-
         switch (type) {
         case TYPE_IMAGE:
             target.addAttribute("type", "image");
@@ -417,66 +411,4 @@ public class Embedded extends AbstractComponent implements HasSize {
         }
     }
 
-    public Size getSize() {
-        return size;
-    }
-
-    /* Compatibility methods for previous Sizeable interface */
-
-    /**
-     * @deprecated use Size object instead (getSize().setWidth()).
-     */
-    public void setWidth(int width) {
-        size.setWidth(width);
-    }
-
-    /**
-     * @deprecated use Size object instead (getSize().setWidthUnits()).
-     */
-    public void setWidthUnits(int unit) {
-        size.setWidthUnits(unit);
-    }
-
-    /**
-     * @deprecated use Size object instead (getSize().setHeight()).
-     */
-    public void setHeight(int height) {
-        size.setHeight(height);
-    }
-
-    /**
-     * @deprecated use Size object instead (getSize().setHeightUnits()).
-     */
-    public void setHeightUnits(int unit) {
-        size.setHeightUnits(unit);
-    }
-
-    /**
-     * @deprecated use Size object instead (getSize().getWidth()).
-     */
-    public int getWidth() {
-        return size.getWidth();
-    }
-
-    /**
-     * @deprecated use Size object instead (getSize().getWidthUnits()).
-     */
-    public int getWidthUnits() {
-        return size.getWidthUnits();
-    }
-
-    /**
-     * @deprecated use Size object instead (getSize().getHeight()).
-     */
-    public int getHeight() {
-        return size.getHeight();
-    }
-
-    /**
-     * @deprecated use Size object instead (getSize().getHeightUnits()).
-     */
-    public int getHeightUnits() {
-        return size.getHeightUnits();
-    }
-
 }
diff --git a/src/com/itmill/toolkit/ui/ExpandLayout.java b/src/com/itmill/toolkit/ui/ExpandLayout.java
index 100fac872c..79cc69c1f1 100644
--- a/src/com/itmill/toolkit/ui/ExpandLayout.java
+++ b/src/com/itmill/toolkit/ui/ExpandLayout.java
@@ -6,10 +6,8 @@ package com.itmill.toolkit.ui;
 
 import java.util.Iterator;
 
-import com.itmill.toolkit.terminal.HasSize;
 import com.itmill.toolkit.terminal.PaintException;
 import com.itmill.toolkit.terminal.PaintTarget;
-import com.itmill.toolkit.terminal.Size;
 
 /**
  * TODO finish documentation
@@ -26,14 +24,12 @@ import com.itmill.toolkit.terminal.Size;
  * other components don't use. Or just provide expanded container.
  * 
  */
-public class ExpandLayout extends OrderedLayout implements HasSize {
+public class ExpandLayout extends OrderedLayout {
 
     private Component expanded;
-    private Size size;
 
     public ExpandLayout() {
-        size = new Size(this);
-        size.setSizeFull();
+        setSizeFull();
     }
 
     public ExpandLayout(int orientation) {
@@ -64,9 +60,6 @@ public class ExpandLayout extends OrderedLayout implements HasSize {
             target.addAttribute("spacing", true);
         }
 
-        // Size
-        size.paint(target);
-
         // Adds the attributes: orientation
         // note that the default values (b/vertival) are omitted
         if (getOrientation() == ORIENTATION_HORIZONTAL) {
@@ -133,8 +126,4 @@ public class ExpandLayout extends OrderedLayout implements HasSize {
         }
     }
 
-    public Size getSize() {
-        return size;
-    }
-
 }
diff --git a/src/com/itmill/toolkit/ui/GridLayout.java b/src/com/itmill/toolkit/ui/GridLayout.java
index 990ba634e2..532560fdfa 100644
--- a/src/com/itmill/toolkit/ui/GridLayout.java
+++ b/src/com/itmill/toolkit/ui/GridLayout.java
@@ -10,10 +10,8 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.Map;
 
-import com.itmill.toolkit.terminal.HasSize;
 import com.itmill.toolkit.terminal.PaintException;
 import com.itmill.toolkit.terminal.PaintTarget;
-import com.itmill.toolkit.terminal.Size;
 import com.itmill.toolkit.terminal.gwt.client.ui.AlignmentInfo;
 
 /**
@@ -36,7 +34,7 @@ import com.itmill.toolkit.terminal.gwt.client.ui.AlignmentInfo;
  * @VERSION@
  * @since 3.0
  */
-public class GridLayout extends AbstractLayout implements HasSize {
+public class GridLayout extends AbstractLayout {
 
     /**
      * Initial grid columns.
@@ -112,11 +110,6 @@ public class GridLayout extends AbstractLayout implements HasSize {
     private boolean spacing = false;
 
     /**
-     * Sizing object.
-     */
-    private Size size;
-
-    /**
      * Constructor for grid of given size (number of cells). Note that grid's
      * final size depends on the items that are added into the grid. Grid grows
      * if you add components outside the grid's area.
@@ -129,7 +122,6 @@ public class GridLayout extends AbstractLayout implements HasSize {
     public GridLayout(int columns, int rows) {
         setColumns(columns);
         setRows(rows);
-        size = new Size(this);
     }
 
     /**
@@ -393,9 +385,6 @@ public class GridLayout extends AbstractLayout implements HasSize {
 
         super.paintContent(target);
 
-        // Size
-        size.paint(target);
-
         // TODO refactor attribute names in future release.
         target.addAttribute("h", rows);
         target.addAttribute("w", cols);
@@ -1026,8 +1015,4 @@ public class GridLayout extends AbstractLayout implements HasSize {
         spacing = enabled;
     }
 
-    public Size getSize() {
-        return size;
-    }
-
 }
diff --git a/src/com/itmill/toolkit/ui/Panel.java b/src/com/itmill/toolkit/ui/Panel.java
index 22f87ac220..a155759761 100644
--- a/src/com/itmill/toolkit/ui/Panel.java
+++ b/src/com/itmill/toolkit/ui/Panel.java
@@ -11,12 +11,10 @@ import java.util.Map;
 import com.itmill.toolkit.event.Action;
 import com.itmill.toolkit.event.ShortcutAction;
 import com.itmill.toolkit.event.Action.Handler;
-import com.itmill.toolkit.terminal.HasSize;
 import com.itmill.toolkit.terminal.KeyMapper;
 import com.itmill.toolkit.terminal.PaintException;
 import com.itmill.toolkit.terminal.PaintTarget;
 import com.itmill.toolkit.terminal.Scrollable;
-import com.itmill.toolkit.terminal.Size;
 
 /**
  * Panel - a simple single component container.
@@ -26,15 +24,13 @@ import com.itmill.toolkit.terminal.Size;
  * @VERSION@
  * @since 3.0
  */
-public class Panel extends AbstractComponentContainer implements HasSize,
-        Scrollable, ComponentContainer.ComponentAttachListener,
+public class Panel extends AbstractComponentContainer implements Scrollable,
+        ComponentContainer.ComponentAttachListener,
         ComponentContainer.ComponentDetachListener, Action.Container {
 
     public static final String STYLE_LIGHT = "light";
 
     public static final String STYLE_EMPHASIZE = "emphasize";
-    
-    private Size size;
 
     /**
      * Layout of the panel.
@@ -67,7 +63,6 @@ public class Panel extends AbstractComponentContainer implements HasSize,
      */
     public Panel() {
         setLayout(null);
-        size = new Size(this);
     }
 
     /**
@@ -78,7 +73,6 @@ public class Panel extends AbstractComponentContainer implements HasSize,
      */
     public Panel(Layout layout) {
         setLayout(layout);
-        size = new Size(this);
     }
 
     /**
@@ -102,7 +96,6 @@ public class Panel extends AbstractComponentContainer implements HasSize,
     public Panel(String caption, Layout layout) {
         this(layout);
         setCaption(caption);
-        size = new Size(this);
     }
 
     /**
@@ -169,13 +162,13 @@ public class Panel extends AbstractComponentContainer implements HasSize,
         layout.paint(target);
 
         // Add size info as variables
-        if (size.getHeight() > -1) {
-            target.addVariable(this, "height", size.getHeight()
-                    + Size.UNIT_SYMBOLS[size.getHeightUnits()]);
+        if (getHeight() > -1) {
+            target.addVariable(this, "height", getHeight()
+                    + UNIT_SYMBOLS[getHeightUnits()]);
         }
-        if (size.getWidth() > -1) {
-            target.addVariable(this, "width", size.getWidth()
-                    + Size.UNIT_SYMBOLS[size.getWidthUnits()]);
+        if (getWidth() > -1) {
+            target.addVariable(this, "width", getWidth()
+                    + UNIT_SYMBOLS[getWidthUnits()]);
         }
 
         if (isScrollable()) {
@@ -282,16 +275,16 @@ public class Panel extends AbstractComponentContainer implements HasSize,
         // Get new size
         final Integer newWidth = (Integer) variables.get("width");
         final Integer newHeight = (Integer) variables.get("height");
-        if (newWidth != null && newWidth.intValue() != size.getWidth()) {
-            size.setWidth(newWidth.intValue());
+        if (newWidth != null && newWidth.intValue() != getWidth()) {
+            setWidth(newWidth.intValue());
             // ensure units, as we are reading pixels
-            size.setWidthUnits(Size.UNITS_PIXELS);
+            setWidthUnits(UNITS_PIXELS);
 
         }
-        if (newHeight != null && newHeight.intValue() != size.getHeight()) {
-            size.setHeight(newHeight.intValue());
+        if (newHeight != null && newHeight.intValue() != getHeight()) {
+            setHeight(newHeight.intValue());
             // ensure units, as we are reading pixels
-            size.setHeightUnits(Size.UNITS_PIXELS);
+            setHeightUnits(UNITS_PIXELS);
         }
 
         // Scrolling
@@ -462,68 +455,4 @@ public class Panel extends AbstractComponentContainer implements HasSize,
             requestRepaint();
         }
     }
-
-    public Size getSize() {
-        return size;
-    }
-    
-    
-    /* Compatibility methods */
-    
-    /**
-     * @deprecated use Size object instead (getSize().setWidth()).
-     */
-    public void setWidth(int width) {
-        size.setWidth(width);
-    }
-    
-    /**
-     * @deprecated use Size object instead (getSize().setWidthUnits()).
-     */
-    public void setWidthUnits(int unit) {
-        size.setWidthUnits(unit);
-    }
-    
-    /**
-     * @deprecated use Size object instead (getSize().setHeight()).
-     */
-    public void setHeight(int height) {
-        size.setHeight(height);
-    }
-    
-    /**
-     * @deprecated use Size object instead (getSize().setHeightUnits()).
-     */
-    public void setHeightUnits(int unit) {
-        size.setHeightUnits(unit);
-    }
-    
-    /**
-     * @deprecated use Size object instead (getSize().getWidth()).
-     */
-    public int getWidth() {
-        return size.getWidth();
-    }
-    
-    /**
-     * @deprecated use Size object instead (getSize().getWidthUnits()).
-     */
-    public int getWidthUnits() {
-        return size.getWidthUnits();
-    }
-    
-    /**
-     * @deprecated use Size object instead (getSize().getHeight()).
-     */
-    public int getHeight() {
-        return size.getHeight();
-    }
-    
-    /**
-     * @deprecated use Size object instead (getSize().getHeightUnits()).
-     */
-    public int getHeightUnits() {
-        return size.getHeightUnits();
-    }
-
 }
diff --git a/src/com/itmill/toolkit/ui/SplitPanel.java b/src/com/itmill/toolkit/ui/SplitPanel.java
index 2ec748f3e1..dd4c96c4b9 100644
--- a/src/com/itmill/toolkit/ui/SplitPanel.java
+++ b/src/com/itmill/toolkit/ui/SplitPanel.java
@@ -6,10 +6,8 @@ package com.itmill.toolkit.ui;
 
 import java.util.Iterator;
 
-import com.itmill.toolkit.terminal.HasSize;
 import com.itmill.toolkit.terminal.PaintException;
 import com.itmill.toolkit.terminal.PaintTarget;
-import com.itmill.toolkit.terminal.Size;
 
 /**
  * SplitPanel.
@@ -22,7 +20,7 @@ import com.itmill.toolkit.terminal.Size;
  * @VERSION@
  * @since 5.0
  */
-public class SplitPanel extends AbstractLayout implements HasSize {
+public class SplitPanel extends AbstractLayout {
 
     /* Predefined orientations ***************************************** */
 
@@ -47,9 +45,7 @@ public class SplitPanel extends AbstractLayout implements HasSize {
 
     private int pos = 50;
 
-    private int posUnit = Size.UNITS_PERCENTAGE;
-
-    private Size size;
+    private int posUnit = UNITS_PERCENTAGE;
 
     /**
      * Creates a new split panel. The orientation of the panels is
@@ -57,8 +53,7 @@ public class SplitPanel extends AbstractLayout implements HasSize {
      */
     public SplitPanel() {
         orientation = ORIENTATION_VERTICAL;
-        size = new Size(this);
-        size.setSizeFull();
+        setSizeFull();
     }
 
     /**
@@ -198,9 +193,7 @@ public class SplitPanel extends AbstractLayout implements HasSize {
     public void paintContent(PaintTarget target) throws PaintException {
         super.paintContent(target);
 
-        size.paint(target);
-
-        final String position = pos + Size.UNIT_SYMBOLS[posUnit];
+        final String position = pos + UNIT_SYMBOLS[posUnit];
 
         target.addAttribute("position", position);
 
@@ -260,7 +253,7 @@ public class SplitPanel extends AbstractLayout implements HasSize {
      *                the new size of the first region in persentage
      */
     public void setSplitPosition(int pos) {
-        setSplitPosition(pos, Size.UNITS_PERCENTAGE);
+        setSplitPosition(pos, UNITS_PERCENTAGE);
     }
 
     /**
@@ -269,16 +262,11 @@ public class SplitPanel extends AbstractLayout implements HasSize {
      * @param pos
      *                size of the first region
      * @param unit
-     *                the unit (from {@link Size}) in which the size is
-     *                given.
+     *                the unit (from {@link Size}) in which the size is given.
      */
     public void setSplitPosition(int pos, int unit) {
         this.pos = pos;
         posUnit = unit;
     }
 
-    public Size getSize() {
-        return size;
-    }
-
 }
diff --git a/src/com/itmill/toolkit/ui/TabSheet.java b/src/com/itmill/toolkit/ui/TabSheet.java
index 4780a8702d..7f26853d37 100644
--- a/src/com/itmill/toolkit/ui/TabSheet.java
+++ b/src/com/itmill/toolkit/ui/TabSheet.java
@@ -10,12 +10,10 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.Map;
 
-import com.itmill.toolkit.terminal.HasSize;
 import com.itmill.toolkit.terminal.KeyMapper;
 import com.itmill.toolkit.terminal.PaintException;
 import com.itmill.toolkit.terminal.PaintTarget;
 import com.itmill.toolkit.terminal.Resource;
-import com.itmill.toolkit.terminal.Size;
 
 /**
  * Tabsheet component.
@@ -25,7 +23,7 @@ import com.itmill.toolkit.terminal.Size;
  * @VERSION@
  * @since 3.0
  */
-public class TabSheet extends AbstractComponentContainer implements HasSize {
+public class TabSheet extends AbstractComponentContainer {
 
     /**
      * Linked list of component tabs.
@@ -54,15 +52,12 @@ public class TabSheet extends AbstractComponentContainer implements HasSize {
      */
     private boolean tabsHidden;
 
-    private Size size;
-
     /**
      * Constructs a new Tabsheet. Tabsheet is immediate by default.
      */
     public TabSheet() {
         super();
         setImmediate(true);
-        size = new Size(this);
     }
 
     /**
@@ -177,9 +172,6 @@ public class TabSheet extends AbstractComponentContainer implements HasSize {
      */
     public void paintContent(PaintTarget target) throws PaintException {
 
-        // Size
-        size.paint(target);
-
         if (areTabsHidden()) {
             target.addAttribute("hidetabs", true);
         }
@@ -482,8 +474,4 @@ public class TabSheet extends AbstractComponentContainer implements HasSize {
         fireEvent(new SelectedTabChangeEvent(this));
     }
 
-    public Size getSize() {
-        return size;
-    }
-
 }
diff --git a/src/com/itmill/toolkit/ui/Table.java b/src/com/itmill/toolkit/ui/Table.java
index 5dbadf6d9c..9de28bbb17 100644
--- a/src/com/itmill/toolkit/ui/Table.java
+++ b/src/com/itmill/toolkit/ui/Table.java
@@ -21,12 +21,10 @@ import com.itmill.toolkit.data.Property;
 import com.itmill.toolkit.data.util.ContainerOrderedWrapper;
 import com.itmill.toolkit.data.util.IndexedContainer;
 import com.itmill.toolkit.event.Action;
-import com.itmill.toolkit.terminal.HasSize;
 import com.itmill.toolkit.terminal.KeyMapper;
 import com.itmill.toolkit.terminal.PaintException;
 import com.itmill.toolkit.terminal.PaintTarget;
 import com.itmill.toolkit.terminal.Resource;
-import com.itmill.toolkit.terminal.Size;
 
 /**
  * <code>TableComponent</code> is used for representing data or components in
@@ -38,7 +36,7 @@ import com.itmill.toolkit.terminal.Size;
  * @since 3.0
  */
 public class Table extends AbstractSelect implements Action.Container,
-        Container.Ordered, Container.Sortable, HasSize {
+        Container.Ordered, Container.Sortable {
 
     private static final int CELL_KEY = 0;
 
@@ -50,8 +48,6 @@ public class Table extends AbstractSelect implements Action.Container,
 
     private static final int CELL_FIRSTCOL = 4;
 
-    private Size size;
-
     /**
      * Left column alignment. <b>This is the default behaviour. </b>
      */
@@ -291,7 +287,6 @@ public class Table extends AbstractSelect implements Action.Container,
      */
     public Table() {
         setRowHeaderMode(ROW_HEADER_MODE_HIDDEN);
-        size = new Size(this);
     }
 
     /**
@@ -1405,9 +1400,6 @@ public class Table extends AbstractSelect implements Action.Container,
             target.addAttribute("tabindex", getTabIndex());
         }
 
-        // Size
-        size.paint(target);
-
         // Initialize temps
         final Object[] colids = getVisibleColumns();
         final int cols = colids.length;
@@ -2428,66 +2420,4 @@ public class Table extends AbstractSelect implements Action.Container,
         }
     }
 
-    public Size getSize() {
-        return size;
-    }
-    
-    /* Compatibility methods */
-    
-    /**
-     * @deprecated use Size object instead (getSize().setWidth()).
-     */
-    public void setWidth(int width) {
-        size.setWidth(width);
-    }
-    
-    /**
-     * @deprecated use Size object instead (getSize().setWidthUnits()).
-     */
-    public void setWidthUnits(int unit) {
-        size.setWidthUnits(unit);
-    }
-    
-    /**
-     * @deprecated use Size object instead (getSize().setHeight()).
-     */
-    public void setHeight(int height) {
-        size.setHeight(height);
-    }
-    
-    /**
-     * @deprecated use Size object instead (getSize().setHeightUnits()).
-     */
-    public void setHeightUnits(int unit) {
-        size.setHeightUnits(unit);
-    }
-    
-    /**
-     * @deprecated use Size object instead (getSize().getWidth()).
-     */
-    public int getWidth() {
-        return size.getWidth();
-    }
-    
-    /**
-     * @deprecated use Size object instead (getSize().getWidthUnits()).
-     */
-    public int getWidthUnits() {
-        return size.getWidthUnits();
-    }
-    
-    /**
-     * @deprecated use Size object instead (getSize().getHeight()).
-     */
-    public int getHeight() {
-        return size.getHeight();
-    }
-    
-    /**
-     * @deprecated use Size object instead (getSize().getHeightUnits()).
-     */
-    public int getHeightUnits() {
-        return size.getHeightUnits();
-    }
-
 }
\ No newline at end of file