From 074b1095ee302af67626055820853ed1b8a4ea86 Mon Sep 17 00:00:00 2001
From: John Ahlroos <john@vaadin.com>
Date: Fri, 7 Sep 2012 10:09:02 +0300
Subject: Now using HTML5 content mode. Also deprecated the XHTML content
 modes.

---
 shared/src/com/vaadin/shared/ui/label/ContentMode.java | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'shared')

diff --git a/shared/src/com/vaadin/shared/ui/label/ContentMode.java b/shared/src/com/vaadin/shared/ui/label/ContentMode.java
index 1927b6c01b..3e6e5b8e45 100644
--- a/shared/src/com/vaadin/shared/ui/label/ContentMode.java
+++ b/shared/src/com/vaadin/shared/ui/label/ContentMode.java
@@ -15,6 +15,7 @@
  */
 package com.vaadin.shared.ui.label;
 
+
 /**
  * Content modes defining how the client should interpret a Label's value.
  * 
@@ -33,9 +34,16 @@ public enum ContentMode {
     PREFORMATTED,
 
     /**
-     * Content mode, where the label contains XHTML. Care should be taken to
-     * ensure
+     * Content mode, where the label contains HTML.
+     */
+    HTML,
+
+    /**
+     * Content mode, where the label contains XHTML.
+     * 
+     * @deprecated Use {@link ContentMode.HTML}
      */
+    @Deprecated
     XHTML,
 
     /**
-- 
cgit v1.2.3