Changeset 47

Show
Ignore:
Timestamp:
01/27/06 14:20:22
Author:
douglm
Message:

All day event fix + small caldav fix

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/calendar3/appcommon/src/org/bedework/appcommon/EventFormatter.java

    r27 r47  
    5555package org.bedework.appcommon; 
    5656 
     57import org.bedework.calfacade.BwDateTime; 
    5758import org.bedework.calfacade.BwEvent; 
    5859import org.bedework.calfacade.ifs.CalTimezones; 
    …… 
    181182    try { 
    182183      if (end == null) { 
     184        BwDateTime dt = getEvent().getDtend(); 
     185        if (dt.getDateType()) { 
     186          dt = dt.getPreviousDay(ctz); 
     187        } 
    183188        end = new DateTimeFormatter(getCalInfo(), 
    184                                     getEvent().getDtend(), 
     189                                    dt, 
    185190                                    ctz); 
    186191      } 

  • trunk/calendar3/caldav/src/edu/rpi/cct/uwcal/caldav/CaldavBWIntf.java

    r2 r47  
    5555package edu.rpi.cct.uwcal.caldav; 
    5656 
    57 import org.bedework.calenv.CalEnv; 
    5857import org.bedework.calfacade.BwCalendar; 
    5958import org.bedework.calfacade.BwEvent; 
    …… 
    112111 * 
    113112 * <p>As a first pass we'll define webdav urls as starting with <br/> 
    114  * /user-name/calendar-name/<br/> 
     113 * /user/user-name/calendar-name/<br/> 
    115114 * 
    116115 * <p>uri resolution should be made part of the core calendar allowing all 
    …… 
    119118 * <p>The part following the above prefix probably determines exactly what is 
    120119 * delivered. We may want the entire calendar (or what we show by default) or 
    121  * a single event from the calendar (or does that have the url<br/> 
    122  *   /user-name/event-id.ics<br/> 
     120 * a single event from the calendar 
    123121 * 
    124122 *   @author Mike Douglass   douglm @ rpi.edu 
    …… 
    179177 
    180178    try { 
    181       /* 
    182       if (anonymous) { 
    183         env = new CalEnv(CalEnv.caldavPublicAppPrefix, debug); 
    184       } else { 
    185         env = new CalEnv(CalEnv.caldavPersonalAppPrefix, debug); 
    186       } 
    187       */ 
    188  
    189       publicCalendarRoot = CalEnv.getGlobalProperty("public.calroot"); 
    190       userCalendarRoot = CalEnv.getGlobalProperty("user.calroot"); 
    191     } catch (Throwable t) { 
    192       throw new WebdavIntfException(t); 
    193     } 
    194  
    195 //    uriGen = new UWCalWebURIgen(namespace); 
     179      publicCalendarRoot = getSvci().getSyspars().getPublicCalendarRoot(); 
     180      userCalendarRoot = getSvci().getSyspars().getUserCalendarRoot(); 
     181    } catch (Throwable t) { 
     182      throw new WebdavIntfException(t); 
     183    } 
    196184  } 
    197185 

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

    r46 r47  
    329329  } 
    330330 
    331   /** Get the system pars 
    332    * 
    333    * @return BwSystem object 
    334    * @throws CalFacadeException if not admin 
    335    */ 
    336331  public BwSystem getSyspars() throws CalFacadeException { 
    337332    return getCal().getSyspars(); 

  • trunk/calendar3/calsvci/src/org/bedework/calsvci/CalSvcI.java

    r2 r47  
    6868import org.bedework.calfacade.BwSynchInfo; 
    6969import org.bedework.calfacade.BwSynchState; 
     70import org.bedework.calfacade.BwSystem; 
    7071import org.bedework.calfacade.BwUser; 
    7172import org.bedework.calfacade.CalFacadeException; 
    …… 
    112113   */ 
    113114  public abstract BwStats getStats() throws CalFacadeException; 
     115 
     116  /** Get the system pars 
     117   * 
     118   * @return BwSystem object 
     119   * @throws CalFacadeException if not admin 
     120   */ 
     121  public abstract BwSystem getSyspars() throws CalFacadeException; 
    114122 
    115123  /** Get the timezones cache object 

  • trunk/calendar3/docs/todo.txt

    r42 r47  
    22 
    33-------------------------------------------------------------------------------- 
     4-------------------------------------------------------------------------------- 
     5Check all day events are correct in all clients. 
    46-------------------------------------------------------------------------------- 
    57Unremovable subscriptions