Changeset 357

Show
Ignore:
Timestamp:
04/10/06 01:00:42
Author:
douglm
Message:

Partially fix bug that prevented new calendar stuff from working. Trash still not working?

Removed some debugging code

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r356 r357  
    20012001      CoreEventInfo cei = (CoreEventInfo)it.next(); 
    20022002 
    2003       if (!deleted.contains(cei)) { 
     2003      if (!isDeleted(deleted, cei)) { 
    20042004        EventInfo ei = postProcess(cei, sub, null); 
    20052005        al.add(ei); 
    …… 
    20492049      return false; 
    20502050    } 
    2051     boolean try1 = false; 
    20522051 
    20532052    Iterator it = deleted.iterator(); 
    20542053    while (it.hasNext()) { 
    20552054      CoreEventInfo cei = (CoreEventInfo)it.next(); 
    2056       BwEventProxy pr = (BwEventProxy)cei.getEvent(); 
    2057       if (debug) { 
    2058         trace("Deleted: " + pr.getTarget().getId()); 
    2059       } 
    2060  
    20612055      if (cei.equals(tryCei)) { 
    2062         if (!debug) { 
    2063           return true; 
    2064         } 
    2065  
    2066         trace("Matched: " + tryCei.getEvent().getId()); 
    2067         try1 = true; 
    2068         break; 
    2069       } 
    2070     } 
    2071  
    2072     // only here for debug mode 
    2073     boolean try2 = deleted.contains(tryCei); 
    2074     trace("  try2 for : " + tryCei.getEvent().getId() + " gives " + try2); 
    2075  
    2076     return try1 || try2; 
    2077   } 
    2078  
    2079   private void traceDeleted(Collection c) { 
    2080     Iterator it = c.iterator(); 
    2081     while (it.hasNext()) { 
    2082       CoreEventInfo cei = (CoreEventInfo)it.next(); 
    2083       BwEventProxy pr = (BwEventProxy)cei.getEvent(); 
    2084       trace("Deleted: " + pr.getTarget().getId()); 
    2085     } 
     2056        return true; 
     2057      } 
     2058    } 
     2059 
     2060    return false; 
    20862061  } 
    20872062 

  • trunk/calendar3/webcommon/src/org/bedework/webcommon/BwAbstractAction.java

    r356 r357  
    172172    } 
    173173 
    174     if (!form.getNewSession()) { 
     174    if (form.getNewSession()) { 
    175175      // First time through here for this session 
    176176