aboutsummaryrefslogtreecommitdiffstats
path: root/server/src/com/vaadin/ui/Label.java
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2013-04-05 18:32:50 +0300
committerLeif Åstrand <leif@vaadin.com>2013-04-10 14:47:18 +0300
commit2700cd2fe6c48b29478f1b8e14fde1d405a6ab7d (patch)
treefdef2375cc28a6c9db4501cd4535152434c97d10 /server/src/com/vaadin/ui/Label.java
parentfd4f1d280e8eb6a453868db01b8accc1e7b8d0b1 (diff)
downloadvaadin-framework-2700cd2fe6c48b29478f1b8e14fde1d405a6ab7d.tar.gz
vaadin-framework-2700cd2fe6c48b29478f1b8e14fde1d405a6ab7d.zip
Added SharedUtil for helpers shared by client and server
Change-Id: Ie289e8eefd962631a43f35dbb47fa192fcf60abf
Diffstat (limited to 'server/src/com/vaadin/ui/Label.java')
-rw-r--r--server/src/com/vaadin/ui/Label.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/server/src/com/vaadin/ui/Label.java b/server/src/com/vaadin/ui/Label.java
index f413ea47f2..72f556ee5b 100644
--- a/server/src/com/vaadin/ui/Label.java
+++ b/server/src/com/vaadin/ui/Label.java
@@ -25,6 +25,7 @@ import com.vaadin.data.util.converter.Converter;
import com.vaadin.data.util.converter.ConverterUtil;
import com.vaadin.shared.ui.label.ContentMode;
import com.vaadin.shared.ui.label.LabelState;
+import com.vaadin.shared.util.SharedUtil;
/**
* Label component for showing non-editable short texts.
@@ -402,7 +403,7 @@ public class Label extends AbstractComponent implements Property<String>,
private void updateValueFromDataSource() {
// Update the internal value from the data source
String newConvertedValue = getDataSourceValue();
- if (!AbstractField.equals(newConvertedValue, getState().text)) {
+ if (!SharedUtil.equals(newConvertedValue, getState().text)) {
getState().text = newConvertedValue;
fireValueChange();
}