[Bedework-commit] caldav r149 - trunk/server/src/org/bedework/caldav/server

[svnadmin at bedework.org]

Author: douglm
Date: 2007-04-14 23:14:09 -0400 (Sat, 14 Apr 2007)
New Revision: 149

Modified:
   trunk/server/src/org/bedework/caldav/server/CaldavComponentNode.java
Log:
Separate out freebusy publish code into new action.

Use correct output method for ical data

Modified: trunk/server/src/org/bedework/caldav/server/CaldavComponentNode.java
===================================================================
--- trunk/server/src/org/bedework/caldav/server/CaldavComponentNode.java	2007-04-10 17:24:05 UTC (rev 148)
+++ trunk/server/src/org/bedework/caldav/server/CaldavComponentNode.java	2007-04-15 03:14:09 UTC (rev 149)
@@ -64,6 +64,8 @@
 import org.bedework.davdefs.CaldavTags;
 import org.bedework.davdefs.WebdavTags;
 import org.bedework.icalendar.ComponentWrapper;
+import org.bedework.icalendar.IcalTranslator;
+
 import org.w3c.dom.Element;
 
 import edu.rpi.cct.webdav.servlet.shared.WebdavException;
@@ -73,13 +75,10 @@
 import edu.rpi.sss.util.xml.QName;
 import edu.rpi.sss.util.xml.XmlEmit;
 
-import net.fortuna.ical4j.data.CalendarOutputter;
 import net.fortuna.ical4j.model.Calendar;
 import net.fortuna.ical4j.model.Component;
 import net.fortuna.ical4j.model.ComponentList;
 
-import java.io.StringWriter;
-import java.io.Writer;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -666,12 +665,7 @@
         ical = getSysi().toCalendar(eventInfo);
       }
       if ((compString == null)) {
-        CalendarOutputter co = new CalendarOutputter(false);
-
-        Writer wtr =  new StringWriter();
-        co.output(ical, wtr);
-        compString = wtr.toString();
-//        compString = ical.toString();
+        compString = IcalTranslator.toIcalString(ical);
       }
     } catch (Throwable t) {
       throw new WebdavException(t);