From bb8f5ac330fdc623576f21c20dd308fc7f239ad5 Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Mon, 30 Jan 2012 15:07:04 +0200 Subject: [PATCH] Fixed compilation errors --- src/com/vaadin/ui/AbstractMedia.java | 26 ++++++++++++++------------ src/com/vaadin/ui/Slider.java | 4 ++-- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/com/vaadin/ui/AbstractMedia.java b/src/com/vaadin/ui/AbstractMedia.java index 9117bce997..369ef773b9 100644 --- a/src/com/vaadin/ui/AbstractMedia.java +++ b/src/com/vaadin/ui/AbstractMedia.java @@ -12,7 +12,7 @@ import java.util.List; import com.vaadin.terminal.PaintException; import com.vaadin.terminal.PaintTarget; import com.vaadin.terminal.Resource; -import com.vaadin.terminal.gwt.client.ui.VMediaBase; +import com.vaadin.terminal.gwt.client.ui.VMediaBasePaintable; /** * Abstract base class for the HTML5 media components. @@ -203,25 +203,27 @@ public class AbstractMedia extends AbstractComponent { @Override public void paintContent(PaintTarget target) throws PaintException { super.paintContent(target); - target.addAttribute(VMediaBase.ATTR_CONTROLS, isShowControls()); + target.addAttribute(VMediaBasePaintable.ATTR_CONTROLS, isShowControls()); if (getAltText() != null) { - target.addAttribute(VMediaBase.ATTR_ALT_TEXT, getAltText()); + target.addAttribute(VMediaBasePaintable.ATTR_ALT_TEXT, getAltText()); } - target.addAttribute(VMediaBase.ATTR_HTML, isHtmlContentAllowed()); - target.addAttribute(VMediaBase.ATTR_AUTOPLAY, isAutoplay()); + target.addAttribute(VMediaBasePaintable.ATTR_HTML, + isHtmlContentAllowed()); + target.addAttribute(VMediaBasePaintable.ATTR_AUTOPLAY, isAutoplay()); for (Resource r : getSources()) { - target.startTag(VMediaBase.TAG_SOURCE); - target.addAttribute(VMediaBase.ATTR_RESOURCE, r); - target.addAttribute(VMediaBase.ATTR_RESOURCE_TYPE, r.getMIMEType()); - target.endTag(VMediaBase.TAG_SOURCE); + target.startTag(VMediaBasePaintable.TAG_SOURCE); + target.addAttribute(VMediaBasePaintable.ATTR_RESOURCE, r); + target.addAttribute(VMediaBasePaintable.ATTR_RESOURCE_TYPE, + r.getMIMEType()); + target.endTag(VMediaBasePaintable.TAG_SOURCE); } - target.addAttribute(VMediaBase.ATTR_MUTED, isMuted()); + target.addAttribute(VMediaBasePaintable.ATTR_MUTED, isMuted()); if (play) { - target.addAttribute(VMediaBase.ATTR_PLAY, true); + target.addAttribute(VMediaBasePaintable.ATTR_PLAY, true); play = false; } if (pause) { - target.addAttribute(VMediaBase.ATTR_PAUSE, true); + target.addAttribute(VMediaBasePaintable.ATTR_PAUSE, true); pause = false; } } diff --git a/src/com/vaadin/ui/Slider.java b/src/com/vaadin/ui/Slider.java index f077afb8ff..aad1b60f87 100644 --- a/src/com/vaadin/ui/Slider.java +++ b/src/com/vaadin/ui/Slider.java @@ -8,7 +8,7 @@ import java.util.Map; import com.vaadin.terminal.PaintException; import com.vaadin.terminal.PaintTarget; -import com.vaadin.terminal.gwt.client.ui.VSlider; +import com.vaadin.terminal.gwt.client.ui.VSliderPaintable; /** * A component for selecting a numerical value within a range. @@ -46,7 +46,7 @@ import com.vaadin.terminal.gwt.client.ui.VSlider; * * @author Vaadin Ltd. */ -@ClientWidget(VSlider.class) +@ClientWidget(VSliderPaintable.class) public class Slider extends AbstractField { public static final int ORIENTATION_HORIZONTAL = 0; -- 2.39.5