diff options
| author | Leif Åstrand <leif@vaadin.com> | 2013-02-07 09:54:24 +0200 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2013-02-07 09:55:12 +0200 |
| commit | 888dedd40246839072c4145be26a5ab99a864e47 (patch) | |
| tree | 9bf3f6beca002c38b5c62d7dffd18b8ddf2636fa | |
| parent | fa95bdee6675ad6fc56b0d021227e5e25fe9316e (diff) | |
| parent | bbf4571564d168fc2ad4c27cfb71e9a9b6023f07 (diff) | |
| download | vaadin-framework-888dedd40246839072c4145be26a5ab99a864e47.tar.gz vaadin-framework-888dedd40246839072c4145be26a5ab99a864e47.zip | |
Merge branch '7.0'
Change-Id: I5cd71ac330a1c400545555db9290dd256da784a1
| -rw-r--r-- | server/src/com/vaadin/ui/AbstractField.java | 24 | ||||
| -rw-r--r-- | server/src/com/vaadin/ui/Label.java | 17 |
2 files changed, 0 insertions, 41 deletions
diff --git a/server/src/com/vaadin/ui/AbstractField.java b/server/src/com/vaadin/ui/AbstractField.java index 422e0a1796..619d717d97 100644 --- a/server/src/com/vaadin/ui/AbstractField.java +++ b/server/src/com/vaadin/ui/AbstractField.java @@ -373,30 +373,6 @@ public abstract class AbstractField<T> extends AbstractComponent implements /* Property interface implementation */ /** - * Returns the (field) value converted to a String using toString(). - * - * @see java.lang.Object#toString() - * @deprecated As of 7.0, use {@link #getValue()} to get the value of the - * field, {@link #getConvertedValue()} to get the field value - * converted to the data model type or - * {@link #getPropertyDataSource()} .getValue() to get the value - * of the data source. - */ - @Deprecated - @Override - public String toString() { - logger.warning("You are using AbstractField.toString() to get the value for a " - + getClass().getSimpleName() - + ". This will not be supported starting from Vaadin 7.1 " - + "(your debugger might call toString() and cause this message to appear)."); - final Object value = getFieldValue(); - if (value == null) { - return null; - } - return value.toString(); - } - - /** * Gets the current value of the field. * * <p> diff --git a/server/src/com/vaadin/ui/Label.java b/server/src/com/vaadin/ui/Label.java index f49a1403cf..f413ea47f2 100644 --- a/server/src/com/vaadin/ui/Label.java +++ b/server/src/com/vaadin/ui/Label.java @@ -203,23 +203,6 @@ public class Label extends AbstractComponent implements Property<String>, } /** - * Returns the value displayed by this label. - * - * @see java.lang.Object#toString() - * @deprecated As of 7.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() { - logger.warning("You are using Label.toString() to get the value for a " - + getClass().getSimpleName() - + ". This will not be supported starting from Vaadin 7.1 (your debugger might call toString() and cause this message to appear)."); - return getValue(); - } - - /** * Gets the type of the Property. * * @see com.vaadin.data.Property#getType() |