[Bedework-commit] calendarapi r1431 - releases/bedework-3.7/icalendar/src/org/bedework/icalendar

[svnadmin at bedework.org]

Author: douglm
Date: 2011-02-07 22:56:47 -0500 (Mon, 07 Feb 2011)
New Revision: 1431

Modified:
   releases/bedework-3.7/icalendar/src/org/bedework/icalendar/IcalTranslator.java
   releases/bedework-3.7/icalendar/src/org/bedework/icalendar/ToXEvent.java
   releases/bedework-3.7/icalendar/src/org/bedework/icalendar/XmlCalendarBuilder.java
Log:
Add property element names to XcalTags. Change value type names.

Modified: releases/bedework-3.7/icalendar/src/org/bedework/icalendar/IcalTranslator.java
===================================================================
--- releases/bedework-3.7/icalendar/src/org/bedework/icalendar/IcalTranslator.java	2011-01-17 22:04:41 UTC (rev 1430)
+++ releases/bedework-3.7/icalendar/src/org/bedework/icalendar/IcalTranslator.java	2011-02-08 03:56:47 UTC (rev 1431)
@@ -282,8 +282,8 @@
 
       xml.openTag(XcalTags.properties);
 
-      xmlProp(xml, Property.PRODID, XcalTags.text, prodId);
-      xmlProp(xml, Property.VERSION, XcalTags.text,
+      xmlProp(xml, Property.PRODID, XcalTags.textVal, prodId);
+      xmlProp(xml, Property.VERSION, XcalTags.textVal,
               Version.VERSION_2_0.getValue());
 
       xml.closeTag(XcalTags.properties);
@@ -413,7 +413,7 @@
 
       PropertyInfoIndex pii = PropertyInfoIndex.lookupPname(val.getName());
 
-      QName ptype = XcalTags.text;
+      QName ptype = XcalTags.textVal;
 
       if (pii != null) {
         DataType dtype = pii.getPtype();
@@ -425,10 +425,10 @@
       if (ptype == null) {
         // Special processing I haven't done
         warn("Unimplemented value type for " + val.getName());
-        ptype = XcalTags.text;
+        ptype = XcalTags.textVal;
       }
 
-      if (ptype.equals(XcalTags.recur)) {
+      if (ptype.equals(XcalTags.recurVal)) {
         // Emit individual parts of recur rule
 
         xml.openTag(ptype);
@@ -532,7 +532,7 @@
     try {
       ParameterInfoIndex pii = ParameterInfoIndex.lookupPname(val.getName());
 
-      QName ptype = XcalTags.text;
+      QName ptype = XcalTags.textVal;
 
       if (pii != null) {
         DataType dtype = pii.getPtype();
@@ -541,7 +541,7 @@
         }
       }
 
-      if (ptype.equals(XcalTags.text)) {
+      if (ptype.equals(XcalTags.textVal)) {
         QName tag = new QName(XcalTags.namespace, val.getName().toLowerCase());
         xml.property(tag, val.getValue());
       } else {

Modified: releases/bedework-3.7/icalendar/src/org/bedework/icalendar/ToXEvent.java
===================================================================
--- releases/bedework-3.7/icalendar/src/org/bedework/icalendar/ToXEvent.java	2011-01-17 22:04:41 UTC (rev 1430)
+++ releases/bedework-3.7/icalendar/src/org/bedework/icalendar/ToXEvent.java	2011-02-08 03:56:47 UTC (rev 1431)
@@ -794,12 +794,13 @@
       return p;
     }
 
-    p.setDate(dt.getDtval());
-
     if (dt.getDateType()) {
+      p.setDate(dt.getDtval());
       return p;
     }
 
+    p.setDateTime(dt.getDtval());
+
     tzidProp(p, dt.getTzid());
 
     return p;

Modified: releases/bedework-3.7/icalendar/src/org/bedework/icalendar/XmlCalendarBuilder.java
===================================================================
--- releases/bedework-3.7/icalendar/src/org/bedework/icalendar/XmlCalendarBuilder.java	2011-01-17 22:04:41 UTC (rev 1430)
+++ releases/bedework-3.7/icalendar/src/org/bedework/icalendar/XmlCalendarBuilder.java	2011-02-08 03:56:47 UTC (rev 1431)
@@ -365,7 +365,7 @@
   private boolean processValue(final Element el,
                                final BuildState bs) throws ParserException {
     try {
-      if (XmlUtil.nodeMatches(el, XcalTags.recur)) {
+      if (XmlUtil.nodeMatches(el, XcalTags.recurVal)) {
         /*
             value-recur = element recur {
               type-freq,
@@ -401,19 +401,19 @@
         return true;
       }
 
-      if (XmlUtil.nodeMatches(el, XcalTags.binary) ||
-          XmlUtil.nodeMatches(el, XcalTags._boolean) ||
-          XmlUtil.nodeMatches(el, XcalTags.calAddress) ||
-          XmlUtil.nodeMatches(el, XcalTags.date) ||
-          XmlUtil.nodeMatches(el, XcalTags.dateTime) ||
-          XmlUtil.nodeMatches(el, XcalTags.duration) ||
-          XmlUtil.nodeMatches(el, XcalTags._float) ||
-          XmlUtil.nodeMatches(el, XcalTags.integer) ||
-          XmlUtil.nodeMatches(el, XcalTags.period) ||
-          XmlUtil.nodeMatches(el, XcalTags.text) ||
-          XmlUtil.nodeMatches(el, XcalTags.time) ||
-          XmlUtil.nodeMatches(el, XcalTags.uri) ||
-          XmlUtil.nodeMatches(el, XcalTags.utcOffset)) {
+      if (XmlUtil.nodeMatches(el, XcalTags.binaryVal) ||
+          XmlUtil.nodeMatches(el, XcalTags.booleanVal) ||
+          XmlUtil.nodeMatches(el, XcalTags.calAddressVal) ||
+          XmlUtil.nodeMatches(el, XcalTags.dateVal) ||
+          XmlUtil.nodeMatches(el, XcalTags.dateTimeVal) ||
+          XmlUtil.nodeMatches(el, XcalTags.durationVal) ||
+          XmlUtil.nodeMatches(el, XcalTags.floatVal) ||
+          XmlUtil.nodeMatches(el, XcalTags.integerVal) ||
+          XmlUtil.nodeMatches(el, XcalTags.periodVal) ||
+          XmlUtil.nodeMatches(el, XcalTags.textVal) ||
+          XmlUtil.nodeMatches(el, XcalTags.timeVal) ||
+          XmlUtil.nodeMatches(el, XcalTags.uriVal) ||
+          XmlUtil.nodeMatches(el, XcalTags.utcOffsetVal)) {
         bs.handler.propertyValue(XmlUtil.getElementContent(el));
         return true;
       }