[Bedework-commit] r606 - branches/REL-3.1rc3/calendar3/appcommon/src/org/bedework/appcommon

[svnadmin at bedework.org]

Author: johnsa
Date: 2006-06-19 12:08:50 -0400 (Mon, 19 Jun 2006)
New Revision: 606

Modified:
   branches/REL-3.1rc3/calendar3/appcommon/src/org/bedework/appcommon/CheckData.java
Log:
fixing transparency and status validation

Modified: branches/REL-3.1rc3/calendar3/appcommon/src/org/bedework/appcommon/CheckData.java
===================================================================
--- branches/REL-3.1rc3/calendar3/appcommon/src/org/bedework/appcommon/CheckData.java	2006-06-19 15:57:02 UTC (rev 605)
+++ branches/REL-3.1rc3/calendar3/appcommon/src/org/bedework/appcommon/CheckData.java	2006-06-19 16:08:50 UTC (rev 606)
@@ -138,8 +138,9 @@
    * @return boolean true for ok
    */
   public static boolean checkTransparency(String val) {
-    return  BwEvent.transparencyOpaque.equals(val) ||
-            BwEvent.transparencyTransparent.equals(val);
+    return (val == null) ||  // Defaulted
+           BwEvent.transparencyOpaque.equals(val) ||
+           BwEvent.transparencyTransparent.equals(val);
   }
 
   /** Check for valid status setting
@@ -148,8 +149,9 @@
    * @return boolean true for ok
    */
   public static boolean checkStatus(String val) {
-    return  BwEvent.statusConfirmed.equals(val) ||
-            BwEvent.statusTentative.equals(val) ||
-            BwEvent.statusCancelled.equals(val);
+    return (val == null) ||  // Defaulted
+           BwEvent.statusConfirmed.equals(val) ||
+           BwEvent.statusTentative.equals(val) ||
+           BwEvent.statusCancelled.equals(val);
   }
 }