aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2012-03-23 10:28:35 +0200
committerArtur Signell <artur@vaadin.com>2012-03-23 11:29:48 +0200
commit144072f8ee06443d7ac7aa6164da8c35b4854db4 (patch)
treedda523287474d996cbb61641c0a1b384eee1bc4f
parent688910a21db5f3b71bb9bdf9343e62d9277ae6c4 (diff)
downloadvaadin-framework-144072f8ee06443d7ac7aa6164da8c35b4854db4.tar.gz
vaadin-framework-144072f8ee06443d7ac7aa6164da8c35b4854db4.zip
Description getter should return what has been set and not convert it
-rw-r--r--src/com/vaadin/terminal/gwt/client/ComponentState.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ComponentState.java b/src/com/vaadin/terminal/gwt/client/ComponentState.java
index 90821e8bde..10cd14251b 100644
--- a/src/com/vaadin/terminal/gwt/client/ComponentState.java
+++ b/src/com/vaadin/terminal/gwt/client/ComponentState.java
@@ -205,9 +205,6 @@ public class ComponentState extends SharedState {
* @return component description (not null, can be empty string)
*/
public String getDescription() {
- if (description == null) {
- return "";
- }
return description;
}
@@ -229,7 +226,7 @@ public class ComponentState extends SharedState {
* @return true if the component has a description
*/
public boolean hasDescription() {
- return !"".equals(getDescription());
+ return getDescription() != null && !"".equals(getDescription());
}
/**