[Bedework-commit] rpiutil r244 - in trunk/src/edu/rpi/cmt/calendar: . diff

[svnadmin at bedework.org]

Author: douglm
Date: 2011-07-15 16:04:11 -0400 (Fri, 15 Jul 2011)
New Revision: 244

Modified:
   trunk/src/edu/rpi/cmt/calendar/XcalUtil.java
   trunk/src/edu/rpi/cmt/calendar/diff/CompWrapper.java
Log:
Many changes to CalWs-SOAP 

A few changes to the build to better handle changes to dependent projects

Added CalWs-SOAP spec to docs for the moment

Modified: trunk/src/edu/rpi/cmt/calendar/XcalUtil.java
===================================================================
--- trunk/src/edu/rpi/cmt/calendar/XcalUtil.java	2011-06-27 17:13:08 UTC (rev 243)
+++ trunk/src/edu/rpi/cmt/calendar/XcalUtil.java	2011-07-15 20:04:11 UTC (rev 244)
@@ -217,9 +217,25 @@
 
   /**
    * @param dt
-   * @return DtTzid filled in
+   * @return rfc5545 date or date/time
    */
+  public static String getIcalFormatDateTime(final XMLGregorianCalendar dt) {
+    if (dt == null) {
+      return null;
+    }
+
+    return getIcalFormatDateTime(dt.toXMLFormat());
+  }
+
+  /**
+   * @param dt
+   * @return rfc5545 date or date/time
+   */
   public static String getIcalFormatDateTime(final String dt) {
+    if (dt == null) {
+      return null;
+    }
+
     if (dt.charAt(4) != '-') {
       // Already Ical format
       return dt;
@@ -419,7 +435,7 @@
       return null;
     }
 
-    for (JAXBElement<? extends BasePropertyType> bpel: ps.getBaseProperty()) {
+    for (JAXBElement<? extends BasePropertyType> bpel: ps.getBasePropertyOrTzid()) {
       if (bpel.getName().equals(name)) {
         return bpel.getValue();
       }

Modified: trunk/src/edu/rpi/cmt/calendar/diff/CompWrapper.java
===================================================================
--- trunk/src/edu/rpi/cmt/calendar/diff/CompWrapper.java	2011-06-27 17:13:08 UTC (rev 243)
+++ trunk/src/edu/rpi/cmt/calendar/diff/CompWrapper.java	2011-07-15 20:04:11 UTC (rev 244)
@@ -103,7 +103,7 @@
               final QName name,
               final BaseComponentType c) {
     super(parent, name, c);
-    props = new PropsWrapper(this, c.getProperties().getBaseProperty());
+    props = new PropsWrapper(this, c.getProperties().getBasePropertyOrTzid());
     comps = new CompsWrapper(this, XcalUtil.getComponents(c));
 
     kind = compKinds.get(name);