From 0d4080ba5e5931fa928675ba6c95540e34b2f281 Mon Sep 17 00:00:00 2001
From: Maciej Przepióra <matthew@vaadin.com>
Date: Fri, 11 Apr 2014 23:53:43 +0300
Subject: ContainerEventProvider returns style names from container. Fixes
 #10718

ContainerEventProvider doesn't actually return
style names from container in certain situations
(copy-pasted code). This patch fixes the problem.

Change-Id: I512ea260f34a6db0572b614db393699da152fa8d
(cherry picked from commit 4709b75bb47d28630dacbb240bb43de16d972371)
---
 .../src/com/vaadin/ui/components/calendar/ContainerEventProvider.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'server/src')

diff --git a/server/src/com/vaadin/ui/components/calendar/ContainerEventProvider.java b/server/src/com/vaadin/ui/components/calendar/ContainerEventProvider.java
index 37ea255d27..b025de6f9a 100644
--- a/server/src/com/vaadin/ui/components/calendar/ContainerEventProvider.java
+++ b/server/src/com/vaadin/ui/components/calendar/ContainerEventProvider.java
@@ -224,8 +224,8 @@ public class ContainerEventProvider implements CalendarEditableEventProvider,
             }
             if (styleNameProperty != null
                     && item.getItemPropertyIds().contains(styleNameProperty)) {
-                basicEvent.setDescription(String.valueOf(item.getItemProperty(
-                        descriptionProperty).getValue()));
+                basicEvent.setStyleName(String.valueOf(item.getItemProperty(
+                        styleNameProperty).getValue()));
             }
             event = basicEvent;
         }
-- 
cgit v1.2.3