merge master

1 files changed, 82 insertions, 0 deletions

diff --git a/src/com/vaadin/shared/ui/AbstractMediaState.java b/src/com/vaadin/shared/ui/AbstractMediaState.java
new file mode 100644
index 0000000000..8cee16575d
--- /dev/null
+++ b/src/com/vaadin/shared/ui/AbstractMediaState.java
@@ -0,0 +1,82 @@
+/*
+@VaadinApache2LicenseForJavaFiles@
+ */
+package com.vaadin.shared.ui;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.vaadin.shared.ComponentState;
+import com.vaadin.shared.communication.URLReference;
+
+public class AbstractMediaState extends ComponentState {
+    private boolean showControls;
+
+    private String altText;
+
+    private boolean htmlContentAllowed;
+
+    private boolean autoplay;
+
+    private boolean muted;
+
+    private List<URLReference> sources = new ArrayList<URLReference>();
+    private List<String> sourceTypes = new ArrayList<String>();
+
+    public boolean isShowControls() {
+        return showControls;
+    }
+
+    public void setShowControls(boolean showControls) {
+        this.showControls = showControls;
+    }
+
+    public String getAltText() {
+        return altText;
+    }
+
+    public void setAltText(String altText) {
+        this.altText = altText;
+    }
+
+    public boolean isHtmlContentAllowed() {
+        return htmlContentAllowed;
+    }
+
+    public void setHtmlContentAllowed(boolean htmlContentAllowed) {
+        this.htmlContentAllowed = htmlContentAllowed;
+    }
+
+    public boolean isAutoplay() {
+        return autoplay;
+    }
+
+    public void setAutoplay(boolean autoplay) {
+        this.autoplay = autoplay;
+    }
+
+    public boolean isMuted() {
+        return muted;
+    }
+
+    public void setMuted(boolean muted) {
+        this.muted = muted;
+    }
+
+    public List<URLReference> getSources() {
+        return sources;
+    }
+
+    public void setSources(List<URLReference> sources) {
+        this.sources = sources;
+    }
+
+    public List<String> getSourceTypes() {
+        return sourceTypes;
+    }
+
+    public void setSourceTypes(List<String> sourceTypes) {
+        this.sourceTypes = sourceTypes;
+    }
+
+}