diff options
| author | John Ahlroos <john@vaadin.com> | 2012-09-07 10:32:05 +0300 |
|---|---|---|
| committer | John Ahlroos <john@vaadin.com> | 2012-09-07 10:32:05 +0300 |
| commit | 52fa9639bab979d13e852e42f6aba6fe60b4ffe4 (patch) | |
| tree | aaf4486eae2df058d609da7391bdf788fdf32614 /server | |
| parent | 074b1095ee302af67626055820853ed1b8a4ea86 (diff) | |
| download | vaadin-framework-52fa9639bab979d13e852e42f6aba6fe60b4ffe4.tar.gz vaadin-framework-52fa9639bab979d13e852e42f6aba6fe60b4ffe4.zip | |
Removed deprecated ContenMode.XHTML
Diffstat (limited to 'server')
| -rw-r--r-- | server/src/com/vaadin/server/AbstractErrorMessage.java | 9 | ||||
| -rw-r--r-- | server/src/com/vaadin/server/UserError.java | 2 | ||||
| -rw-r--r-- | server/src/com/vaadin/ui/Label.java | 7 |
3 files changed, 4 insertions, 14 deletions
diff --git a/server/src/com/vaadin/server/AbstractErrorMessage.java b/server/src/com/vaadin/server/AbstractErrorMessage.java index 3ab0e73c8a..98cdcd4f8c 100644 --- a/server/src/com/vaadin/server/AbstractErrorMessage.java +++ b/server/src/com/vaadin/server/AbstractErrorMessage.java @@ -49,14 +49,6 @@ public abstract class AbstractErrorMessage implements ErrorMessage { * */ HTML, - - /** - * Content mode, where the error contains XHTML. - * - * @deprecated Use {@link ContentMode.HTML} - */ - @Deprecated - XHTML; } /** @@ -125,7 +117,6 @@ public abstract class AbstractErrorMessage implements ErrorMessage { result = "<pre>" + VaadinServlet.safeEscapeForHtml(getMessage()) + "</pre>"; break; - case XHTML: case HTML: result = getMessage(); break; diff --git a/server/src/com/vaadin/server/UserError.java b/server/src/com/vaadin/server/UserError.java index c59eb382ee..d7837fb65d 100644 --- a/server/src/com/vaadin/server/UserError.java +++ b/server/src/com/vaadin/server/UserError.java @@ -42,7 +42,7 @@ public class UserError extends AbstractErrorMessage { * @deprecated from 7.0, use {@link ContentMode#HTML} instead */ @Deprecated - public static final ContentMode CONTENT_XHTML = ContentMode.XHTML; + public static final ContentMode CONTENT_XHTML = ContentMode.HTML; /** * Creates a textual error message of level ERROR. 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; |