Changeset 782

Show
Ignore:
Timestamp:
07/14/06 10:32:54
Author:
douglm
Message:

Set ending busy time
Check for free at start and end of requested period.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/calendar3/caldavDomino/src/edu/rpi/cct/bedework/caldav/DominoSysIntfImpl.java

    r774 r782  
    102102import javax.xml.parsers.DocumentBuilderFactory; 
    103103 
    104 /** Domino implementation of SysIntf. 
     104/** Domino implementation of SysIntf. This interacts with a servlet on Domino 
     105 * which presents requested calendar information. 
    105106 * 
    106107 * @author Mike Douglass douglm at rpi.edu 
    …… 
    310311        Period p = (Period)pit.next(); 
    311312 
    312         Period busyp = new Period(bstart, p.getStart()); 
     313        if (!bstart.equals(p.getStart())) { 
     314          /* First free period may be at start of requested time */ 
     315          Period busyp = new Period(bstart, p.getStart()); 
     316          fbcomp.addPeriod(busyp); 
     317        } 
     318 
     319        bstart = p.getEnd(); 
     320      } 
     321 
     322      /* Fill in to end of requested period */ 
     323      DateTime bend = (DateTime)end.makeDate(); 
     324 
     325      if (!bstart.equals(bend)) { 
     326        Period busyp = new Period(bstart, bend); 
    313327        fbcomp.addPeriod(busyp); 
    314  
    315         bstart = p.getEnd(); 
    316328      } 
    317329