Changeset 675

Show
Ignore:
Timestamp:
07/01/06 12:30:51
Author:
douglm
Message:

Don't try to retrieve user timezones in guest or public admin mode

Mark an object serializable

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r657 r675  
    748748 
    749749  public Collection getUserTimeZones() throws CalFacadeException { 
     750    if (currentMode == CalintfUtil.publicAdminMode || 
     751        currentMode == CalintfUtil.guestMode) { 
     752      // No user timezones 
     753      return new ArrayList(); 
     754    } 
     755 
    750756    sess.namedQuery("getUserTimezones"); 
    751757    sess.setEntity("owner", user); 

  • trunk/calendar3/calFacade/src/org/bedework/calfacade/util/Granulator.java

    r667 r675  
    3636import net.fortuna.ical4j.model.Period; 
    3737 
     38import java.io.Serializable; 
    3839import java.util.ArrayList; 
    3940import java.util.Collection; 
    …… 
    6869   * non-null on entry it will be used to set the startDt. 
    6970   */ 
    70   public static class GetPeriodsPars { 
     71  public static class GetPeriodsPars implements Serializable { 
    7172    boolean debug = false; 
    7273 
    …… 
    187188   * 
    188189   */ 
    189   public static class EventPeriod implements Comparable { 
     190  public static class EventPeriod implements Comparable, Serializable { 
    190191    private DateTime start; 
    191192    private DateTime end;