Changeset 372

Timestamp:

04/13/06 14:01:01

Author:

douglm

Message:

Fix bug which broke public calendars client
More freebusy

Files:

• trunk/calendar3/appcommon/src/org/bedework/appcommon/EventFormatter.java (modified) (4 diffs)
• trunk/calendar3/appcommon/src/org/bedework/appcommon/TimeView.java (modified) (2 diffs)
• trunk/calendar3/calFacade/src/org/bedework/calfacade/svc/BwPreferences.java (modified) (3 diffs)
• trunk/calendar3/calsvc/src/org/bedework/calsvc/CalSvc.java (modified) (1 diff)

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

@@ -81 +81 @@
-
-  private CalTimezones ctz;
-
-
+
+//
-
-  /** The view currently in place.
@@ -98 +98 @@
-
-  private String xmlAccess;
-
+
-  /** Constructor
-   *
@@ -111 +111 @@
-    this.calInfo = calInfo;
-    this.ctz= ctz;
-
+//
-  }
-
@@ -206 +206 @@
-    return end;
-  }
-
+
-  public String getXmlAccess() {
-    try {

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

@@ -100 +100 @@
-  protected boolean showData;
-
-at initialisation
+when required
-   */
-  protected Collection events;
@@ -148 +148 @@
-    this.showData = showData;
-    this.debug = debug;
-
-    /*
-    events = cal.getEvents(null, null, CalFacadeUtil.getDateTime(firstDay.getDateDigits()),
-                      CalFacadeUtil.getDateTime(lastDay.getDateDigits()));
-                      */
-  }
-

trunk/calendar3/calFacade/src/org/bedework/calfacade/svc/BwPreferences.java

@@ -88 +88 @@
-   */
-  private String preferredEndType;
-
+
-  /** Value identifying an extra simple user mode - we just do stuff without
-   * asking
-   */
-  public static final int extraSimpleMode = 0;
-
+
-  /** Value identifying a simple user mode - we hide some stuff but make
-   * fewer assumptions
-   */
-  public static final int simpleMode = 1;
-
+
-  /** Value identifying an advanced user mode - reveal it in all its glory
-   */
@@ -104 +104 @@
-
-  private int userMode;
-
+
-  /** Constructor
-   *
@@ -343 +343 @@
-    return getViews().iterator();
-  }
+
+  /** Turn a String time value e.g. 1030 into a numeric minutes value and set
+   * the numeric value in the prefeences.
+   *
+   * <p>Ignores anything after the first four characters which must all be digits.
+   *
+   * @param val  String time value
+   */
+  public void setWorkdayStart(String val) throws CalFacadeException{
+    boolean badval = false;
+    int minutes = 0;
+
+    try {
+      int hours = Integer.parseInt(val.substring(0, 2));
+      minutes = Integer.parseInt(val.substring(2, 4));
+      if ((hours < 0) || (hours > 24)) {
+        badval = true;
+      } else if ((minutes < 0) || (minutes > 59)) {
+        badval = true;
+      } else {
+        minutes *= (hours * 60);
+      }
+    } catch (Throwable t) {
+      badval = true;
+    }
+
+    if (badval) {
+      throw new CalFacadeException("org.bedework.prefs.badvalue", val);
+    }
+
+    setWorkdayStart(minutes);
+  }
+
+  /**
+   * @return int work day start
+   * /
+  public int getWorkdayStart() {
+    return workdayStart;
+  }*/
-
-  /* ====================================================================

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

@@ -2073 +2073 @@
-     * This way we get too many.
-     */
-
+Guest() && !is
-      deleted = getCal().getDeletedProxies();
-    }