aboutsummaryrefslogtreecommitdiffstats
path: root/server/src
diff options
context:
space:
mode:
authorAnna Koskinen <anna@vaadin.com>2014-11-12 16:13:01 +0200
committerSauli Tähkäpää <sauli@vaadin.com>2015-01-21 11:04:18 +0200
commit4e9c6a66b9c91404386af5c87bf733873874b16f (patch)
tree1c5617c8b7ae1e58b4b09ac5ce261c9af9c19857 /server/src
parent4428c7dc83d31c7ff4413e3e6301f4588d59dba3 (diff)
downloadvaadin-framework-4e9c6a66b9c91404386af5c87bf733873874b16f.tar.gz
vaadin-framework-4e9c6a66b9c91404386af5c87bf733873874b16f.zip
Embedded ThemeResource should react to theme change (#15194)
Change-Id: Ied78a8c999e592a944c27138e179c37a31a0af54
Diffstat (limited to 'server/src')
-rw-r--r--server/src/com/vaadin/ui/Embedded.java11
1 files changed, 3 insertions, 8 deletions
diff --git a/server/src/com/vaadin/ui/Embedded.java b/server/src/com/vaadin/ui/Embedded.java
index 1086da8d09..d83eef9c4d 100644
--- a/server/src/com/vaadin/ui/Embedded.java
+++ b/server/src/com/vaadin/ui/Embedded.java
@@ -79,11 +79,6 @@ public class Embedded extends AbstractComponent implements LegacyComponent {
private int type = TYPE_OBJECT;
/**
- * Source of the embedded object.
- */
- private Resource source = null;
-
- /**
* Generic object attributes.
*/
private String mimeType = null;
@@ -418,7 +413,7 @@ public class Embedded extends AbstractComponent implements LegacyComponent {
* @return the Resource
*/
public Resource getSource() {
- return source;
+ return getResource("src");
}
/**
@@ -445,8 +440,8 @@ public class Embedded extends AbstractComponent implements LegacyComponent {
* the source to set.
*/
public void setSource(Resource source) {
- if (source != null && !source.equals(this.source)) {
- this.source = source;
+ if (source != null && !source.equals(getSource())) {
+ setResource("src", source);
final String mt = source.getMIMEType();
if (mimeType == null) {