diff options
| author | Henri Sara <hesara@vaadin.com> | 2011-11-08 11:24:12 +0200 |
|---|---|---|
| committer | Henri Sara <hesara@vaadin.com> | 2011-11-08 11:24:12 +0200 |
| commit | a61302616430cbbfc97cbdbb85fe294842b3409c (patch) | |
| tree | dcca942cdad8fc09680effc7269819faea75a6e1 /src/com/vaadin/ui/AbstractSelect.java | |
| parent | b2f5e652227dd4468622b092a8197afa8ee9b65f (diff) | |
| download | vaadin-framework-a61302616430cbbfc97cbdbb85fe294842b3409c.tar.gz vaadin-framework-a61302616430cbbfc97cbdbb85fe294842b3409c.zip | |
Eliminate more cases that used Property.toString().
Remaining possibly problematic cases include Label.compareTo(),
TestForPreconfiguredComponents and TestForTrees.
Diffstat (limited to 'src/com/vaadin/ui/AbstractSelect.java')
| -rw-r--r-- | src/com/vaadin/ui/AbstractSelect.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/vaadin/ui/AbstractSelect.java b/src/com/vaadin/ui/AbstractSelect.java index 646d898a54..eaac3bb4c5 100644 --- a/src/com/vaadin/ui/AbstractSelect.java +++ b/src/com/vaadin/ui/AbstractSelect.java @@ -1080,7 +1080,10 @@ public abstract class AbstractSelect extends AbstractField implements final Property p = getContainerProperty(itemId, getItemCaptionPropertyId()); if (p != null) { - caption = p.toString(); + Object value = p.getValue(); + if (value != null) { + caption = value.toString(); + } } break; } |