[Bedework-commit] calendarapi r1467 - in releases/bedework-3.6: calFacade/src/org/bedework/calfacade/exc icalendar/src/org/bedework/icalendar

[svnadmin at bedework.org]

Author: douglm
Date: 2011-03-10 14:59:47 -0500 (Thu, 10 Mar 2011)
New Revision: 1467

Modified:
   releases/bedework-3.6/calFacade/src/org/bedework/calfacade/exc/ValidationError.java
   releases/bedework-3.6/icalendar/src/org/bedework/icalendar/VEventUtil.java
Log:
Validate the URI property on input.

On conversion to icalendar ignore bad uris

Modified: releases/bedework-3.6/calFacade/src/org/bedework/calfacade/exc/ValidationError.java
===================================================================
--- releases/bedework-3.6/calFacade/src/org/bedework/calfacade/exc/ValidationError.java	2011-03-10 19:59:41 UTC (rev 1466)
+++ releases/bedework-3.6/calFacade/src/org/bedework/calfacade/exc/ValidationError.java	2011-03-10 19:59:47 UTC (rev 1467)
@@ -135,6 +135,9 @@
   /** Error: Invalid transparency. */
   public static final String invalidTransparency = prefix + "invalid.transparency";
 
+  /** Error: Invalid URI. */
+  public static final String invalidUri = prefix + "invalid.uri";
+
   /** Error: Invalid user. */
   public static final String invalidUser = prefix + "invalid.user";
 
@@ -242,7 +245,7 @@
   /**
    * @param errorCode
    */
-  public ValidationError(String errorCode) {
+  public ValidationError(final String errorCode) {
     this(errorCode, null);
   }
 
@@ -250,7 +253,7 @@
    * @param errorCode
    * @param extra
    */
-  public ValidationError(String errorCode, String extra) {
+  public ValidationError(final String errorCode, final String extra) {
     this.errorCode = errorCode;
     this.extra = extra;
   }
@@ -258,7 +261,7 @@
   /**
    * @param val
    */
-  public void setErrorCode(String val) {
+  public void setErrorCode(final String val) {
     errorCode = val;
   }
 
@@ -272,7 +275,7 @@
   /**
    * @param val
    */
-  public void setExtra(String val) {
+  public void setExtra(final String val) {
     extra = val;
   }
 

Modified: releases/bedework-3.6/icalendar/src/org/bedework/icalendar/VEventUtil.java
===================================================================
--- releases/bedework-3.6/icalendar/src/org/bedework/icalendar/VEventUtil.java	2011-03-10 19:59:41 UTC (rev 1466)
+++ releases/bedework-3.6/icalendar/src/org/bedework/icalendar/VEventUtil.java	2011-03-10 19:59:47 UTC (rev 1467)
@@ -42,6 +42,7 @@
 import org.bedework.calfacade.exc.CalFacadeException;
 
 import edu.rpi.cmt.calendar.IcalDefs;
+import edu.rpi.sss.util.Util;
 
 import net.fortuna.ical4j.model.CategoryList;
 import net.fortuna.ical4j.model.Date;
@@ -476,7 +477,10 @@
       }
 
       if ((strval != null) && (strval.length() > 0)) {
-        pl.add(new Url(new URI(strval)));
+        URI uri = Util.validURI(strval);
+        if (uri != null) {
+          pl.add(new Url(uri));
+        }
       }
 
       /* ------------------- X-PROPS -------------------- */