[Bedework-commit] calendarapi r739 - releases/bedework-3.4.1.1a/icalendar/src/org/bedework/icalendar

[svnadmin at bedework.org]

Author: douglm
Date: 2008-11-13 10:21:33 -0500 (Thu, 13 Nov 2008)
New Revision: 739

Modified:
   releases/bedework-3.4.1.1a/icalendar/src/org/bedework/icalendar/VEventUtil.java
Log:
Always emit UTC values for exdates and rdates

Modified: releases/bedework-3.4.1.1a/icalendar/src/org/bedework/icalendar/VEventUtil.java
===================================================================
--- releases/bedework-3.4.1.1a/icalendar/src/org/bedework/icalendar/VEventUtil.java	2008-11-13 15:21:16 UTC (rev 738)
+++ releases/bedework-3.4.1.1a/icalendar/src/org/bedework/icalendar/VEventUtil.java	2008-11-13 15:21:33 UTC (rev 739)
@@ -77,6 +77,7 @@
 import net.fortuna.ical4j.model.component.VFreeBusy;
 import net.fortuna.ical4j.model.component.VJournal;
 import net.fortuna.ical4j.model.component.VToDo;
+import net.fortuna.ical4j.model.Date;
 import net.fortuna.ical4j.model.DateList;
 import net.fortuna.ical4j.model.DateTime;
 import net.fortuna.ical4j.model.Dur;
@@ -89,7 +90,6 @@
 import net.fortuna.ical4j.model.parameter.AltRep;
 import net.fortuna.ical4j.model.parameter.FbType;
 import net.fortuna.ical4j.model.parameter.RelType;
-import net.fortuna.ical4j.model.parameter.TzId;
 import net.fortuna.ical4j.model.parameter.Value;
 import net.fortuna.ical4j.model.parameter.XParameter;
 import net.fortuna.ical4j.model.Property;
@@ -405,7 +405,7 @@
       /* ------------------- Resources -------------------- */
 
       if (val.getNumResources() > 0) {
-        /* This event has a category */
+        /* This event has a resource */
 
         prop = new Resources();
         ResourceList rl = ((Resources)prop).getResources();
@@ -575,19 +575,19 @@
       return;
     }
 
+    /* Always use the UTC values */
     DateList dl = new DateList();
-    boolean first = true;
+    dl.setUtc(true);
     boolean dateType = false;
-    String tzid = null;
 
     for (BwDateTime dt: dts) {
-      dl.add(dt.makeDate());
-      if (first) {
-        if (dt.getDateType()) {
-          dateType = true;
-        } else {
-          tzid = dt.getTzid();
-        }
+      if (dt.getDateType()) {
+        dateType = true;
+        dl.add(new Date(dt.getDtval()));
+      } else {
+        DateTime dtm = new DateTime(dt.getDate());
+        dtm.setUtc(true);
+        dl.add(dtm);
       }
     }
 
@@ -601,13 +601,6 @@
 
     if (dateType) {
       dlp.getParameters().add(Value.DATE);
-    } else {
-      // The default
-      //dt.getParameters().add(Value.DATE_TIME);
-
-      if (tzid != null) {
-        dlp.getParameters().add(new TzId(tzid));
-      }
     }
 
     pl.add(dlp);