summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorJohannes Dahlström <johannesd@vaadin.com>2012-08-29 14:09:12 +0300
committerJohannes Dahlström <johannesd@vaadin.com>2012-08-29 14:09:12 +0300
commit729d0af2dac293774f36882f610b8c69c2aca0dd (patch)
treea16440873f07631c10b385e3c83b6b6c92347c76 /server
parent76b5bfdfb921cad6aee387b04ce15017a093dd25 (diff)
downloadvaadin-framework-729d0af2dac293774f36882f610b8c69c2aca0dd.tar.gz
vaadin-framework-729d0af2dac293774f36882f610b8c69c2aca0dd.zip
Deprecate using Embedded for image and iframe content (#9087)
Diffstat (limited to 'server')
-rw-r--r--server/src/com/vaadin/ui/Embedded.java16
1 files changed, 13 insertions, 3 deletions
diff --git a/server/src/com/vaadin/ui/Embedded.java b/server/src/com/vaadin/ui/Embedded.java
index a8663abd32..6a1fceed93 100644
--- a/server/src/com/vaadin/ui/Embedded.java
+++ b/server/src/com/vaadin/ui/Embedded.java
@@ -33,6 +33,10 @@ 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.
*
* @author Vaadin Ltd.
* @since 3.0
@@ -47,12 +51,18 @@ public class Embedded extends AbstractComponent implements Vaadin6Component {
/**
* Image types.
+ *
+ * @deprecated As of 7.0, use the {@link Image} component instead.
*/
+ @Deprecated
public static final int TYPE_IMAGE = 1;
/**
* Browser ("iframe") type.
+ *
+ * @deprecated As of 7.0, use the {@link EmbeddedBrowser} component instead.
*/
+ @Deprecated
public static final int TYPE_BROWSER = 2;
/**
@@ -452,9 +462,9 @@ public class Embedded extends AbstractComponent implements Vaadin6Component {
* <p>
* This can be one of the following:
* <ul>
- * <li>TYPE_OBJECT <i>(This is the default)</i>
- * <li>TYPE_IMAGE
- * <li>TYPE_BROWSER
+ * <li>{@link #TYPE_OBJECT} <i>(This is the default)</i>
+ * <li>{@link #TYPE_IMAGE} <i>(Deprecated)</i>
+ * <li>{@link #TYPE_BROWSER} <i>(Deprecated)</i>
* </ul>
* </p>
*