Changeset 363

Timestamp:

04/11/06 11:13:18

Author:

douglm

Message:

Recent updates weren't good for admin. Fixed

Files:

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

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

@@ -1987 +1987 @@
-  private Collection postProcess(Collection ceis, BwSubscription sub)
-          throws CalFacadeException {
+    return postProcess(ceis, sub, null);
+  }
+
+  private Collection postProcess(Collection ceis, HashMap sublookup)
+          throws CalFacadeException {
+    return postProcess(ceis, null, sublookup);
+  }
+
+  private Collection postProcess(Collection ceis,
+                                 BwSubscription sub, HashMap sublookup)
+          throws CalFacadeException {
-    ArrayList al = new ArrayList();
+    Collection deleted = null;
-
-    /* XXX possibly not a great idea. We should probably retrieve the
@@ -1994 +2006 @@
-     * This way we get too many.
-     */
-
+
+
+
+
+
-
-    Iterator it = ceis.iterator();
@@ -2001 +2017 @@
-      CoreEventInfo cei = (CoreEventInfo)it.next();
-
-      if (!isDeleted(deleted, cei)) {
-        EventInfo ei = postProcess(cei, sub, null);
-        al.add(ei);
-      }
-    }
-
-    return al;
-  }
-
-  private Collection postProcess(Collection ceis, HashMap sublookup)
-          throws CalFacadeException {
-    ArrayList al = new ArrayList();
-
-    /* XXX possibly not a great idea. We should probably retrieve the
-     * deleted events at the same time as we retrieve the desired set.
-     *
-     * This way we get too many.
-     */
-    Collection deleted = getCal().getDeletedProxies();
-
-    //traceDeleted(deleted);
-
-    Iterator it = ceis.iterator();
-
-    while (it.hasNext()) {
-      CoreEventInfo cei = (CoreEventInfo)it.next();
-
- //     if (!deleted.contains(cei)) {
-      if (!isDeleted(deleted, cei)) {
-null
+sub
-        al.add(ei);
-      }