[Bedework-commit] calendarapi r1473 - trunk/icalendar/src/org/bedework/icalendar

[svnadmin at bedework.org]

Author: douglm
Date: 2011-03-19 01:05:28 -0400 (Sat, 19 Mar 2011)
New Revision: 1473

Modified:
   trunk/icalendar/src/org/bedework/icalendar/IcalTranslator.java
   trunk/icalendar/src/org/bedework/icalendar/ToXEvent.java
Log:
Further additions to the CalWs SOAP service

Modified: trunk/icalendar/src/org/bedework/icalendar/IcalTranslator.java
===================================================================
--- trunk/icalendar/src/org/bedework/icalendar/IcalTranslator.java	2011-03-16 03:33:55 UTC (rev 1472)
+++ trunk/icalendar/src/org/bedework/icalendar/IcalTranslator.java	2011-03-19 05:05:28 UTC (rev 1473)
@@ -6,9 +6,9 @@
     Version 2.0 (the "License"); you may not use this file
     except in compliance with the License. You may obtain a
     copy of the License at:
-        
+
     http://www.apache.org/licenses/LICENSE-2.0
-        
+
     Unless required by applicable law or agreed to in writing,
     software distributed under the License is distributed on
     an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -929,7 +929,7 @@
 
     if (!ev.getSuppressed()) {
       if (ev.getEntityType() == IcalDefs.entityTypeFreeAndBusy) {
-//        comp = VFreeUtil.toVFreeBusy(ev);
+        el = ToXEvent.toComponent(ev, false);
       } else {
         el = ToXEvent.toComponent(ev, false);
       }

Modified: trunk/icalendar/src/org/bedework/icalendar/ToXEvent.java
===================================================================
--- trunk/icalendar/src/org/bedework/icalendar/ToXEvent.java	2011-03-16 03:33:55 UTC (rev 1472)
+++ trunk/icalendar/src/org/bedework/icalendar/ToXEvent.java	2011-03-19 05:05:28 UTC (rev 1473)
@@ -6,9 +6,9 @@
     Version 2.0 (the "License"); you may not use this file
     except in compliance with the License. You may obtain a
     copy of the License at:
-        
+
     http://www.apache.org/licenses/LICENSE-2.0
-        
+
     Unless required by applicable law or agreed to in writing,
     software distributed under the License is distributed on
     an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -343,7 +343,7 @@
 
       /* ------------------- DtStart -------------------- */
 
-      if (!val.getNoStart()) {
+      if ((val.getNoStart() == null) || !val.getNoStart()) {
         DtstartPropType dtstart = (DtstartPropType)makeDateDatetime(new DtstartPropType(),
                                                               val.getDtstart(),
                                                               freeBusy | val.getForceUTC());
@@ -353,6 +353,8 @@
       /* ------------------- ExDate --below------------ */
       /* ------------------- ExRule --below------------- */
 
+      /* ------------------- freebusy -------------------- */
+
       if (entityType == IcalDefs.entityTypeFreeAndBusy) {
         Collection<BwFreeBusyComponent> fbps = val.getFreeBusyPeriods();