[Bedework-commit] r542 - trunk/calendar3/calsvc/src/org/bedework/calsvc

[svnadmin at bedework.org]

Author: douglm
Date: 2006-06-06 14:56:07 -0400 (Tue, 06 Jun 2006)
New Revision: 542

Modified:
   trunk/calendar3/calsvc/src/org/bedework/calsvc/CalSvc.java
Log:
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

Modified: trunk/calendar3/calsvc/src/org/bedework/calsvc/CalSvc.java
===================================================================
--- trunk/calendar3/calsvc/src/org/bedework/calsvc/CalSvc.java	2006-06-06 15:40:21 UTC (rev 541)
+++ trunk/calendar3/calsvc/src/org/bedework/calsvc/CalSvc.java	2006-06-06 18:56:07 UTC (rev 542)
@@ -2040,6 +2040,7 @@
                                int recurRetrieval,
                                boolean freeBusy) throws CalFacadeException {
     TreeSet ts = new TreeSet();
+    boolean showAllCalendars = true;
 
     if (sub != null) {
       // Explicitly selected calendar - via a subscription.
@@ -2061,6 +2062,8 @@
         trace("Use current view \"" + currentView.getName() + "\"");
       }
 
+      /* Don't show special calendars in views */
+      showAllCalendars = false;
       subs = currentView.getSubscriptions();
     } else {
       subs = getCurrentSubscriptions();
@@ -2128,7 +2131,7 @@
 
     ts.addAll(postProcess(getCal().getEvents(internal, filter,
                           startDate, endDate,
-                          recurRetrieval, freeBusy, false),
+                          recurRetrieval, freeBusy, showAllCalendars),
               sublookup));
 
     return ts;