[sync4j-commits] CVS update of <pim-framework>/src/main/java/com/funambol/common/pim/converter (VCalendarContentConverter.java)

[Mauro Vanetti <maurovanetti@xxxxxxxxx>]

    Date: Wednesday, August 27, 2008 @ 14:29:21
  Author: mauro
    Path: .../pim-framework/src/main/java/com/funambol/common/pim/converter

Modified: VCalendarContentConverter.java

EXDATEs and RDATEs are now accepted on multiple lines too.


--------------------------------+
 VCalendarContentConverter.java |   32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)


Index: 
funambol/common/pim-framework/src/main/java/com/funambol/common/pim/converter/VCalendarContentConverter.java
diff -u 
funambol/common/pim-framework/src/main/java/com/funambol/common/pim/converter/VCalendarContentConverter.java:1.21
 
funambol/common/pim-framework/src/main/java/com/funambol/common/pim/converter/VCalendarContentConverter.java:1.22
--- 
funambol/common/pim-framework/src/main/java/com/funambol/common/pim/converter/VCalendarContentConverter.java:1.21
   Tue Aug 26 13:51:43 2008
+++ 
funambol/common/pim-framework/src/main/java/com/funambol/common/pim/converter/VCalendarContentConverter.java
        Wed Aug 27 14:29:21 2008
@@ -68,7 +68,7 @@
  * and from VCalendar to CalendarContent.
  *
  * @see Converter
- * @version $Id: VCalendarContentConverter.java,v 1.21 2008-08-26 11:51:43 
mauro Exp $
+ * @version $Id: VCalendarContentConverter.java,v 1.22 2008-08-27 12:29:21 
mauro Exp $
  */
 public class VCalendarContentConverter extends VCalendarConverter  {
 
@@ -572,18 +572,28 @@
                     )
                 );
 
-                Property rdate = decodeField(vcc.getProperty("RDATE"));
-                if (rdate != null) {
-                    cc.getRecurrencePattern()
-                      .getExceptions()
-                      .addAll(getRDates(rdate.getPropertyValueAsString(), 
cc.isAllDay()));
+                List<com.funambol.common.pim.model.Property> rdates = 
+                        vcc.getProperties("RDATE");
+                for (com.funambol.common.pim.model.Property rdateProperty : 
rdates) {
+                    Property rdate = decodeField(rdateProperty);
+                    if (rdate != null) {
+                        cc.getRecurrencePattern()
+                          .getExceptions()
+                          
.addAll(getRDates(rdate.getPropertyValueAsString(), 
+                                            cc.isAllDay()                   
));
+                    }
                 }
 
-                Property exdate = decodeField(vcc.getProperty("EXDATE"));
-                if (exdate != null) {
-                    cc.getRecurrencePattern()
-                      .getExceptions()
-                      .addAll(getExDates(exdate.getPropertyValueAsString(), 
cc.isAllDay()));
+                List<com.funambol.common.pim.model.Property> exdates = 
+                        vcc.getProperties("EXDATE");
+                for (com.funambol.common.pim.model.Property exdateProperty : 
exdates) {
+                    Property exdate = decodeField(exdateProperty);
+                    if (exdate != null) {
+                        cc.getRecurrencePattern()
+                          .getExceptions()
+                          
.addAll(getExDates(exdate.getPropertyValueAsString(), 
+                                             cc.isAllDay()                   
));
+                    }
                 }
 
             } catch (ConverterException ce) {