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

[Mauro Vanetti <maurovanetti@xxxxxxxxx>]

    Date: Wednesday, August 20, 2008 @ 14:01:42
  Author: mauro
    Path: .../pim-framework/src/main/java/com/funambol/common/pim/converter

Modified: VCalendarContentConverter.java

Minor code improvement


--------------------------------+
 VCalendarContentConverter.java |   20 ++++++++------------
 1 file changed, 8 insertions(+), 12 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.17
 
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.17
   Wed Jun 25 12:26:16 2008
+++ 
funambol/common/pim-framework/src/main/java/com/funambol/common/pim/converter/VCalendarContentConverter.java
        Wed Aug 20 14:01:42 2008
@@ -68,7 +68,7 @@
  * and from VCalendar to CalendarContent.
  *
  * @see Converter
- * @version $Id: VCalendarContentConverter.java,v 1.17 2008-06-25 10:26:16 
mauro Exp $
+ * @version $Id: VCalendarContentConverter.java,v 1.18 2008-08-20 12:01:42 
mauro Exp $
  */
 public class VCalendarContentConverter extends VCalendarConverter  {
 
@@ -400,17 +400,13 @@
         if (vcc instanceof VEvent) {
             pS = decodeDateTimeField(vcc.getProperty("DTSTART"), 
dtStartTimeZone);
             pE = decodeDateTimeField(vcc.getProperty("DTEND"), 
dtEndTimeZone);
-            if (pE != null) {
-                String start = null;
-                if (pS != null) {
-                    start = pS.getPropertyValueAsString();
-                }
-                String due = pE.getPropertyValueAsString();
-                if (!(due.equals(start)) // This is for robustness's sake
-                        && TimeUtils.isInAllDayFormat(due)) {
-                    due = TimeUtils.rollOneDay(due, false); // Rolls back
-                    pE.setPropertyValue(due);
-                }
+            String start =  pS.getPropertyValueAsString();
+            String end = pE.getPropertyValueAsString();
+            if ((end != null)
+                 && !(end.equals(start)) // This is for robustness's sake
+                 && TimeUtils.isInAllDayFormat(end)) {
+                end = TimeUtils.rollOneDay(end, false); // Rolls back
+                pE.setPropertyValue(end);
             }
         } else {
             pE = decodeDateTimeField(vcc.getProperty("DUE"), dtEndTimeZone);