Changeset 656

Timestamp:

06/24/06 00:33:26

Author:

douglm

Message:

Eventrefs date/time track master events

Files:

• trunk/calendar3/build.properties (modified) (1 diff)
• trunk/calendar3/build.xml (modified) (1 diff)
• trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/Events.java (modified) (4 diffs)
• trunk/calendar3/calFacade/src/org/bedework/calfacade/BwEvent.java (modified) (1 diff)

trunk/calendar3/build.properties

@@ -5 +5 @@
-
-# If you want to override these values you should add your own values to
-
-
-
-
-
-
-
-
-
+
-
-#==================== File and Directory Names ========================

trunk/calendar3/build.xml

@@ -36 +36 @@
-      defined, from the following list:
-      * Definitions on the "ant" command line (ant -Ddeploy.home=xyz compile)
-uwcal
+bedework
-        home directory
-      * Definitions from a "local.build.properties" file in the top level
-        source directory
-      * Definitions from a "build.properties" file in the top level
-        source directory

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

@@ -455 +455 @@
-        updateRecurrences(val);
-      }
+
+      updateRefs(val);
+
-      return;
-    }
@@ -550 +553 @@
-       master field.
-     */
-
-
-
-
-
-
-
-
-
-
-
+
-
-    while (it.hasNext()) {
@@ -745 +738 @@
-
-    val.setGuid(guid);
+  }
+
+  /* XXX This needs more work, OK until we allow modification of annotations - which
+   * could happen anyway through caldav or by synch.
+   *
+   * If the master changes then either we change the referencing annotations or
+   * we let the user know it's changed. At the moment we have no notification
+   * mechanism.
+   */
+  private void updateRefs(BwEvent val) throws CalFacadeException {
+    HibSession sess = getSess();
+    Iterator it = getAnnotations(val).iterator();
+
+    while (it.hasNext()) {
+      BwEventAnnotation ann = (BwEventAnnotation)it.next();
+      boolean changed = false;
+
+      if (!val.getDtstart().equals(ann.getDtstart())) {
+        ann.setDtstart(val.getDtstart());
+        changed = true;
+      }
+
+      if (!val.getDtend().equals(ann.getDtend())) {
+        ann.setDtend(val.getDtend());
+        changed = true;
+      }
+
+      if (!val.getDuration().equals(ann.getDuration())) {
+        ann.setDuration(val.getDuration());
+        changed = true;
+      }
+
+      if (val.getEndType() != ann.getEndType()) {
+        ann.setEndType(val.getEndType());
+        changed = true;
+      }
+
+      if (changed) {
+        sess.update(ann);
+      }
+    }
-  }
-
@@ -848 +882 @@
-      }
-    }
+  }
+
+  private Collection getAnnotations(BwEvent val) throws CalFacadeException {
+    HibSession sess = getSess();
+    StringBuffer sb = new StringBuffer();
+
+    sb.append("from ");
+    sb.append(BwEventAnnotation.class.getName());
+    sb.append(" where target=:target");
+
+    sess.createQuery(sb.toString());
+    sess.setEntity("target", val);
+
+    return sess.getList();
-  }
-

trunk/calendar3/calFacade/src/org/bedework/calfacade/BwEvent.java

@@ -1182 +1182 @@
-    /* If the guids are the same it's the same event for non recurring.
-       For recurring events the recurrence id must also be equal.
-     * /
-    int res = e1.getGuid().compareTo(e2.getGuid());
-    if (res == 0) {
-      if (!e1.getRecurring()) {
-        return 0;
-      }
-
-      /* Recurring - only the same if the recurrence id is equal * /
-      return CalFacadeUtil.cmpObjval(e1.getRecurrence().getRecurrenceId(),
-                                     e2.getRecurrence().getRecurrenceId());
-    }
-
-    res = e1.getDtstart().compareTo(e2.getDtstart());
-    if (res != 0) {
-      return res;
-    }
-
-    res = e1.getDtend().compareTo(e2.getDtend());
-    if (res != 0) {
-      return res;
-    }
-
-    /* Dates are the same - try summary. * /
-
-    res = e1.getSummary().compareTo(e2.getSummary());
-    if (res != 0) {
-      return res;
-    }
-
-    // Just use guid
-    return e1.getGuid().compareTo(e2.getGuid());
-    */
-    /* If the guids are the same it's the same event for non recurring.
-       For recurring events the recurrence id must also be equal.
-     */
-    int res = e1.getGuid().compareTo(e2.getGuid());