summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormichael <michael@vaadin.com>2013-04-07 16:35:16 +0300
committerVaadin Code Review <review@vaadin.com>2013-04-08 09:51:48 +0000
commit414ae5d0edfa9cb0ac007c4e25793d96f0d23e33 (patch)
tree3f8f5f1f1e1ebfaa9011086e6d354d9138dd6d89
parent309e3de9152ae9958e6e723ed348712b4b39452e (diff)
downloadvaadin-framework-414ae5d0edfa9cb0ac007c4e25793d96f0d23e33.tar.gz
vaadin-framework-414ae5d0edfa9cb0ac007c4e25793d96f0d23e33.zip
Rendering a Tree with icons fails if no alternate text is given (#11511)
Change-Id: I0ce84b77d5c1590988c2b9472bcf820a959cfd62
-rw-r--r--server/src/com/vaadin/ui/Tree.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/server/src/com/vaadin/ui/Tree.java b/server/src/com/vaadin/ui/Tree.java
index 700195cd4b..64854ebcdf 100644
--- a/server/src/com/vaadin/ui/Tree.java
+++ b/server/src/com/vaadin/ui/Tree.java
@@ -209,7 +209,8 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
* was set
*/
public String getItemIconAlternateText(Object itemId) {
- return itemIconAlts.get(itemId);
+ String storedAlt = itemIconAlts.get(itemId);
+ return storedAlt == null ? "" : storedAlt;
}
/* Expanding and collapsing */