Changeset 542

Timestamp:

06/06/06 14:56:07

Author:

douglm

Message:

Change svci.getEvents so that selecting a subset of users calendars displays correctly.

Selcting a view does not display 'special' calendars, selecting a folder or individual calendars does display

Files:

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

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

@@ -2041 +2041 @@
-                               boolean freeBusy) throws CalFacadeException {
-    TreeSet ts = new TreeSet();
+    boolean showAllCalendars = true;
-
-    if (sub != null) {
@@ -2062 +2063 @@
-      }
-
+      /* Don't show special calendars in views */
+      showAllCalendars = false;
-      subs = currentView.getSubscriptions();
-    } else {
@@ -2129 +2132 @@
-    ts.addAll(postProcess(getCal().getEvents(internal, filter,
-                          startDate, endDate,
-false
+showAllCalendars
-              sublookup));
-