From 52fa9639bab979d13e852e42f6aba6fe60b4ffe4 Mon Sep 17 00:00:00 2001
From: John Ahlroos <john@vaadin.com>
Date: Fri, 7 Sep 2012 10:32:05 +0300
Subject: Removed deprecated ContenMode.XHTML

---
 server/src/com/vaadin/ui/Label.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'server/src/com/vaadin/ui/Label.java')

diff --git a/server/src/com/vaadin/ui/Label.java b/server/src/com/vaadin/ui/Label.java
index b3a6f43e64..b58de68af2 100644
--- a/server/src/com/vaadin/ui/Label.java
+++ b/server/src/com/vaadin/ui/Label.java
@@ -71,7 +71,7 @@ public class Label extends AbstractComponent implements Property<String>,
      * @deprecated From 7.0, use {@link ContentMode#XHTML} instead
      */
     @Deprecated
-    public static final ContentMode CONTENT_XHTML = ContentMode.XHTML;
+    public static final ContentMode CONTENT_XHTML = ContentMode.HTML;
 
     /**
      * @deprecated From 7.0, use {@link ContentMode#XML} instead
@@ -413,9 +413,8 @@ public class Label extends AbstractComponent implements Property<String>,
             stringValue = "";
         }
 
-        if (getContentMode() == ContentMode.XHTML
-                || getContentMode() == ContentMode.XML
-                || getContentMode() == ContentMode.HTML) {
+        if (getContentMode() == ContentMode.HTML
+                || getContentMode() == ContentMode.XML) {
             return stripTags(stringValue);
         } else {
             return stringValue;
-- 
cgit v1.2.3