Changeset 360

Timestamp:

04/10/06 22:53:39

Author:

douglm

Message:

Don't use Trash to store deleted event annotations. Instead store in special calendar "Deleted"
That way we don't have to take any special actions when emptying trash

Files:

• trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/Calendars.java (modified) (7 diffs)
• trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/CalintfImpl.java (modified) (3 diffs)
• trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/Events.java (modified) (1 diff)
• trunk/calendar3/calFacade/src/org/bedework/calfacade/base/CalintfBase.java (modified) (1 diff)
• trunk/calendar3/calFacade/src/org/bedework/calfacade/ifs/CalendarsI.java (modified) (2 diffs)
• trunk/calendar3/calsvc/src/org/bedework/calsvc/CalSvc.java (modified) (2 diffs)

trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/Calendars.java

@@ -82 +82 @@
-   * @throws CalFacadeException
-   */
- 
+
-                   int currentMode, boolean debug)
-                  throws CalFacadeException {
@@ -178 +178 @@
-    usercal.addChild(cal);
-
+    /* Add the deleted calendar */
+    cal = new BwCalendar();
+    // XXX new syspar cal.setName(getSyspars().getUserOutbox());
+    cal.setName("Deleted");
+    cal.setCreator(user);
+    cal.setOwner(user);
+    cal.setPublick(false);
+    // XXX new syspar cal.setPath(path + "/" + getSyspars().getUserOutbox());
+    cal.setPath(path + "/" + "Deleted");
+    cal.setCalendar(usercal);
+    cal.setCalendarCollection(true);
+    usercal.addChild(cal);
+
-    sess.save(usercal);
-
@@ -313 +326 @@
-  }
-
+  public BwCalendar getDeletedCalendar(BwUser user) throws CalFacadeException {
+    StringBuffer sb = new StringBuffer();
+
+    sb.append("/");
+    sb.append(getSyspars().getUserCalendarRoot());
+    sb.append("/");
+    sb.append(user.getAccount());
+    sb.append("/");
+    sb.append("Deleted");
+    // XXX new syspar sb.append(getSyspars().getDefaultTrashCalendar());
+
+    return getCalendar(sb.toString());
+  }
+
+  public void createDeletedCalendar(BwUser user) throws CalFacadeException {
+    StringBuffer sb = new StringBuffer();
+
+    sb.append("/");
+    sb.append(getSyspars().getUserCalendarRoot());
+    sb.append("/");
+    sb.append(user.getAccount());
+
+    String pathTo = sb.toString();
+
+    BwCalendar parent = getCalendar(pathTo);
+
+    if (parent == null) {
+      throw new CalFacadeException("org.bedework.calcore.calendars.unabletocreate");
+    }
+
+    BwCalendar cal = new BwCalendar();
+    cal.setName("Deleted");
+    cal.setOwner(user);
+    cal.setCreator(user);
+    cal.setPublick(parent.getPublick());
+    cal.setCalendarCollection(true);
+    addCalendar(cal, parent);
+  }
+
-  public void addCalendar(BwCalendar val, BwCalendar parent) throws CalFacadeException {
-    HibSession sess = getSess();
-
-
-
+content 
+Content
-
-    /** Is the parent a calendar collection?
-     */
-/*    sess.namedQuery("countCalendarEventRefs");
-    sess.setEntity("cal", parent);
-
-    Integer res = (Integer)sess.getUnique();
-
-    if (res.intValue() > 0) {*/
-
-    if (parent.getCalendarCollection()) {
-      throw new CalFacadeException(CalFacadeException.illegalCalendarCreation);
@@ -352 +397 @@
-
-    val.setPath(path);
-
+
+
+
-    val.setCalendar(parent);
-    parent.addChild(val);
@@ -427 +474 @@
-    while (it.hasNext()) {
-      BwCalendar cal = (BwCalendar)it.next();
- 
+
-                                            noAccessReturnsNull);
-      if (ca != null) {
@@ -450 +497 @@
-  private BwCalendar cloneAndCheckOne(BwCalendar subroot, int desiredAccess,
-                           boolean nullForNoAccess) throws CalFacadeException {
- 
+
-                                          nullForNoAccess);
-
+
-    if (!ca.accessAllowed) {
-      return null;
@@ -460 +507 @@
-    // XXX Temp fix - add id to the clone
-    cal.setId(subroot.getId());
-
+
-    cal.setCurrentAccess(ca);
-

trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/CalintfImpl.java

@@ -86 +86 @@
-
-import java.sql.Timestamp;
+import java.util.ArrayList;
-import java.util.Collection;
-import java.util.TreeSet;
@@ -860 +861 @@
-  }
-
+  public BwCalendar getDeletedCalendar(BwUser user) throws CalFacadeException {
+    return calendars.getDeletedCalendar(user);
+  }
+
-  public void addCalendar(BwCalendar val, BwCalendar parent) throws CalFacadeException {
-    checkOpen();
@@ -1106 +1111 @@
-
-  public Collection getDeletedProxies() throws CalFacadeException {
-
+
+
+
+
+
+
+
+
+
-  }
-

trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/Events.java

@@ -295 +295 @@
-   * from result sets.
-   *
-Trash
+Deleted
-   * @return Collection of CoreEventInfo objects
-   */

trunk/calendar3/calFacade/src/org/bedework/calfacade/base/CalintfBase.java

@@ -470 +470 @@
-  }
-
+  public BwCalendar getDeletedCalendar(BwUser user) throws CalFacadeException {
+    throw new CalFacadeUnimplementedException();
+  }
+
-  public void addCalendar(BwCalendar val, BwCalendar parent) throws CalFacadeException {
-    checkOpen();

trunk/calendar3/calFacade/src/org/bedework/calfacade/ifs/CalendarsI.java

@@ -106 +106 @@
-
-  /** Get the default calendar for the given user. This is determined by the
- 
+
-   * preferences. This is normally used at initialisation of a new user.
-   *
-     
+
-   * @return BwCalendar null for unknown calendar
-   * @throws CalFacadeException
@@ -117 +117 @@
-  /** Get the trash calendar for the given user.
-   *
-     
+
-   * @return BwCalendar null for unknown calendar
-   * @throws CalFacadeException
-   */
-  public BwCalendar getTrashCalendar(BwUser user) throws CalFacadeException;
+
+  /** Get the deleted calendar for the given user. This holds annotations
+   * marking other events as deleted
+   *
+   * @param  user
+   * @return BwCalendar null for unknown calendar
+   * @throws CalFacadeException
+   */
+  public BwCalendar getDeletedCalendar(BwUser user) throws CalFacadeException;
-
-  /** Add a calendar object

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

@@ -1683 +1683 @@
-      // Have write access - just set the flag and move it into the owners trash
-      event.setDeleted(true);
-Trash
+Deleted
-      updateEvent(event);
-      return;
@@ -1695 +1695 @@
-    // Put it in the trash - but don't delete on empty trash
-
-Trash
+Deleted
-    proxy.setOwner(getUser());
-    proxy.setDeleted(true);