[Bedework-commit] calendarapi r418 - in trunk: calCore/src/org/bedework/calcore/hibernate icalendar/src/org/bedework/icalendar

[svnadmin at bedework.org]

Author: douglm
Date: 2007-09-19 12:43:54 -0400 (Wed, 19 Sep 2007)
New Revision: 418

Modified:
   trunk/calCore/src/org/bedework/calcore/hibernate/Calendars.java
   trunk/icalendar/src/org/bedework/icalendar/VFreeUtil.java
Log:
Make touch work

Modified: trunk/calCore/src/org/bedework/calcore/hibernate/Calendars.java
===================================================================
--- trunk/calCore/src/org/bedework/calcore/hibernate/Calendars.java	2007-09-19 14:43:32 UTC (rev 417)
+++ trunk/calCore/src/org/bedework/calcore/hibernate/Calendars.java	2007-09-19 16:43:54 UTC (rev 418)
@@ -202,12 +202,12 @@
   */
   public void touchCalendar(BwCalendar val) throws CalFacadeException {
     val = unwrap(val);
-    val.updateLastmod();
 
     // CALWRAPPER - if we're not cloning can we avoid this?
     //val = (BwCalendar)getSess().merge(val);
 
     val = (BwCalendar)getSess().merge(val);
+    val.updateLastmod();
     getSess().update(val);
   }
 

Modified: trunk/icalendar/src/org/bedework/icalendar/VFreeUtil.java
===================================================================
--- trunk/icalendar/src/org/bedework/icalendar/VFreeUtil.java	2007-09-19 14:43:32 UTC (rev 417)
+++ trunk/icalendar/src/org/bedework/icalendar/VFreeUtil.java	2007-09-19 16:43:54 UTC (rev 418)
@@ -145,7 +145,9 @@
           PeriodList pdl =  fb.getPeriods();
 
           for (Period p: fbc.getPeriods()) {
-            pdl.add(p);
+            // XXX inverse.ca plugin cannot handle durations.
+            Period np = new Period(p.getStart(), p.getEnd());
+            pdl.add(np);
           }
 
           pl.add(fb);