[Bedework-commit] caldavimpl r85 - trunk/bwcaldav/src/org/bedework/caldav/bwserver

[svnadmin at bedework.org]

Author: douglm
Date: 2011-02-24 15:09:47 -0500 (Thu, 24 Feb 2011)
New Revision: 85

Modified:
   trunk/bwcaldav/src/org/bedework/caldav/bwserver/BwSysIntfImpl.java
Log:
Bring 3.7 up to date with bwxml

Minor changes to reduce warnings

Modified: trunk/bwcaldav/src/org/bedework/caldav/bwserver/BwSysIntfImpl.java
===================================================================
--- trunk/bwcaldav/src/org/bedework/caldav/bwserver/BwSysIntfImpl.java	2011-02-24 20:09:42 UTC (rev 84)
+++ trunk/bwcaldav/src/org/bedework/caldav/bwserver/BwSysIntfImpl.java	2011-02-24 20:09:47 UTC (rev 85)
@@ -101,8 +101,6 @@
 
 import org.apache.log4j.Logger;
 
-import ietf.params.xml.ns.icalendar_2.IcalendarType;
-
 import java.io.Reader;
 import java.io.StringReader;
 import java.io.Writer;
@@ -1335,7 +1333,7 @@
     }
   }
 
-  public IcalendarType toIcalendar(final CalDAVEvent ev,
+  public ietf.params.xml.ns.icalendar_2.Icalendar toIcalendar(final CalDAVEvent ev,
                                    final boolean incSchedMethod) throws WebdavException {
     try {
       int meth = Icalendar.methodTypeNone;
@@ -1482,7 +1480,7 @@
   }
 
   public SysiIcalendar fromIcal(final CalDAVCollection col,
-                                final IcalendarType ical,
+                                final ietf.params.xml.ns.icalendar_2.Icalendar ical,
                                 final IcalResultType rtype) throws WebdavException {
     getSvci(); // Ensure open
     boolean rollback = true;