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

[Mauro Vanetti <maurovanetti@xxxxxxxxx>]

    Date: Monday, August 25, 2008 @ 17:38:16
  Author: mauro
    Path: .../pim-framework/src/main/java/com/funambol/common/pim/converter

Modified: VCalendarContentConverter.java

Renamed convertToLocalDate to forceClientLocalTime.
Added all-day argument in calls to composeDateTimeField.


--------------------------------+
 VCalendarContentConverter.java |   25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 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.18
 
funambol/common/pim-framework/src/main/java/com/funambol/common/pim/converter/VCalendarContentConverter.java:1.19
--- 
funambol/common/pim-framework/src/main/java/com/funambol/common/pim/converter/VCalendarContentConverter.java:1.18
   Wed Aug 20 14:01:42 2008
+++ 
funambol/common/pim-framework/src/main/java/com/funambol/common/pim/converter/VCalendarContentConverter.java
        Mon Aug 25 17:38:16 2008
@@ -68,7 +68,7 @@
  * and from VCalendar to CalendarContent.
  *
  * @see Converter
- * @version $Id: VCalendarContentConverter.java,v 1.18 2008-08-20 12:01:42 
mauro Exp $
+ * @version $Id: VCalendarContentConverter.java,v 1.19 2008-08-25 15:38:16 
mauro Exp $
  */
 public class VCalendarContentConverter extends VCalendarConverter  {
 
@@ -135,7 +135,7 @@
      *
      * @param timezone the timezone to use in the conversion
      * @param charset the charset
-     * @param convertDateToLocal true if the date must be converted in local
+     * @param forceClientLocalTime true if the date must be converted in 
local
      *                           time, false otherwise.
      */
     public VCalendarContentConverter(TimeZone timezone, String charset, 
boolean convertDateToLocal) {
@@ -167,6 +167,8 @@
             vcc = new VTodo();
         }
 
+        boolean allDay = cc.isAllDay();
+        
         List<com.funambol.common.pim.model.Property> properties =
                 new ArrayList<com.funambol.common.pim.model.Property>(15);
 
@@ -189,7 +191,7 @@
         }
 
         PropertyWithTimeZone dtStart = cc.getDtStart();
-        properties.add(composeDateTimeField("DTSTART", dtStart, xv));
+        properties.add(composeDateTimeField("DTSTART", dtStart, allDay, xv));
         if (cc instanceof Event) {
             PropertyWithTimeZone pE = cc.getDtEnd();
             Object savedPropertyValue = null;
@@ -201,12 +203,12 @@
                     pE.setPropertyValue(due);
                 }
             }
-            properties.add(composeDateTimeField("DTEND", pE, xv));
+            properties.add(composeDateTimeField("DTEND", pE, allDay, xv));
             if (savedPropertyValue != null) {
                 pE.setPropertyValue(savedPropertyValue); // Restores the 
value
             }
         } else {
-            properties.add(composeDateTimeField("DUE", cc.getDtEnd(), xv));
+            properties.add(composeDateTimeField("DUE", cc.getDtEnd(), 
allDay, xv));
         }
         // NB: We decided not to store the duration but only Start and End 
(Due)
 
@@ -217,7 +219,7 @@
         properties.add(composeField("PALARM"         , cc.getPAlarm()   ));
         properties.add(composeField("DALARM"         , cc.getDAlarm()   ));
         properties.add(composeField("ORGANIZER"      , cc.getOrganizer()));
-        properties.add(composeDateTimeField("DTSTAMP", cc.getDtStamp()  , 
xv));
+        properties.add(composeDateTimeField("DTSTAMP", cc.getDtStamp(), 
false, xv));
 
         if (cc instanceof Event) {
             properties.add(composeField("TRANSP", ((Event) cc).getTransp()));
@@ -227,7 +229,7 @@
             properties.add(composeField("PERCENT-COMPLETE",
                     ((Task) cc).getPercentComplete()));
             properties.add(composeDateTimeField("COMPLETED",
-                    ((Task) cc).getDateCompleted(), xv));
+                    ((Task) cc).getDateCompleted(), false, xv));
             if (("100".equals(((Task) cc).getPercentComplete()
                                         .getPropertyValueAsString())) ||
                 ("1".equals(((Task) cc).getComplete()
@@ -240,7 +242,7 @@
         }
 
         properties.add(composeField("LAST-MODIFIED", cc.getLastModified()));
-        properties.add(composeDateTimeField("DCREATED", cc.getCreated(), 
xv));
+        properties.add(composeDateTimeField("DCREATED", cc.getCreated(), 
false, xv));
 
         Reminder reminder = cc.getReminder();
         if (reminder != null && reminder.isActive()) {
@@ -260,18 +262,21 @@
             properties.add(composeDateTimeField(
                     "RRULE" ,
                     rp      , // A RecurrencePattern is also a Property
+                    allDay  ,
                     xv      ,
-                    true    )); //must be always convert in local time
+                    true    )); // has a special behaviour
             rp.setPropertyValue(savedPropertyValue); // Restores the value
             properties.add(composeDateTimeField(
                     "EXDATE",
                     new PropertyWithTimeZone(extractExDatePropertyValue(rp, 
xv),
                                              rp.getTimeZone()                
  ),
+                    allDay  ,
                     xv      ));
             properties.add(composeDateTimeField(
                     "RDATE" ,
                     new PropertyWithTimeZone(extractRDatePropertyValue(rp, 
xv),
                                              rp.getTimeZone()                
 ),
+                    allDay  ,
                     xv      ));
         }
 
@@ -754,7 +759,7 @@
             propertyTimeZone = TimeZone.getTimeZone(timeZoneID);
         }
 
-        if (convertDateToLocal) {
+        if (forceClientLocalTime) {
             dtAlarmVal = handleConversionToLocalDate(dtAlarmVal, 
propertyTimeZone);
         }
         result.append(dtAlarmVal).append(';');