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

svn changeset:3228/svn branch:trunk

1 files changed, 0 insertions, 135 deletions

diff --git a/src/com/itmill/toolkit/ui/AbstractLayout.java b/src/com/itmill/toolkit/ui/AbstractLayout.java
index d66376052a..43349e929a 100644
--- a/src/com/itmill/toolkit/ui/AbstractLayout.java
+++ b/src/com/itmill/toolkit/ui/AbstractLayout.java
@@ -23,30 +23,6 @@ public abstract class AbstractLayout extends AbstractComponentContainer
 
     protected MarginInfo margins = new MarginInfo(false, false, false, false);
 
-    /**
-     * Height of the layout. Set to -1 for undefined height.
-     */
-    private int height = -1;
-
-    /**
-     * Height unit.
-     * 
-     * @see com.itmill.toolkit.terminal.Sizeable.UNIT_SYMBOLS;
-     */
-    private int heightUnit = UNITS_PIXELS;
-
-    /**
-     * Width of the layout. Set to -1 for undefined width.
-     */
-    private int width = -1;
-
-    /**
-     * Width unit.
-     * 
-     * @see com.itmill.toolkit.terminal.Sizeable.UNIT_SYMBOLS;
-     */
-    private int widthUnit = UNITS_PIXELS;
-
     /*
      * (non-Javadoc)
      * 
@@ -81,108 +57,6 @@ public abstract class AbstractLayout extends AbstractComponentContainer
     /*
      * (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 units) {
-        heightUnit = units;
-        requestRepaint();
-    }
-
-    /*
-     * (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 units) {
-        widthUnit = units;
-        requestRepaint();
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
      * @see com.itmill.toolkit.ui.AbstractComponent#paintContent(com.itmill.toolkit.terminal.PaintTarget)
      */
     public void paintContent(PaintTarget target) throws PaintException {
@@ -190,15 +64,6 @@ public abstract class AbstractLayout extends AbstractComponentContainer
         // Add margin info. Defaults to false.
         target.addAttribute("margins", margins.getBitMask());
 
-        // Size
-        if (getHeight() >= 0) {
-            target.addAttribute("height", "" + getHeight()
-                    + Sizeable.UNIT_SYMBOLS[getHeightUnits()]);
-        }
-        if (getWidth() >= 0) {
-            target.addAttribute("width", "" + getWidth()
-                    + Sizeable.UNIT_SYMBOLS[getWidthUnits()]);
-        }
     }
 
 }