From df430157bf12ae88e265318c09250a3865981a0c Mon Sep 17 00:00:00 2001
From: =?utf8?q?Leif=20=C3=85strand?= <leif@vaadin.com>
Date: Thu, 26 Jul 2012 10:37:06 +0300
Subject: [PATCH] Don't throw UnsupportedOperationException in Label.toString
 (#9175)

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

diff --git a/src/com/vaadin/ui/Label.java b/src/com/vaadin/ui/Label.java
index e7ca26faf8..00137f67e1 100644
--- a/src/com/vaadin/ui/Label.java
+++ b/src/com/vaadin/ui/Label.java
@@ -5,6 +5,7 @@
 package com.vaadin.ui;
 
 import java.lang.reflect.Method;
+import java.util.logging.Logger;
 
 import com.vaadin.data.Property;
 import com.vaadin.data.util.converter.Converter;
@@ -41,6 +42,9 @@ public class Label extends AbstractComponent implements Property<String>,
         Property.Viewer, Property.ValueChangeListener,
         Property.ValueChangeNotifier, Comparable<Label> {
 
+    private static final Logger logger = Logger
+            .getLogger(Label.class.getName());
+
     /**
      * @deprecated From 7.0, use {@link ContentMode#TEXT} instead
      */
@@ -184,14 +188,20 @@ public class Label extends AbstractComponent implements Property<String>,
     }
 
     /**
+     * Returns the value displayed by this label.
+     * 
      * @see java.lang.Object#toString()
-     * @deprecated Use {@link #getValue()} instead
+     * @deprecated As of 7.0.0, use {@link #getValue()} to get the value of the
+     *             label or {@link #getPropertyDataSource()} .getValue() to get
+     *             the value of the data source.
      */
     @Deprecated
     @Override
     public String toString() {
-        throw new UnsupportedOperationException(
-                "Use getValue() instead of Label.toString()");
+        logger.warning("You are using Label.toString() to get the value for a "
+                + getClass().getSimpleName()
+                + ". This is not recommended and will not be supported in future versions.");
+        return getValue();
     }
 
     /**
-- 
2.39.5