Changeset 439

Timestamp:

05/02/06 15:21:35

Author:

douglm

Message:

Remove unused property and method

Files:

• trunk/calendar3/calsvc/src/org/bedework/calsvc/CalSvc.java (modified) (1 diff)
• trunk/calendar3/calsvci/src/org/bedework/calsvci/CalSvcI.java (modified) (2 diffs)
• trunk/calendar3/webclient/src/org/bedework/webclient/BwActionForm.java (modified) (2 diffs)

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

@@ -997 +997 @@
-  }
-
-  public boolean getSubscribed(BwCalendar val) throws CalFacadeException {
-    BwSubscription sub = BwSubscription.makeSubscription(val, null, false, false, false);
-    setupOwnedEntity(sub);
-
-    return getPreferences().getSubscriptions().contains(sub);
-  }
-
-  public Collection getSubscriptions() throws CalFacadeException {
-    Collection c = getPreferences().getSubscriptions();

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

@@ -545 +545 @@
-   * of a calendar.
-   *
+   * @deprecated
-   * @param  val     int id of calendar
-   * @return CalendarVO null for unknown calendar
@@ -769 +770 @@
-   */
-  public abstract void updateSubscription(BwSubscription val) throws CalFacadeException;
-
-  /** Return true if the user is subscribed to the given calendar
-   *
-   * @param val        BwCalendar object
-   * @return boolean   true is user is subscribed to indicated calendar
-   * @throws CalFacadeException
-   */
-  public abstract boolean getSubscribed(BwCalendar val) throws CalFacadeException;
-
-  /** Get this users subscription.

trunk/calendar3/webclient/src/org/bedework/webclient/BwActionForm.java

@@ -63 +63 @@
-import org.bedework.appcommon.EventFormatter;
-import org.bedework.appcommon.MyCalendarVO;
-import org.bedework.calfacade.BwCalendar;
-import org.bedework.webcommon.DurationBean;
-import org.bedework.webcommon.BwActionFormBase;
@@ -187 +186 @@
-
-  /* ====================================================================
-   *                   Subscriptions
-   * ==================================================================== */
-
-  /** Allows us to generate checkboxes showing subscribed status
-   *
-   * @param  i         int key of calendar
-   * @return boolean   true is user is subscribed to indicated calendar
-   */
-  public boolean getSubscribed(int i) {
-    try {
-      BwCalendar cal = fetchSvci().getCalendar(i);
-
-      if (cal == null) {
-        return false;
-      }
-      return fetchSvci().getSubscribed(cal);
-    } catch (Throwable t) {
-      err.emit(t);
-      return false;
-    }
-  }
-
-  /* ====================================================================
-   *                   Events
-   * ==================================================================== */