Changeset 1277

Timestamp:

02/04/07 22:10:52

Author:

douglm

Message:

Changes to fix timezone problems and also allow limiting recurrences.

Files:

• releases/external/ical4j-1.0-beta1-bedework-3.3/net/fortuna/ical4j/model/Recur.java (modified) (7 diffs)
• releases/external/ical4j-1.0-beta1-bedework-3.3/net/fortuna/ical4j/model/component/Observance.java (modified) (3 diffs)

releases/external/ical4j-1.0-beta1-bedework-3.3/net/fortuna/ical4j/model/Recur.java

@@ -134 +134 @@
-    private Map experimentalValues = new HashMap();
-
+    // Calendar field we increment based on frequency.
+    private int calIncField;
+
-    /**
-     * Constructs a new instance from the specified string value.
@@ -464 +467 @@
-    public final DateList getDates(final Date periodStart,
-            final Date periodEnd, final Value value) {
-
+, -1
-    }
-
@@ -475 +478 @@
-    public final DateList getDates(final Date seed, final Period period,
-            final Value value) {
-
+, -1
-    }
-
@@ -492 +495 @@
-    public final DateList getDates(final Date seed, final Date periodStart,
-            final Date periodEnd, final Value value) {
+         return getDates(seed, periodStart, periodEnd, value, -1);
+    }
+
+    /**
+     * Returns a list of start dates in the specified period represented by this recur. This method includes a base date
+     * argument, which indicates the start of the fist occurrence of this recurrence. The base date is used to inject
+     * default values to return a set of dates in the correct format. For example, if the search start date (start) is
+     * Wed, Mar 23, 12:19PM, but the recurrence is Mon - Fri, 9:00AM - 5:00PM, the start dates returned should all be at
+     * 9:00AM, and not 12:19PM.
+     * @return a list of dates represented by this recur instance
+     * @param seed the start date of this Recurrence's first instance
+     * @param periodStart the start of the period
+     * @param periodEnd the end of the period
+     * @param value the type of dates to generate (i.e. date/date-time)
+     * @param maxCount limits the number of instances returned. Up to one years
+     *       worth extra may be returned. Less than 0 means no limit
+     */
+    public final DateList getDates(final Date seed, final Date periodStart,
+                                   final Date periodEnd, final Value value,
+                                   final int maxCount) {
-
-        DateList dates = new DateList(value);
@@ -517 +540 @@
-        int invalidCandidateCount = 0;
-        Date candidate = null;
-true
+(maxCount < 0) || (dates.size() < maxCount)
-            Date candidateSeed = Dates.getInstance(cal.getTime(), value);
-
@@ -581 +604 @@
-        // initialise interval..
-        int calInterval = (getInterval() >= 1) ? getInterval() : 1;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    }
-
@@ -1017 +1020 @@
-                    "A recurrence rule MUST contain a FREQ rule part.");
-        }
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            throw new IllegalArgumentException("Invalid FREQ rule part '"
-                    + frequency + "' in recurrence rule");

releases/external/ical4j-1.0-beta1-bedework-3.3/net/fortuna/ical4j/model/component/Observance.java

@@ -79 +79 @@
-    private Map onsets = new TreeMap();
-
+    /* If this is set we have rrules. If we get a date after this rebuild onsets */
+    private Date onsetLimit;
+
-    private boolean rdatesCached = false;
-
@@ -146 +149 @@
-
-        long start = System.currentTimeMillis();
+
+        if ((onsetLimit != null) && (date.after(onsetLimit))) {
+            onsets.clear();
+            rdatesCached = false;
+        }
-
-        Date onset = getCachedOnset(date);
@@ -195 +203 @@
-                Calendar cal = Dates.getCalendarInstance(date);
-                cal.setTime(date);
-
-Date endRecur
+0
+onsetLimit
-                DateList recurrenceDates = rrule.getRecur().getDates(onset,
-endRecur
+ onsetLimit
-                for (Iterator j = recurrenceDates.iterator(); j.hasNext();) {
-                    Date rruleOnset = (Date) j.next();