Changeset 187

Timestamp:

02/22/06 23:26:00

Author:

douglm

Message:

Zero duration for dates now disallowed.

New error property org.bedework.validation.error.invalid.duration

Files:

• trunk/calendar3/calFacade/src/org/bedework/calfacade/BwDuration.java (modified) (1 diff)
• trunk/calendar3/webcommon/src/org/bedework/webcommon/EventDates.java (modified) (2 diffs)

trunk/calendar3/calFacade/src/org/bedework/calfacade/BwDuration.java

@@ -244 +244 @@
-    return new Duration(d);
-  }
+  
+  public boolean isZero() {
+    if (getWeeks() != 0) {
+      return false;
+    }
+    
+    return ((getDays() == 0) && 
+            (getHours() == 0) &&
+            (getMinutes() == 0) &&
+            (getSeconds() == 0));
+  }
-
-  /* ====================================================================

trunk/calendar3/webcommon/src/org/bedework/webcommon/EventDates.java

@@ -168 +168 @@
-      BwDateTime end = getEndDate().getDateTime();
-      end.setDateType(val.getDtstart().getDateType());
-
+
-      if ((getEndType() == null) ||
-          (getEndType().length() != 1)) {
@@ -175 +175 @@
-      }
-      val.setEndType(getEndType().charAt(0));
+
+      if (val.getDtstart().getDateType() &&
+          (val.getEndType() == BwEvent.endTypeDuration)) {
+        getDuration().setHours(0);
+        getDuration().setMinutes(0);
+        getDuration().setSeconds(0);
+        
+        if (getDuration().isZero()) {
+          err.emit("org.bedework.validation.error.invalid.duration");
+          return false;
+        }
+      }
-
-      if (val.getEndType() == BwEvent.endTypeDate) {