Removed dead code (#5734)

svn changeset:15438/svn branch:6.5

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VSlider.java b/src/com/vaadin/terminal/gwt/client/ui/VSlider.java
index 9b7103d39fa475c79eab91d90f274427b5fa3ee3..1033fd53dd17e6680fbf444f76b5e6b9d059c3d2 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VSlider.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VSlider.java
@@ -46,7 +46,6 @@ public class VSlider extends SimpleFocusablePanel implements Paintable, Field,
     private int resolution;\r
     private Double value;\r
     private boolean vertical;\r
-    private final int size = -1;\r
     private boolean arrows;\r
 \r
     private final HTML feedback = new HTML("", false);\r
@@ -198,35 +197,31 @@ public class VSlider extends SimpleFocusablePanel implements Paintable, Field,
         final String styleAttribute = vertical ? "height" : "width";\r
         final String domProperty = vertical ? "offsetHeight" : "offsetWidth";\r
 \r
-        if (size == -1) {\r
-            final Element p = DOM.getParent(getElement());\r
-            if (DOM.getElementPropertyInt(p, domProperty) > 50) {\r
-                if (vertical) {\r
-                    setHeight();\r
-                } else {\r
-                    DOM.setStyleAttribute(base, styleAttribute, "");\r
-                }\r
+        final Element p = DOM.getParent(getElement());\r
+        if (DOM.getElementPropertyInt(p, domProperty) > 50) {\r
+            if (vertical) {\r
+                setHeight();\r
             } else {\r
-                // Set minimum size and adjust after all components have\r
-                // (supposedly) been drawn completely.\r
-                DOM.setStyleAttribute(base, styleAttribute, MIN_SIZE + "px");\r
-                DeferredCommand.addCommand(new Command() {\r
-                    public void execute() {\r
-                        final Element p = DOM.getParent(getElement());\r
-                        if (DOM.getElementPropertyInt(p, domProperty) > (MIN_SIZE + 5)) {\r
-                            if (vertical) {\r
-                                setHeight();\r
-                            } else {\r
-                                DOM.setStyleAttribute(base, styleAttribute, "");\r
-                            }\r
-                            // Ensure correct position\r
-                            setValue(value, false);\r
-                        }\r
-                    }\r
-                });\r
+                DOM.setStyleAttribute(base, styleAttribute, "");\r
             }\r
         } else {\r
-            DOM.setStyleAttribute(base, styleAttribute, size + "px");\r
+            // Set minimum size and adjust after all components have\r
+            // (supposedly) been drawn completely.\r
+            DOM.setStyleAttribute(base, styleAttribute, MIN_SIZE + "px");\r
+            DeferredCommand.addCommand(new Command() {\r
+                public void execute() {\r
+                    final Element p = DOM.getParent(getElement());\r
+                    if (DOM.getElementPropertyInt(p, domProperty) > (MIN_SIZE + 5)) {\r
+                        if (vertical) {\r
+                            setHeight();\r
+                        } else {\r
+                            DOM.setStyleAttribute(base, styleAttribute, "");\r
+                        }\r
+                        // Ensure correct position\r
+                        setValue(value, false);\r
+                    }\r
+                }\r
+            });\r
         }\r
 \r
         // TODO attach listeners for focusing and arrow keys\r
@@ -493,18 +488,14 @@ public class VSlider extends SimpleFocusablePanel implements Paintable, Field,
     }\r
 \r
     private void setHeight() {\r
-        if (size == -1) {\r
-            // Calculate decoration size\r
-            DOM.setStyleAttribute(base, "height", "0");\r
-            DOM.setStyleAttribute(base, "overflow", "hidden");\r
-            int h = DOM.getElementPropertyInt(getElement(), "offsetHeight");\r
-            if (h < MIN_SIZE) {\r
-                h = MIN_SIZE;\r
-            }\r
-            DOM.setStyleAttribute(base, "height", h + "px");\r
-        } else {\r
-            DOM.setStyleAttribute(base, "height", size + "px");\r
+        // Calculate decoration size\r
+        DOM.setStyleAttribute(base, "height", "0");\r
+        DOM.setStyleAttribute(base, "overflow", "hidden");\r
+        int h = DOM.getElementPropertyInt(getElement(), "offsetHeight");\r
+        if (h < MIN_SIZE) {\r
+            h = MIN_SIZE;\r
         }\r
+        DOM.setStyleAttribute(base, "height", h + "px");\r
         DOM.setStyleAttribute(base, "overflow", "");\r
     }\r
 \r