From 247d0208816bcf53fd986564dd3e3a51881ee637 Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Thu, 7 Oct 2010 08:07:27 +0000 Subject: [PATCH] Removed dead code (#5734) svn changeset:15438/svn branch:6.5 --- .../terminal/gwt/client/ui/VSlider.java | 67 ++++++++----------- 1 file changed, 29 insertions(+), 38 deletions(-) diff --git a/src/com/vaadin/terminal/gwt/client/ui/VSlider.java b/src/com/vaadin/terminal/gwt/client/ui/VSlider.java index 9b7103d39f..1033fd53dd 100644 --- 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; private Double value; private boolean vertical; - private final int size = -1; private boolean arrows; private final HTML feedback = new HTML("", false); @@ -198,35 +197,31 @@ public class VSlider extends SimpleFocusablePanel implements Paintable, Field, final String styleAttribute = vertical ? "height" : "width"; final String domProperty = vertical ? "offsetHeight" : "offsetWidth"; - if (size == -1) { - final Element p = DOM.getParent(getElement()); - if (DOM.getElementPropertyInt(p, domProperty) > 50) { - if (vertical) { - setHeight(); - } else { - DOM.setStyleAttribute(base, styleAttribute, ""); - } + final Element p = DOM.getParent(getElement()); + if (DOM.getElementPropertyInt(p, domProperty) > 50) { + if (vertical) { + setHeight(); } else { - // Set minimum size and adjust after all components have - // (supposedly) been drawn completely. - DOM.setStyleAttribute(base, styleAttribute, MIN_SIZE + "px"); - DeferredCommand.addCommand(new Command() { - public void execute() { - final Element p = DOM.getParent(getElement()); - if (DOM.getElementPropertyInt(p, domProperty) > (MIN_SIZE + 5)) { - if (vertical) { - setHeight(); - } else { - DOM.setStyleAttribute(base, styleAttribute, ""); - } - // Ensure correct position - setValue(value, false); - } - } - }); + DOM.setStyleAttribute(base, styleAttribute, ""); } } else { - DOM.setStyleAttribute(base, styleAttribute, size + "px"); + // Set minimum size and adjust after all components have + // (supposedly) been drawn completely. + DOM.setStyleAttribute(base, styleAttribute, MIN_SIZE + "px"); + DeferredCommand.addCommand(new Command() { + public void execute() { + final Element p = DOM.getParent(getElement()); + if (DOM.getElementPropertyInt(p, domProperty) > (MIN_SIZE + 5)) { + if (vertical) { + setHeight(); + } else { + DOM.setStyleAttribute(base, styleAttribute, ""); + } + // Ensure correct position + setValue(value, false); + } + } + }); } // TODO attach listeners for focusing and arrow keys @@ -493,18 +488,14 @@ public class VSlider extends SimpleFocusablePanel implements Paintable, Field, } private void setHeight() { - if (size == -1) { - // Calculate decoration size - DOM.setStyleAttribute(base, "height", "0"); - DOM.setStyleAttribute(base, "overflow", "hidden"); - int h = DOM.getElementPropertyInt(getElement(), "offsetHeight"); - if (h < MIN_SIZE) { - h = MIN_SIZE; - } - DOM.setStyleAttribute(base, "height", h + "px"); - } else { - DOM.setStyleAttribute(base, "height", size + "px"); + // Calculate decoration size + DOM.setStyleAttribute(base, "height", "0"); + DOM.setStyleAttribute(base, "overflow", "hidden"); + int h = DOM.getElementPropertyInt(getElement(), "offsetHeight"); + if (h < MIN_SIZE) { + h = MIN_SIZE; } + DOM.setStyleAttribute(base, "height", h + "px"); DOM.setStyleAttribute(base, "overflow", ""); } -- 2.39.5