diff options
| author | Matti Tahvonen <matti.tahvonen@itmill.com> | 2009-01-08 08:40:30 +0000 |
|---|---|---|
| committer | Matti Tahvonen <matti.tahvonen@itmill.com> | 2009-01-08 08:40:30 +0000 |
| commit | 32aaff2b4f3a7b4c82deda7ebfa641e977b7faf4 (patch) | |
| tree | 95d769adf92efcfc6eae0e137f49122887848e9d /src/com/itmill/toolkit/ui | |
| parent | 861c091d975593a63749d502a7fdcdf63c4f11bb (diff) | |
| download | vaadin-framework-32aaff2b4f3a7b4c82deda7ebfa641e977b7faf4.tar.gz vaadin-framework-32aaff2b4f3a7b4c82deda7ebfa641e977b7faf4.zip | |
removed obsolete CONTENT_MODE_UIDL mode from Label
svn changeset:6443/svn branch:trunk
Diffstat (limited to 'src/com/itmill/toolkit/ui')
| -rw-r--r-- | src/com/itmill/toolkit/ui/Label.java | 14 |
1 files changed, 2 insertions, 12 deletions
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 @@ -52,12 +52,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 * "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd". @@ -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 { |