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

svn changeset:4507/svn branch:trunk

diff --git a/src/com/itmill/toolkit/demo/featurebrowser/ValueInputExample.java b/src/com/itmill/toolkit/demo/featurebrowser/ValueInputExample.java
index 6bbd8759177c3a6783973292cdbdec295175aa3d..4437e042ad6e18fbca9f5936adaad2635c9714d3 100644 (file)
--- 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);\r
         // int slider\r
         Slider slider = new Slider(0, 100);\r
-        slider.setSize(300);\r
+        slider.setWidth("300px");\r
+        // slider.setSize(300);\r
         slider.setImmediate(true);\r
         slider.addListener(new Slider.ValueChangeListener() {\r
             public void valueChange(ValueChangeEvent event) {\r

diff --git a/src/com/itmill/toolkit/ui/Slider.java b/src/com/itmill/toolkit/ui/Slider.java
index d459b3123e5ed1c1ea92984d05d2408a8f8dc118..ebef0017f0fb9a3f1f09d76029616ba05d519389 100644 (file)
--- 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\r
      * of container. In vertical mode, if set to -1, default height is\r
      * determined by the client-side implementation.\r
+     * \r
+     * @deprecated\r
      */\r
     private int size = -1;\r
 \r
@@ -313,6 +315,7 @@ public class Slider extends AbstractField {
      * Get the current Slider size.\r
      * \r
      * @return size in pixels or -1 for auto sizing.\r
+     * @deprecated use standard getWidth/getHeight instead\r
      */\r
     public int getSize() {\r
         return size;\r
@@ -323,9 +326,20 @@ public class Slider extends AbstractField {
      * \r
      * @param size\r
      *                in pixels, or -1 auto sizing.\r
+     * @deprecated use standard setWidth/setHeight instead\r
      */\r
     public void setSize(int size) {\r
         this.size = size;\r
+        switch (orientation) {\r
+        case ORIENTATION_HORIZONTAL:\r
+            setWidth(size);\r
+            setWidthUnits(UNITS_PIXELS);\r
+            break;\r
+        default:\r
+            setHeight(size);\r
+            setHeightUnits(UNITS_PIXELS);\r
+            break;\r
+        }\r
         requestRepaint();\r
     }\r
 \r
@@ -424,8 +438,8 @@ public class Slider extends AbstractField {
      * @param variables\r
      */\r
     public void changeVariables(Object source, Map variables) {\r
-       super.changeVariables(source, variables);\r
-       if (variables.containsKey("value")) {\r
+        super.changeVariables(source, variables);\r
+        if (variables.containsKey("value")) {\r
             final Object value = variables.get("value");\r
             final Double newValue = new Double(value.toString());\r
             if (newValue != null && newValue != getValue()\r