[Bedework-commit] freebusy r83 - in trunk: fbclient/src/org/bedework/fbclient webclient/src/org/bedework/fbaggregator

[svnadmin at bedework.org]

Author: douglm
Date: 2007-09-02 01:03:00 -0400 (Sun, 02 Sep 2007)
New Revision: 83

Modified:
   trunk/fbclient/src/org/bedework/fbclient/CalDavClient.java
   trunk/webclient/src/org/bedework/fbaggregator/FreeBusyAggregator.java
Log:
Remove BwFreeBusy class in favor of BwEvent throughout

Process realtime response from other server. Now shows some sort of freebusy from remote system

Modified: trunk/fbclient/src/org/bedework/fbclient/CalDavClient.java
===================================================================
--- trunk/fbclient/src/org/bedework/fbclient/CalDavClient.java	2007-08-24 01:22:59 UTC (rev 82)
+++ trunk/fbclient/src/org/bedework/fbclient/CalDavClient.java	2007-09-02 05:03:00 UTC (rev 83)
@@ -25,7 +25,7 @@
 */
 package org.bedework.fbclient;
 
-import org.bedework.calfacade.BwFreeBusy;
+import org.bedework.calfacade.BwEvent;
 import org.bedework.http.client.dav.DavClient;
 import org.bedework.http.client.dav.DavReq;
 import org.bedework.http.client.dav.DavResp;
@@ -68,7 +68,7 @@
     public Throwable exception;
 
     /** */
-    public Collection<BwFreeBusy> fbs = new ArrayList<BwFreeBusy>();
+    public Collection<BwEvent> fbs = new ArrayList<BwEvent>();
 
     /** */
     public DavResp cdresp;

Modified: trunk/webclient/src/org/bedework/fbaggregator/FreeBusyAggregator.java
===================================================================
--- trunk/webclient/src/org/bedework/fbaggregator/FreeBusyAggregator.java	2007-08-24 01:22:59 UTC (rev 82)
+++ trunk/webclient/src/org/bedework/fbaggregator/FreeBusyAggregator.java	2007-09-02 05:03:00 UTC (rev 83)
@@ -44,7 +44,7 @@
 
 import org.bedework.calfacade.BwDateTime;
 import org.bedework.calfacade.BwDuration;
-import org.bedework.calfacade.BwFreeBusy;
+import org.bedework.calfacade.BwEvent;
 import org.bedework.calfacade.BwFreeBusyComponent;
 import org.bedework.calfacade.exc.CalFacadeException;
 import org.bedework.calfacade.timezones.CalTimezones;
@@ -495,8 +495,8 @@
       while (fbit.hasNext()) {
         Object o = fbit.next();
 
-        if (o instanceof BwFreeBusy) {
-          BwFreeBusy fb = (BwFreeBusy)o;
+        if (o instanceof BwEvent) {
+          BwEvent fb = (BwEvent)o;
 
           if (fb.getDtstart().after(start)) {
             // XXX Should warn - or fill in with tentative?
@@ -511,7 +511,7 @@
           fbresp.setStart(start);
           fbresp.setEnd(end);
 
-          Collection<BwFreeBusyComponent> times = fb.getTimes();
+          Collection<BwFreeBusyComponent> times = fb.getFreeBusyPeriods();
 
           if (times != null) {
             for (BwFreeBusyComponent fbcomp: times) {