diff options
author | Johannes Dahlström <johannesd@vaadin.com> | 2012-09-11 10:52:56 +0300 |
---|---|---|
committer | Johannes Dahlström <johannesd@vaadin.com> | 2012-09-11 10:52:56 +0300 |
commit | c0b98ed77842f505f3a2f424c5d049a3c0c970cb (patch) | |
tree | 437ea7120571b63da92745a72efeb8e3562a5750 /server/src/com/vaadin/ui/Embedded.java | |
parent | 52331e0db4d3898c09369c2a797c38c8de544c11 (diff) | |
download | vaadin-framework-c0b98ed77842f505f3a2f424c5d049a3c0c970cb.tar.gz vaadin-framework-c0b98ed77842f505f3a2f424c5d049a3c0c970cb.zip |
Improvements to #9087:
* Rename EmbeddedBrowser to BrowserFrame
* Add constructors to Flash and BrowserFrame
* Change getState() methods to protected
* JavaDoc improvements
* Make ImageClicks test deterministic
Diffstat (limited to 'server/src/com/vaadin/ui/Embedded.java')
-rw-r--r-- | server/src/com/vaadin/ui/Embedded.java | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/server/src/com/vaadin/ui/Embedded.java b/server/src/com/vaadin/ui/Embedded.java index 3bcd7a26a0..d61fd44292 100644 --- a/server/src/com/vaadin/ui/Embedded.java +++ b/server/src/com/vaadin/ui/Embedded.java @@ -34,9 +34,14 @@ import com.vaadin.shared.ui.embedded.EmbeddedServerRpc; /** * Component for embedding external objects. * <p> - * As of Vaadin 7.0, the {@link Image}, {@link Flash}, and - * {@link EmbeddedBrowser} components should be used instead of - * <code>Embedded</code> whenever appropriate. + * As of Vaadin 7.0, the {@link Image}, {@link Flash}, and {@link BrowserFrame} + * components should be used instead of <code>Embedded</code> for displaying + * images, Adobe Flash objects, and embedded web pages, respectively. + * <code>Embedded</code> is still useful for displaying other multimedia content + * such as applets and PDF documents. + * + * @see Video + * @see Audio * * @author Vaadin Ltd. * @since 3.0 @@ -60,7 +65,7 @@ public class Embedded extends AbstractComponent implements LegacyComponent { /** * Browser ("iframe") type. * - * @deprecated As of 7.0, use the {@link EmbeddedBrowser} component instead. + * @deprecated As of 7.0, use the {@link BrowserFrame} component instead. */ @Deprecated public static final int TYPE_BROWSER = 2; |