Changeset 540

Timestamp:

06/06/06 11:18:09

Author:

douglm

Message:

Was not saving user defined timezones. Now does that and even loads and resuses them.

Files:

• trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/CalTimezonesImpl.java (modified) (3 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) (2 diffs)
• trunk/calendar3/calFacade/src/org/bedework/calfacade/ifs/CalTimezones.java (modified) (6 diffs)
• trunk/calendar3/calFacade/src/org/bedework/calfacade/ifs/Calintf.java (modified) (2 diffs)
• trunk/calendar3/caldavClientApi/src/org/bedework/caldav/client/CalintfCaldavImpl.java (modified) (2 diffs)
• trunk/calendar3/calsvc/src/org/bedework/calsvc/CalSvc.java (modified) (3 diffs)
• trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/TimezonesImpl.java (modified) (1 diff)
• trunk/calendar3/icalendar/src/org/bedework/icalendar/IcalCallback.java (modified) (1 diff)
• trunk/calendar3/icalendar/src/org/bedework/icalendar/IcalTranslator.java (modified) (2 diffs)

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

@@ -86 +86 @@
-  private static volatile boolean systemTimezonesInitialised = false;
-
-  //private transient Logger log;
-
-  CalTimezonesImpl(Calintf cal, BwStats stats, boolean publicAdmin, boolean debug)
-          throws CalFacadeException {
@@ -175 +173 @@
-
-    return vTimeZone;
+  }
+
+  public void storeTimeZone(final String id, BwUser owner) throws CalFacadeException {
+    TimezoneInfo tzinfo = lookup(id);
+
+    if (tzinfo == null) {
+      throw new CalFacadeException("org.bedework.calcore.unknown.tzid", id);
+    }
+
+    if (!tzinfo.getNewDef() && !tzinfo.getChanged()) {
+      return;
+    }
+
+    if (tzinfo.getPublick()) {
+      warn("Attempt to update public timezone");
+      return;
+    }
+
+    if (tzinfo.getNewDef()) {
+      saveTimeZone(id, tzinfo.getTz().getVTimeZone());
+      tzinfo.setNewDef(false);
+    } else {
+      // XXX Ignore change for the moment.
+      tzinfo.setChanged(false);
+    }
-  }
-
@@ -230 +253 @@
-    }
-
+    if (!userTimezonesInitialised) {
+      // First call after object creation.
+      synchronized (this) {
+        if (!userTimezonesInitialised) {
+          Collection tzs = cal.getUserTimeZones();
+          Iterator it = tzs.iterator();
+
+          while (it.hasNext()) {
+            BwTimeZone btz = (BwTimeZone)it.next();
+
+            Calendar cal = IcalTranslator.getCalendar(btz.getVtimezone());
+
+            VTimeZone vtz = (VTimeZone)cal.getComponents().getComponent(Component.VTIMEZONE);
+            if (vtz == null) {
+              throw new CalFacadeException("Incorrectly stored timezone");
+            }
+
+            tzinfo = new TimezoneInfo(new TimeZone(vtz), true);
+            timezones.put(btz.getTzid(), tzinfo);
+          }
+
+          userTimezonesInitialised = true;
+        }
+      }
+    }
+
-    tzinfo = (TimezoneInfo)systemTimezones.get(id);
-

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

@@ -403 +403 @@
-  }
-
-
+Handler
-    return timezones;
-  }
@@ -742 +742 @@
-
-    sess.namedQuery("getMergedTimezones");
+    sess.setEntity("owner", user);
+
+    return sess.getList();
+  }
+
+  public Collection getUserTimeZones() throws CalFacadeException {
+    sess.namedQuery("getUserTimezones");
-    sess.setEntity("owner", user);
-
@@ -1060 +1067 @@
-        gpp.startDt = start;
-        gpp.dur = granularity;
-
+Handler
-
-        BwFreeBusyComponent fbc = null;

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

@@ -367 +367 @@
-    }
-
-
+Handler
-    DtStart vstart = vev.getStartDate();
-
@@ -779 +779 @@
-    }
-
-
+Handler
-    DtStart vstart = vev.getStartDate();
-

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

@@ -89 +89 @@
-    boolean publick;
-
+    boolean newDef;  // true if this is a new definition
+
+    boolean changed; // true if the def has changed
+
-    /**
-     * @param tz
@@ -128 +132 @@
-      return publick;
-    }
+
+    /** Set the new flag
+     *
+     * @param val
+     */
+    public void setNewDef(boolean val) {
+      newDef = val;
+    }
+
+    /**
+     * @return true for new def
+     */
+    public boolean getNewDef() {
+      return newDef;
+    }
+
+    /** Set the changed flag
+     *
+     * @param val
+     */
+    public void setChanged(boolean val) {
+      changed = val;
+    }
+
+    /**
+     * @return true for new def
+     */
+    public boolean getChanged() {
+      return changed;
+    }
-  }
-
-  /* Map of user TimezoneInfo */
-  protected HashMap timezones = new HashMap();
+
+  /* subclasses can use this to trigger a read of stored timezone info. */
+  protected boolean userTimezonesInitialised;
-
-  /* Cache date only UTC values - we do a lot of those but the number of
@@ -179 +216 @@
-    if (tzinfo == null) {
-      tzinfo = new TimezoneInfo(timezone);
+      tzinfo.newDef = true;
-      timezones.put(id, tzinfo);
-    } else {
-
+
+
+
+
+
-    }
-  }
@@ -234 +276 @@
-   */
-  public abstract VTimeZone findTimeZone(final String id, BwUser owner) throws CalFacadeException;
+
+  /** Store the definition for a timezone object in the database given the id.
+   * This will do nothing if the timezone is already stored.
+   *
+   * @param id
+   * @param owner     event owner or null for current user
+   * @throws CalFacadeException
+   */
+  public abstract void storeTimeZone(final String id, BwUser owner) throws CalFacadeException;
-
-  /** Clear all public timezone objects. Implementing classes should call this.
@@ -466 +517 @@
-  }
-
-
-  /* Get a logger for messages
-   */
@@ -477 +527 @@
-  }
-
+  protected void warn(String msg) {
+    getLogger().warn(msg);
+  }
+
-  protected void trace(String msg) {
-"trace: " + 
+
-  }
-}

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

@@ -192 +192 @@
-   * @throws CalFacadeException if not admin
-   */
-
+Handler
-
-  /** Get information about this interface
@@ -433 +433 @@
-   */
-  public Collection getTimeZones() throws CalFacadeException;
+
+  /** Get all user vtimezone objects.
+   *
+   * @return Collection
+   * @throws CalFacadeException
+   */
+  public Collection getUserTimeZones() throws CalFacadeException;
-
-  /** Get all public vtimezone objects.

trunk/calendar3/caldavClientApi/src/org/bedework/caldav/client/CalintfCaldavImpl.java

@@ -172 +172 @@
-  }
-
-
+Handler
-    return null;
-  }
@@ -302 +302 @@
-
-  public Collection getTimeZones() throws CalFacadeException {
+    throw new CalFacadeUnimplementedException();
+  }
+
+  public Collection getUserTimeZones() throws CalFacadeException {
-    throw new CalFacadeUnimplementedException();
-  }

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

@@ -302 +302 @@
-      }
-
-
+Handler
-
-      /* Nominate our timezone registry */
@@ -372 +372 @@
-
-  public CalTimezones getTimezones() throws CalFacadeException {
-
+Handler
-  }
-
@@ -2557 +2557 @@
-
-    public CalTimezones getTimezones() throws CalFacadeException {
-
-
-
- VTimeZone vtz
-
+Handler
+
+
+
+VTimeZone vtz
-      timezones.saveTimeZone(tzid, vtz);
+    }
+
+    public void storeTimeZone(final String id) throws CalFacadeException {
+      timezones.storeTimeZone(id, getUser());
-    }
-

trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/TimezonesImpl.java

@@ -193 +193 @@
-  }
-
+  public void storeTimeZone(final String id, BwUser owner) throws CalFacadeException {
+  }
+
-  public void refreshTimezones() throws CalFacadeException {
-    synchronized (this) {

trunk/calendar3/icalendar/src/org/bedework/icalendar/IcalCallback.java

@@ -143 +143 @@
-   * @throws CalFacadeException
-   */
-
-
+
+
+
+
+
+
+
+
+
+
-
-  /** Register a timezone object in the current session.

trunk/calendar3/icalendar/src/org/bedework/icalendar/IcalTranslator.java

@@ -61 +61 @@
-import org.bedework.calfacade.CalFacadeException;
-import org.bedework.calfacade.svc.EventInfo;
+//import org.bedework.calfacade.ifs.CalTimezones.
-
-import net.fortuna.ical4j.data.CalendarBuilder;
@@ -531 +532 @@
-    }
-
-
-
-
-
-
-
-
-
+
-  }
-