Eclipse/svn merge WTF commit.

svn changeset:2480/svn branch:trunk

diff --git a/src/com/itmill/toolkit/ui/CalendarField.java b/src/com/itmill/toolkit/ui/CalendarField.java
index 34800f49c4fa191a3f80d7fe3bdcda0f442c32ee..67e82ea0eebbcb1a9df0cd8d7f2280d4aba02d18 100644 (file)
--- a/src/com/itmill/toolkit/ui/CalendarField.java
+++ b/src/com/itmill/toolkit/ui/CalendarField.java
@@ -20,6 +20,7 @@ public class CalendarField extends DateField implements Container.Viewer {
        private Date maxDate;\r
 \r
        private Container dataSource;\r
+       private Object itemStyleNamePropertyId;\r
        private Object itemStartPropertyId;\r
        private Object itemEndPropertyId;\r
        private Object itemTitlePropertyId;\r
@@ -152,6 +153,14 @@ public class CalendarField extends DateField implements Container.Viewer {
                return false;\r
        }\r
 \r
+       public Object getItemStyleNamePropertyId() {\r
+               return itemStyleNamePropertyId;\r
+       }\r
+\r
+       public void setItemStyleNamePropertyId(Object propertyId) {\r
+               this.itemStyleNamePropertyId = propertyId;\r
+       }\r
+\r
        public Object getItemStartPropertyId() {\r
                return itemStartPropertyId;\r
        }\r
@@ -261,8 +270,11 @@ public class CalendarField extends DateField implements Container.Viewer {
                                if (start != null) {\r
                                        if ((start.getMonth() <= month || end.getMonth() >= month)) {\r
                                                target.startTag("item");\r
-                                               // TODO different id!\r
+                                               // TODO different id?\r
                                                target.addAttribute("id", itemId.hashCode());\r
+                                               p = item.getItemProperty(this.itemStyleNamePropertyId);\r
+                                               String styleName = (String) p.getValue();\r
+                                               target.addAttribute("styleName", styleName);\r
                                                target.addAttribute("start", "" + start.getTime());\r
                                                if (end != start) {\r
                                                        target.addAttribute("end", "" + end.getTime());\r