removed obsolete CONTENT_MODE_UIDL mode from Label

svn changeset:6443/svn branch:trunk

diff --git a/src/com/itmill/toolkit/tests/featurebrowser/FeatureLabel.java b/src/com/itmill/toolkit/tests/featurebrowser/FeatureLabel.java
index 5e759fc67b8e9732c734f97bb9e11b886c6259a1..e489891f13d61fd5c22e71b7bebbdf13b2e0d1b5 100644 (file)
--- a/src/com/itmill/toolkit/tests/featurebrowser/FeatureLabel.java
+++ b/src/com/itmill/toolkit/tests/featurebrowser/FeatureLabel.java
@@ -30,7 +30,6 @@ public class FeatureLabel extends Feature {
         ap.replaceWithSelect("contentMode", new Object[] {
                 new Integer(Label.CONTENT_PREFORMATTED),
                 new Integer(Label.CONTENT_TEXT),
-                new Integer(Label.CONTENT_UIDL),
                 new Integer(Label.CONTENT_XHTML),
                 new Integer(Label.CONTENT_XML) },
                 new Object[] { "Preformatted", "Text", "UIDL (Must be valid)",

diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2426.java b/src/com/itmill/toolkit/tests/tickets/Ticket2426.java
index 816f4cb17c100cf9d25f2d3dea5b676ee18c53b7..6519d940b6537e6df91a7c0546eb3d8e4fbe1936 100644 (file)
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2426.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2426.java
@@ -21,9 +21,6 @@ public class Ticket2426 extends Application {
         w
                 .addComponent(new Label("CONTENT_TEXT: " + content,
                         Label.CONTENT_TEXT));
-        w
-                .addComponent(new Label("CONTENT_UIDL: " + content,
-                        Label.CONTENT_UIDL));
         w.addComponent(new Label("CONTENT_XML: " + content, Label.CONTENT_XML));
         w.addComponent(new Label("CONTENT_XHTML: " + content,
                 Label.CONTENT_XHTML));

diff --git a/src/com/itmill/toolkit/ui/Label.java b/src/com/itmill/toolkit/ui/Label.java
index a58e7027e4a381d15710ef953f23456a5ede4fc4..b037c5e82234224d91ede02068fa9bab7b5b2e3a 100644 (file)
--- 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 {