Removed the deprecated sizing with float API in Sizable.

diff --git a/src/com/vaadin/terminal/Sizeable.java b/src/com/vaadin/terminal/Sizeable.java
index c3e8ee4e9bcbae8d403de202e304784f7073695f..32e0cfd2d680e4bbeeaa8dd7be82418789d9461d 100644 (file)
--- a/src/com/vaadin/terminal/Sizeable.java
+++ b/src/com/vaadin/terminal/Sizeable.java
@@ -92,21 +92,6 @@ public interface Sizeable extends Serializable {
      */
     public float getWidth();
 
-    /**
-     * Sets the width of the object. Negative number implies unspecified size
-     * (terminal is free to set the size).
-     * 
-     * @param width
-     *            the width of the object in units specified by widthUnits
-     *            property.
-     * @deprecated Consider using {@link #setWidth(String)} instead. This method
-     *             works, but is error-prone since the unit must be set
-     *             separately (and components might have different default
-     *             unit).
-     */
-    @Deprecated
-    public void setWidth(float width);
-
     /**
      * Gets the height of the object. Negative number implies unspecified size
      * (terminal is free to set the size).
@@ -115,21 +100,6 @@ public interface Sizeable extends Serializable {
      */
     public float getHeight();
 
-    /**
-     * Sets the height of the object. Negative number implies unspecified size
-     * (terminal is free to set the size).
-     * 
-     * @param height
-     *            the height of the object in units specified by heightUnits
-     *            property.
-     * @deprecated Consider using {@link #setHeight(String)} or
-     *             {@link #setHeight(float, int)} instead. This method works,
-     *             but is error-prone since the unit must be set separately (and
-     *             components might have different default unit).
-     */
-    @Deprecated
-    public void setHeight(float height);
-
     /**
      * Gets the width property units.
      * 
@@ -137,18 +107,6 @@ public interface Sizeable extends Serializable {
      */
     public int getWidthUnits();
 
-    /**
-     * Sets the width property units.
-     * 
-     * @param units
-     *            the units used in width property.
-     * @deprecated Consider setting width and unit simultaneously using
-     *             {@link #setWidth(String)} or {@link #setWidth(float, int)},
-     *             which is less error-prone.
-     */
-    @Deprecated
-    public void setWidthUnits(int units);
-
     /**
      * Gets the height property units.
      * 
@@ -156,18 +114,6 @@ public interface Sizeable extends Serializable {
      */
     public int getHeightUnits();
 
-    /**
-     * Sets the height property units.
-     * 
-     * @param units
-     *            the units used in height property.
-     * @deprecated Consider setting height and unit simultaneously using
-     *             {@link #setHeight(String)} or {@link #setHeight(float, int)},
-     *             which is less error-prone.
-     */
-    @Deprecated
-    public void setHeightUnits(int units);
-
     /**
      * Sets the height of the component using String presentation.
      * 

diff --git a/src/com/vaadin/ui/AbstractComponent.java b/src/com/vaadin/ui/AbstractComponent.java
index b9fffac35f8061f36ec2cf25620c70d50f4ec4fb..277e56cefecfe04660f191c6c7f9bf844dde8c14 100644 (file)
--- a/src/com/vaadin/ui/AbstractComponent.java
+++ b/src/com/vaadin/ui/AbstractComponent.java
@@ -1319,26 +1319,6 @@ public abstract class AbstractComponent implements Component, MethodEventSource
         return widthUnit;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.vaadin.terminal.Sizeable#setHeight(float)
-     */
-    @Deprecated
-    public void setHeight(float height) {
-        setHeight(height, getHeightUnits());
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.vaadin.terminal.Sizeable#setHeightUnits(int)
-     */
-    @Deprecated
-    public void setHeightUnits(int unit) {
-        setHeight(getHeight(), unit);
-    }
-
     /*
      * (non-Javadoc)
      * 
@@ -1371,26 +1351,6 @@ public abstract class AbstractComponent implements Component, MethodEventSource
         setHeight(-1, UNITS_PIXELS);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.vaadin.terminal.Sizeable#setWidth(float)
-     */
-    @Deprecated
-    public void setWidth(float width) {
-        setWidth(width, getWidthUnits());
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.vaadin.terminal.Sizeable#setWidthUnits(int)
-     */
-    @Deprecated
-    public void setWidthUnits(int unit) {
-        setWidth(getWidth(), unit);
-    }
-
     /*
      * (non-Javadoc)
      *