Changeset 543

Timestamp:

06/06/06 15:48:55

Author:

douglm

Message:

Fix free/busy so tentative shows up.

Files:

• trunk/calendar3/calsvc/src/org/bedework/calsvc/CalSvc.java (modified) (3 diffs)

trunk/calendar3/calsvc/src/org/bedework/calsvc/CalSvc.java

@@ -1203 +1203 @@
-            if (periodEvents.size() == 0) {
-              fbc.setType(BwFreeBusyComponent.typeFree);
+            } else {
+              fbc.setType(getFreeBusyType(periodEvents));
-            }
-          } else if (periodEvents.size() != 0) {
@@ -1222 +1224 @@
-
-            fbc.addPeriod(new Period(psdt, pedt));
+            fbc.setType(getFreeBusyType(periodEvents));
-          }
-        }
@@ -1338 +1341 @@
-  }
-
+  private int getFreeBusyType(Collection periodEvents) {
+    int fbtype = BwFreeBusyComponent.typeFree;
+
+    Iterator it = periodEvents.iterator();
+    while (it.hasNext()) {
+      EventInfo ei = (EventInfo)it.next();
+
+      String status = ei.getEvent().getStatus();
+      if (status.equals(BwEvent.statusConfirmed)) {
+        return BwFreeBusyComponent.typeBusy;
+      }
+
+      if (status.equals(BwEvent.statusTentative)) {
+        fbtype = BwFreeBusyComponent.typeBusyTentative;
+      }
+    }
+
+    return fbtype;
+  }
+
-  private static class EventPeriod implements Comparable {
-    DateTime start;