[Bedework-commit] r459 - in trunk/calendar3: calFacade/src/org/bedework/calfacade webcommon/src/org/bedework/webcommon webcommon/src/org/bedework/webcommon/pref

[svnadmin at bedework.org]

Author: douglm
Date: 2006-05-05 15:00:36 -0400 (Fri, 05 May 2006)
New Revision: 459

Modified:
   trunk/calendar3/calFacade/src/org/bedework/calfacade/CalFacadeUtil.java
   trunk/calendar3/webcommon/src/org/bedework/webcommon/BwAbstractAction.java
   trunk/calendar3/webcommon/src/org/bedework/webcommon/pref/UpdatePrefsAction.java
Log:
Set the transparency for incoming event refs. (Needs update to stylesheet)

Modified: trunk/calendar3/calFacade/src/org/bedework/calfacade/CalFacadeUtil.java
===================================================================
--- trunk/calendar3/calFacade/src/org/bedework/calfacade/CalFacadeUtil.java	2006-05-05 15:50:17 UTC (rev 458)
+++ trunk/calendar3/calFacade/src/org/bedework/calfacade/CalFacadeUtil.java	2006-05-05 19:00:36 UTC (rev 459)
@@ -89,6 +89,26 @@
   private CalFacadeUtil() {
   }
 
+  /** Check for a valid transparency - null is invalid
+   *
+   * @param val
+   * @return boolean true = it's OK
+   */
+  public static boolean validTransparency(String val) {
+    if (val == null) {
+      /* We could argue that's valid as the default but I think that leads to
+       * problems.
+       */
+      return false;
+    }
+
+    if (BwEvent.transparencyOpaque.equals(val)) {
+      return true;
+    }
+
+    return BwEvent.transparencyTransparent.equals(val);
+  }
+
   /** Update the to Collection with from elements. This is used to
    * add or remove members from a Collection managed by hibernate for example
    * where a replacement of the Collection is not allowed.

Modified: trunk/calendar3/webcommon/src/org/bedework/webcommon/BwAbstractAction.java
===================================================================
--- trunk/calendar3/webcommon/src/org/bedework/webcommon/BwAbstractAction.java	2006-05-05 15:50:17 UTC (rev 458)
+++ trunk/calendar3/webcommon/src/org/bedework/webcommon/BwAbstractAction.java	2006-05-05 19:00:36 UTC (rev 459)
@@ -67,6 +67,7 @@
 import org.bedework.calfacade.CalFacadeAccessException;
 import org.bedework.calfacade.CalFacadeDefs;
 import org.bedework.calfacade.CalFacadeException;
+import org.bedework.calfacade.CalFacadeUtil;
 import org.bedework.calfacade.ifs.Groups;
 import org.bedework.calfacade.svc.BwAdminGroup;
 import org.bedework.calfacade.svc.BwAuthUser;
@@ -648,6 +649,17 @@
     }
     proxy.setOwner(svci.getUser());
 
+    String transparency = getReqPar(request, "transparency");
+    if (transparency != null) {
+      if (!CalFacadeUtil.validTransparency(transparency)) {
+        form.getErr().emit("org.bedework.client.error.badvalue",
+                           "transparency");
+        return "badValue";
+      }
+
+      proxy.setTransparency(transparency);
+    }
+
     try {
       svci.addEvent(cal, proxy, null);
       form.getMsg().emit("org.bedework.client.message.added.eventrefs", 1);

Modified: trunk/calendar3/webcommon/src/org/bedework/webcommon/pref/UpdatePrefsAction.java
===================================================================
--- trunk/calendar3/webcommon/src/org/bedework/webcommon/pref/UpdatePrefsAction.java	2006-05-05 15:50:17 UTC (rev 458)
+++ trunk/calendar3/webcommon/src/org/bedework/webcommon/pref/UpdatePrefsAction.java	2006-05-05 19:00:36 UTC (rev 459)
@@ -209,8 +209,6 @@
       return "badPref";
     }
 
-    /*     <li>"preferredEndType" For adding events:
-    */
     str = getReqPar(request, "preferredEndType");
     if (str != null) {
       if ("duration".equals(str) || "date".equals(str)) {