diff options
| author | John Ahlroos <john@vaadin.com> | 2012-08-31 14:22:26 +0300 |
|---|---|---|
| committer | John Ahlroos <john@vaadin.com> | 2012-08-31 14:23:03 +0300 |
| commit | dc8bc6119c1bd019600559db552ec26b4db2ec54 (patch) | |
| tree | 3d83f592737c9ed3610c62025a788ed689ac2e62 /client/src | |
| parent | 01646b14df5708e50e4eb031ec5b4f0da4ab5d15 (diff) | |
| download | vaadin-framework-dc8bc6119c1bd019600559db552ec26b4db2ec54.tar.gz vaadin-framework-dc8bc6119c1bd019600559db552ec26b4db2ec54.zip | |
More state getter removal
Diffstat (limited to 'client/src')
3 files changed, 8 insertions, 8 deletions
diff --git a/client/src/com/vaadin/client/extensions/javascriptmanager/JavaScriptManagerConnector.java b/client/src/com/vaadin/client/extensions/javascriptmanager/JavaScriptManagerConnector.java index 7cab90a90d..f6d643d1ba 100644 --- a/client/src/com/vaadin/client/extensions/javascriptmanager/JavaScriptManagerConnector.java +++ b/client/src/com/vaadin/client/extensions/javascriptmanager/JavaScriptManagerConnector.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2011 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not @@ -48,7 +48,7 @@ public class JavaScriptManagerConnector extends AbstractExtensionConnector { public void onStateChanged(StateChangeEvent stateChangeEvent) { super.onStateChanged(stateChangeEvent); - Set<String> newNames = getState().getNames(); + Set<String> newNames = getState().names; // Current names now only contains orphan callbacks currentNames.removeAll(newNames); diff --git a/client/src/com/vaadin/client/ui/MediaBaseConnector.java b/client/src/com/vaadin/client/ui/MediaBaseConnector.java index 8a17e052ba..961ba4821e 100644 --- a/client/src/com/vaadin/client/ui/MediaBaseConnector.java +++ b/client/src/com/vaadin/client/ui/MediaBaseConnector.java @@ -49,12 +49,12 @@ public abstract class MediaBaseConnector extends AbstractComponentConnector { public void onStateChanged(StateChangeEvent stateChangeEvent) { super.onStateChanged(stateChangeEvent); - for (int i = 0; i < getState().getSources().size(); i++) { - URLReference source = getState().getSources().get(i); - String sourceType = getState().getSourceTypes().get(i); + for (int i = 0; i < getState().sources.size(); i++) { + URLReference source = getState().sources.get(i); + String sourceType = getState().sourceTypes.get(i); getWidget().addSource(source.getURL(), sourceType); } - setAltText(getState().getAltText()); + setAltText(getState().altText); } @Override @@ -66,7 +66,7 @@ public abstract class MediaBaseConnector extends AbstractComponentConnector { if (altText == null || "".equals(altText)) { altText = getDefaultAltHtml(); - } else if (!getState().isHtmlContentAllowed()) { + } else if (!getState().htmlContentAllowed) { altText = Util.escapeHTML(altText); } getWidget().setAltText(altText); diff --git a/client/src/com/vaadin/client/ui/audio/AudioConnector.java b/client/src/com/vaadin/client/ui/audio/AudioConnector.java index 8c2fa179c8..bfa282ca09 100644 --- a/client/src/com/vaadin/client/ui/audio/AudioConnector.java +++ b/client/src/com/vaadin/client/ui/audio/AudioConnector.java @@ -35,7 +35,7 @@ public class AudioConnector extends MediaBaseConnector { Style style = getWidget().getElement().getStyle(); // Make sure that the controls are not clipped if visible. - if (getState().isShowControls() + if (getState().showControls && (style.getHeight() == null || "".equals(style.getHeight()))) { if (BrowserInfo.get().isChrome()) { style.setHeight(32, Unit.PX); |