From 32aaff2b4f3a7b4c82deda7ebfa641e977b7faf4 Mon Sep 17 00:00:00 2001 From: Matti Tahvonen Date: Thu, 8 Jan 2009 08:40:30 +0000 Subject: removed obsolete CONTENT_MODE_UIDL mode from Label svn changeset:6443/svn branch:trunk --- src/com/itmill/toolkit/ui/Label.java | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'src/com/itmill/toolkit/ui') diff --git a/src/com/itmill/toolkit/ui/Label.java b/src/com/itmill/toolkit/ui/Label.java index a58e7027e4..b037c5e822 100644 --- a/src/com/itmill/toolkit/ui/Label.java +++ b/src/com/itmill/toolkit/ui/Label.java @@ -51,12 +51,6 @@ public class Label extends AbstractComponent implements Property, */ public static final int CONTENT_PREFORMATTED = 1; - /** - * Formatted content mode, where the contents is XML restricted to the UIDL - * 1.0 formatting markups. - */ - public static final int CONTENT_UIDL = 2; - /** * Content mode, where the label contains XHTML. Contents is then enclosed * in DIV elements having namespace of @@ -196,8 +190,6 @@ public class Label extends AbstractComponent implements Property, } if (contentMode == CONTENT_TEXT) { target.addText(toString()); - } else if (contentMode == CONTENT_UIDL) { - target.addUIDL(toString()); } else if (contentMode == CONTENT_XHTML) { target.startTag("data"); target.addXMLSection("div", toString(), @@ -490,16 +482,14 @@ public class Label extends AbstractComponent implements Property, String thisValue; String otherValue; - if (contentMode == CONTENT_XML || contentMode == CONTENT_UIDL - || contentMode == CONTENT_XHTML) { + if (contentMode == CONTENT_XML || contentMode == CONTENT_XHTML) { thisValue = stripTags(toString()); } else { thisValue = toString(); } if (other instanceof Label - && (((Label) other).getContentMode() == CONTENT_XML - || ((Label) other).getContentMode() == CONTENT_UIDL || ((Label) other) + && (((Label) other).getContentMode() == CONTENT_XML || ((Label) other) .getContentMode() == CONTENT_XHTML)) { otherValue = stripTags(other.toString()); } else { -- cgit v1.2.3