[Bedework-commit] calendarapi r637 - in trunk: calFacade/src/org/bedework/calfacade/util calsvc/src/org/bedework/calsvc

[svnadmin at bedework.org]

Author: douglm
Date: 2008-05-23 23:53:25 -0400 (Fri, 23 May 2008)
New Revision: 637

Modified:
   trunk/calFacade/src/org/bedework/calfacade/util/EventPeriods.java
   trunk/calsvc/src/org/bedework/calsvc/Scheduling.java
Log:
Don't need to calculate UTC in EventPeriods - we have it already.

Modified: trunk/calFacade/src/org/bedework/calfacade/util/EventPeriods.java
===================================================================
--- trunk/calFacade/src/org/bedework/calfacade/util/EventPeriods.java	2008-05-24 03:07:43 UTC (rev 636)
+++ trunk/calFacade/src/org/bedework/calfacade/util/EventPeriods.java	2008-05-24 03:53:25 UTC (rev 637)
@@ -87,20 +87,17 @@
   /**
    * @param pstart
    * @param pend
-   * @param owner
    * @param type
    * @throws CalFacadeException
    */
-  public void addPeriod(BwDateTime pstart, BwDateTime pend, BwUser owner,
+  public void addPeriod(BwDateTime pstart, BwDateTime pend,
                         int type) throws CalFacadeException {
     // Ignore if times were specified and this period is outside the times
 
     /* Don't report out of the requested period */
 
     String dstart;
-    String stzid;
     String dend;
-    String etzid;
 
     if ((pstart.after(end)) || (pend.before(start))) {
       //XXX Should get here - but apparently we do.
@@ -108,24 +105,17 @@
     }
 
     if (pstart.before(start)) {
-      dstart = start.getDtval();
-      stzid = startTzid;
+      dstart = start.getDate();
     } else {
-      dstart = pstart.getDtval();
-      stzid = pstart.getTzid();
+      dstart = pstart.getDate();
     }
 
     if (pend.after(end)) {
-      dend = end.getDtval();
-      etzid = endTzid;
+      dend = end.getDate();
     } else {
-      dend = pend.getDtval();
-      etzid = pend.getTzid();
+      dend = pend.getDate();
     }
 
-    dstart = CalTimezones.getUtc(dstart, stzid, owner);
-    dend = CalTimezones.getUtc(dend, etzid, owner);
-
     try {
       DateTime psdt = new DateTime(dstart);
       DateTime pedt = new DateTime(dend);

Modified: trunk/calsvc/src/org/bedework/calsvc/Scheduling.java
===================================================================
--- trunk/calsvc/src/org/bedework/calsvc/Scheduling.java	2008-05-24 03:07:43 UTC (rev 636)
+++ trunk/calsvc/src/org/bedework/calsvc/Scheduling.java	2008-05-24 03:53:25 UTC (rev 637)
@@ -773,8 +773,7 @@
             type = BwFreeBusyComponent.typeBusyUnavailable;
           }
 
-          eventPeriods.addPeriod(ev.getDtstart(), ev.getDtend(), ev.getOwner(),
-                                 type);
+          eventPeriods.addPeriod(ev.getDtstart(), ev.getDtend(), type);
         } else if (ev.getEntityType() == CalFacadeDefs.entityTypeFreeAndBusy) {
           Collection<BwFreeBusyComponent> fbcs = ev.getFreeBusyPeriods();