deprecated slider setSize (we can use setWidth/setHeight) as all component support them nowdays)

svn changeset:4507/svn branch:trunk

2 files changed, 18 insertions, 3 deletions

diff --git a/src/com/itmill/toolkit/demo/featurebrowser/ValueInputExample.java b/src/com/itmill/toolkit/demo/featurebrowser/ValueInputExample.java
index 6bbd875917..4437e042ad 100644
--- a/src/com/itmill/toolkit/demo/featurebrowser/ValueInputExample.java
+++ b/src/com/itmill/toolkit/demo/featurebrowser/ValueInputExample.java
@@ -105,7 +105,8 @@ public class ValueInputExample extends CustomComponent {
         main.addComponent(left);

         // int slider

         Slider slider = new Slider(0, 100);

-        slider.setSize(300);

+        slider.setWidth("300px");

+        // slider.setSize(300);

         slider.setImmediate(true);

         slider.addListener(new Slider.ValueChangeListener() {

             public void valueChange(ValueChangeEvent event) {

diff --git a/src/com/itmill/toolkit/ui/Slider.java b/src/com/itmill/toolkit/ui/Slider.java
index d459b3123e..ebef0017f0 100644
--- a/src/com/itmill/toolkit/ui/Slider.java
+++ b/src/com/itmill/toolkit/ui/Slider.java
@@ -78,6 +78,8 @@ public class Slider extends AbstractField {
      * Slider size in pixels. In horizontal mode, if set to -1, allow 100% width

      * of container. In vertical mode, if set to -1, default height is

      * determined by the client-side implementation.

+     * 

+     * @deprecated

      */

     private int size = -1;

 

@@ -313,6 +315,7 @@ public class Slider extends AbstractField {
      * Get the current Slider size.

      * 

      * @return size in pixels or -1 for auto sizing.

+     * @deprecated use standard getWidth/getHeight instead

      */

     public int getSize() {

         return size;

@@ -323,9 +326,20 @@ public class Slider extends AbstractField {
      * 

      * @param size

      *                in pixels, or -1 auto sizing.

+     * @deprecated use standard setWidth/setHeight instead

      */

     public void setSize(int size) {

         this.size = size;

+        switch (orientation) {

+        case ORIENTATION_HORIZONTAL:

+            setWidth(size);

+            setWidthUnits(UNITS_PIXELS);

+            break;

+        default:

+            setHeight(size);

+            setHeightUnits(UNITS_PIXELS);

+            break;

+        }

         requestRepaint();

     }

 

@@ -424,8 +438,8 @@ public class Slider extends AbstractField {
      * @param variables

      */

     public void changeVariables(Object source, Map variables) {

-    	super.changeVariables(source, variables);

-    	if (variables.containsKey("value")) {

+        super.changeVariables(source, variables);

+        if (variables.containsKey("value")) {

             final Object value = variables.get("value");

             final Double newValue = new Double(value.toString());

             if (newValue != null && newValue != getValue()