Changeset 111

Timestamp:

02/07/06 14:47:59

Author:

douglm

Message:

Delete a couple of actions and add action to select view type.
Changes to CalSvc? to support currentView and currentSubscriptions
select calendar actions seesm to work now.

Files:

• trunk/calendar3/appcommon/src/org/bedework/appcommon/BedeworkDefs.java (modified) (2 diffs)
• trunk/calendar3/calFacade/src/org/bedework/calfacade/BwCalendar.java (modified) (2 diffs)
• trunk/calendar3/calsvc/src/org/bedework/calsvc/CalSvc.java (modified) (6 diffs)
• trunk/calendar3/calsvci/src/org/bedework/calsvci/CalSvcI.java (modified) (3 diffs)
• trunk/calendar3/webclient/src/org/bedework/webclient/BwCalendarAction.java (deleted)
• trunk/calendar3/webclient/src/org/bedework/webclient/BwSelectViewAction.java (deleted)
• trunk/calendar3/webclient/war/WEB-INF/struts-config.xml (modified) (1 diff)
• trunk/calendar3/webclient/war/docs/emitCalendar.jsp (modified) (1 diff)
• trunk/calendar3/webcommon/src/org/bedework/webcommon/BwAbstractAction.java (modified) (1 diff)
• trunk/calendar3/webcommon/src/org/bedework/webcommon/BwActionFormBase.java (modified) (8 diffs)
• trunk/calendar3/webcommon/src/org/bedework/webcommon/misc/SetSelectionAction.java (added)

trunk/calendar3/appcommon/src/org/bedework/appcommon/BedeworkDefs.java

@@ -64 +64 @@
-  /** These names are internal
-   */
-Type
+Period
-    {"todayView", "dayView", "weekView", "monthView", "yearView"};
-
@@ -82 +82 @@
-  public static final int yearView = 4;
-
-
+XXX - take out of syspars. 
-   */
-  public static final int defaultView = weekView;
+
+  /* Selection type constants */
+
+  /** Display using a view */
+  public static final String selectionTypeView = "view";
+
+  /** Display using a subscription */
+  public static final String selectionTypeSubscription = "subscription";
+
+  /** Display using a calendar */
+  public static final String selectionTypeCalendar = "calendar";
+
+  /** Display using a search */
+  public static final String selectionTypeSearch = "search";
+
+  /** Display using a 'filter' */
+  public static final String selectionTypeFiltered = "filtered";
-}
-

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

@@ -56 +56 @@
-import org.bedework.calfacade.base.BwShareableContainedDbentity;
-
+import java.net.URLEncoder;
-import java.util.Collection;
-import java.util.Iterator;
@@ -325 +326 @@
-  }
-
+  /** Generate an encoded url referring to this calendar.
+   *
+   * XXX This should not be here
+   * @return String encoded url (or path)
+   * @throws CalFacadeException
+   */
+  public String getEncodedPath() throws CalFacadeException {
+    try {
+      return URLEncoder.encode(getPath(), "UTF-8");
+    } catch (Throwable t) {
+      throw new CalFacadeException(t);
+    }
+  }
+
-  /** Create a copy of this object but do not clone the children
-   *

trunk/calendar3/calsvc/src/org/bedework/calsvc/CalSvc.java

@@ -137 +137 @@
-  private BwView currentView;
-
+  private Collection currentSubscriptions;
+
-  /** Used to see if applications need to force a refresh
-   */
@@ -623 +625 @@
-    }
-
+    if ((path.length() > 1) &&
+        (path.startsWith(CalFacadeDefs.bwUriPrefix))) {
+      path = path.substring(CalFacadeDefs.bwUriPrefix.length());
+    }
+
-    if ((path.length() > 1) && path.endsWith("/")) {
-      return getCal().getCalendar(path.substring(0, path.length() - 1));
@@ -723 +730 @@
-  }
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-  public boolean setCurrentView(String val) throws CalFacadeException {
@@ -739 +812 @@
-      if (val.equals(view.getName())) {
-        currentView = view;
+        currentSubscriptions = null;
-
-        if (debug) {
@@ -752 +826 @@
-  }
-
-  public BwView findView(String val) throws CalFacadeException {
-    if (val == null) {
-      BwPreferences prefs = getPreferences();
-
-      val = prefs.getPreferredView();
-      if (val == null) {
-        return null;
-      }
-    }
-
-    Collection views = getViews();
-    Iterator it = views.iterator();
-    while (it.hasNext()) {
-      BwView view = (BwView)it.next();
-
-      if (view.getName().equals(val)) {
-        return view;
-      }
-    }
-
-    return null;
-  }
-
-  public boolean addViewSubscription(String name,
-                                     BwSubscription sub) throws CalFacadeException {
-
-    BwPreferences prefs = getPreferences();
-    checkOwnerOrSuper(prefs);
-
-    BwView view = findView(name);
-
-    if (view == null) {
-      return false;
-    }
-
-    view.addSubscription(sub);
-
-    dbi.updatePreferences(prefs);
-
-    return true;
-  }
-
-  public boolean removeViewSubscription(String name,
-                                        BwSubscription sub) throws CalFacadeException {
-
-    BwPreferences prefs = getPreferences();
-    checkOwnerOrSuper(prefs);
-
-    BwView view = findView(name);
-
-    if (view == null) {
-      return false;
-    }
-
-    view.removeSubscription(sub);
-
-    dbi.updatePreferences(prefs);
-
-    return true;
-  }
-
-  public BwView getCurrentView() throws CalFacadeException {
-    return currentView;
-  }
-
-
-
+
+
+
+
+
+
+
+
+
-  }
-
@@ -1393 +1413 @@
-      it = currentView.iterateSubscriptions();
-    } else {
-
+
+
+
+
+
+
-      if (subs == null) {
-        sub = new BwSubscription();

trunk/calendar3/calsvci/src/org/bedework/calsvci/CalSvcI.java

@@ -589 +589 @@
-  public abstract boolean removeView(BwView val) throws CalFacadeException;
-
-  /** Set the view we are interested in. null means reset to default.
-   *
-   * @param  val     BwView - null for default
-   * @throws CalFacadeException
-   */
-  public abstract void setCurrentView(BwView val) throws CalFacadeException;
-
-  /** Set the view to the given named view. null means reset to default.
-   *
-   * @param  val     String view name - null for default
-   * @return boolean false - view not found.
-   * @throws CalFacadeException
-   */
-  public abstract boolean setCurrentView(String val) throws CalFacadeException;
-
-  /** Find the named view.
-   *
@@ -632 +617 @@
-                                                 BwSubscription sub) throws CalFacadeException;
-
+  /** Return the collection of views - named collections of subscriptions
+   *
+   * @return collection of views
+   * @throws CalFacadeException
+   */
+  public abstract Collection getViews() throws CalFacadeException;
+
+  /* ====================================================================
+   *                   Current selection
+   * This defines how we select events to display.
+   * ==================================================================== */
+
+  /** Set the view to the given named view. Null means reset to default.
+   * Unset current subscriptions.
+   *
+   * @param  val     String view name - null for default
+   * @return boolean false - view not found.
+   * @throws CalFacadeException
+   */
+  public abstract boolean setCurrentView(String val) throws CalFacadeException;
+
-  /** Get the current view we have set
-   *
@@ -639 +645 @@
-  public abstract BwView getCurrentView() throws CalFacadeException;
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-  /* ====================================================================

trunk/calendar3/webclient/war/WEB-INF/struts-config.xml

@@ -196 +196 @@
-
-    <action    path="/setSelection"
-lient.BwSelectView
-
-
-
-ViewDef
+ommon.misc.SetSelection
+
+
+
+tFound
-    </action>
-

trunk/calendar3/webclient/war/docs/emitCalendar.jsp

@@ -10 +10 @@
-  <calendarCollection><bean:write name="calendar" property="calendarCollection" /></calendarCollection>
-  <mailListId><bean:write name="calendar" property="mailListId" /></mailListId>
+  <url><bean:write name="calendar" property="encodedPath" /></url>
-
-  <logic:iterate name="calendar" property="children" id="cal">

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

@@ -328 +328 @@
-  }
-
+  protected BwCalendar findCalendar(String url,
+                             BwActionFormBase form) throws CalFacadeException {
+    if (url == null) {
+      return null;
+    }
+
+    CalSvcI svci = form.fetchSvci();
+
+    return svci.getCalendar(url);
+  }
+
-  /** Return null if group is chosen else return a forward name.
-   *

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

@@ -98 +98 @@
- * @author  Mike Douglass     douglm@rpi.edu
- */
-
+implements BedeworkDefs 
-  /** This object will be set up appropriately for the kind of client,
-   * e.g. admin, guest etc.
@@ -284 +284 @@
-
-  /* ....................................................................
+   *                       Selection type
+   * .................................................................... */
+
+  // ENUM
+  private String selectionType = selectionTypeView;
+
+  /* ....................................................................
-   *                       View period
-   * .................................................................... */
@@ -290 +297 @@
-
-  static {
-Type
-Type
+Period
+Period
-    }
-  }
@@ -908 +915 @@
-   */
-  public String[] getViewTypeNames() {
-Type
+Period
-  }
-
@@ -916 +923 @@
-   */
-  public String getViewTypeName(int i) {
-Type
+Period
-  }
-
@@ -990 +997 @@
-    }
-
-Type
+Period
-  }
-
@@ -1062 +1069 @@
-        curViewPeriod = -1;
-
-Type
-Type
+Period
+Period
-            curViewPeriod = i;
-            break;
@@ -1194 +1201 @@
-  }
-
+  /* ....................................................................
+   *                       Selection type
+   * .................................................................... */
+
+  /**
+   * @param val
+   */
+  public void setSelectionType(String val) {
+    selectionType = val;
+  }
+
+  /**
+   * @return String
+   */
+  public String getSelectionType() {
+    return selectionType;
+  }
+
-  /* ====================================================================
-   *                   Views