More state getter removal

3 files changed, 10 insertions, 78 deletions

diff --git a/shared/src/com/vaadin/shared/JavaScriptExtensionState.java b/shared/src/com/vaadin/shared/JavaScriptExtensionState.java
index 3e97294f7d..fb864c6ee1 100644
--- a/shared/src/com/vaadin/shared/JavaScriptExtensionState.java
+++ b/shared/src/com/vaadin/shared/JavaScriptExtensionState.java
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright 2011 Vaadin Ltd.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
diff --git a/shared/src/com/vaadin/shared/extension/javascriptmanager/JavaScriptManagerState.java b/shared/src/com/vaadin/shared/extension/javascriptmanager/JavaScriptManagerState.java
index 7d1938d735..71af5e9598 100644
--- a/shared/src/com/vaadin/shared/extension/javascriptmanager/JavaScriptManagerState.java
+++ b/shared/src/com/vaadin/shared/extension/javascriptmanager/JavaScriptManagerState.java
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright 2011 Vaadin Ltd.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
@@ -22,13 +22,5 @@ import java.util.Set;
 import com.vaadin.shared.communication.SharedState;
 
 public class JavaScriptManagerState extends SharedState {
-    private Set<String> names = new HashSet<String>();
-
-    public Set<String> getNames() {
-        return names;
-    }
-
-    public void setNames(Set<String> names) {
-        this.names = names;
-    }
+    public Set<String> names = new HashSet<String>();
 }
diff --git a/shared/src/com/vaadin/shared/ui/AbstractMediaState.java b/shared/src/com/vaadin/shared/ui/AbstractMediaState.java
index 80d41dd797..76d4e1b000 100644
--- a/shared/src/com/vaadin/shared/ui/AbstractMediaState.java
+++ b/shared/src/com/vaadin/shared/ui/AbstractMediaState.java
@@ -19,80 +19,20 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.vaadin.shared.ComponentState;
-import com.vaadin.shared.annotations.DelegateToWidget;
 import com.vaadin.shared.communication.URLReference;
 
 public class AbstractMediaState extends ComponentState {
-    private boolean showControls;
+    public boolean showControls;
 
-    private String altText;
+    public String altText;
 
-    private boolean htmlContentAllowed;
+    public boolean htmlContentAllowed;
 
-    private boolean autoplay;
+    public boolean autoplay;
 
-    private boolean muted;
+    public boolean muted;
 
-    private List<URLReference> sources = new ArrayList<URLReference>();
-    private List<String> sourceTypes = new ArrayList<String>();
-
-    public boolean isShowControls() {
-        return showControls;
-    }
-
-    @DelegateToWidget("setControls")
-    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;
-    }
-
-    @DelegateToWidget
-    public void setAutoplay(boolean autoplay) {
-        this.autoplay = autoplay;
-    }
-
-    public boolean isMuted() {
-        return muted;
-    }
-
-    @DelegateToWidget
-    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;
-    }
+    public List<URLReference> sources = new ArrayList<URLReference>();
 
+    public List<String> sourceTypes = new ArrayList<String>();
 }