Caldavsync Sources: comparison src/net/fortuna/ical4j/model/Recur.java

-:2b633facb90b
+:abfd0876272b
 import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.StringTokenizer;
 import net.fortuna.ical4j.model.parameter.Value;
+import net.fortuna.ical4j.util.CompatibilityHints;
 import net.fortuna.ical4j.util.Configurator;
 import net.fortuna.ical4j.util.Dates;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 private NumberList monthList;
 private NumberList setPosList;
 private String weekStartDay;
+private int calendarWeekStartDay;
 private Map experimentalValues = new HashMap();
 // Calendar field we increment based on frequency.
 private int calIncField;
 /**
 * Default constructor.
 */
 public Recur() {
+// default week start is Monday per RFC5545
+calendarWeekStartDay = Calendar.MONDAY;
 }
 /**
 * Constructs a new instance from the specified string value.
 * @param aValue a string representation of a recurrence.
 * @throws ParseException thrown when the specified string contains an invalid representation of an UNTIL date value
 */
 public Recur(final String aValue) throws ParseException {
+// default week start is Monday per RFC5545
+calendarWeekStartDay = Calendar.MONDAY;
 final StringTokenizer t = new StringTokenizer(aValue, ";=");
 while (t.hasMoreTokens()) {
 final String token = t.nextToken();
 if (FREQ.equals(token)) {
 frequency = nextToken(t, token);
 else if (BYSETPOS.equals(token)) {
 setPosList = new NumberList(nextToken(t, token), 1, 366, true);
 }
 else if (WKST.equals(token)) {
 weekStartDay = nextToken(t, token);
-}
+calendarWeekStartDay = WeekDay.getCalendarDay(new WeekDay(weekStartDay));
-// assume experimental value..
+}
 else {
-experimentalValues.put(token, nextToken(t, token));
+	if (CompatibilityHints.isHintEnabled(CompatibilityHints.KEY_RELAXED_PARSING)) {
+	            	// assume experimental value..
+	                experimentalValues.put(token, nextToken(t, token));
+	}
+	else {
+		throw new IllegalArgumentException("Invalid recurrence rule part: " +
+				token + "=" + nextToken(t, token));
+	}
 }
 }
 validateFrequency();
 }
 /**
 * @param frequency a recurrence frequency string
 * @param until maximum recurrence date
 */
 public Recur(final String frequency, final Date until) {
+// default week start is Monday per RFC5545
+calendarWeekStartDay = Calendar.MONDAY;
 this.frequency = frequency;
 this.until = until;
 validateFrequency();
 }
 /**
 * @param frequency a recurrence frequency string
 * @param count maximum recurrence count
 */
 public Recur(final String frequency, final int count) {
+// default week start is Monday per RFC5545
+calendarWeekStartDay = Calendar.MONDAY;
 this.frequency = frequency;
 this.count = count;
 validateFrequency();
 }
 /**
 * @param weekStartDay The weekStartDay to set.
 */
 public final void setWeekStartDay(final String weekStartDay) {
 this.weekStartDay = weekStartDay;
+if (weekStartDay != null) {
+calendarWeekStartDay = WeekDay.getCalendarDay(new WeekDay(weekStartDay));
+}
 }
 /**
 * {@inheritDoc}
 */
 }
 else {
 dates.setTimeZone(((DateTime) seed).getTimeZone());
 }
 }
-final Calendar cal = Dates.getCalendarInstance(seed);
+final Calendar cal = getCalendarInstance(seed, true);
-cal.setTime(seed);
 // optimize the start time for selecting candidates
 // (only applicable where a COUNT is not specified)
 if (getCount() < 1) {
 final Calendar seededCal = (Calendar) cal.clone();
 * @param seed the start date of this Recurrence's first instance
 * @param startDate the date to start the search
 */
 public final Date getNextDate(final Date seed, final Date startDate) {
-final Calendar cal = Dates.getCalendarInstance(seed);
+final Calendar cal = getCalendarInstance(seed, true);
-cal.setTime(seed);
 // optimize the start time for selecting candidates
 // (only applicable where a COUNT is not specified)
 if (getCount() < 1) {
 final Calendar seededCal = (Calendar) cal.clone();
 return dates;
 }
 final DateList monthlyDates = getDateListInstance(dates);
 for (final Iterator i = dates.iterator(); i.hasNext();) {
 final Date date = (Date) i.next();
-final Calendar cal = Dates.getCalendarInstance(date);
+final Calendar cal = getCalendarInstance(date, true);
-cal.setTime(date);
 for (final Iterator j = getMonthList().iterator(); j.hasNext();) {
 final Integer month = (Integer) j.next();
 // Java months are zero-based..
 //                cal.set(Calendar.MONTH, month.intValue() - 1);
 cal.roll(Calendar.MONTH, (month.intValue() - 1) - cal.get(Calendar.MONTH));
 return dates;
 }
 final DateList weekNoDates = getDateListInstance(dates);
 for (final Iterator i = dates.iterator(); i.hasNext();) {
 final Date date = (Date) i.next();
-final Calendar cal = Dates.getCalendarInstance(date);
+final Calendar cal = getCalendarInstance(date, true);
-cal.setTime(date);
 for (final Iterator j = getWeekNoList().iterator(); j.hasNext();) {
 final Integer weekNo = (Integer) j.next();
 cal.set(Calendar.WEEK_OF_YEAR, Dates.getAbsWeekNo(cal.getTime(), weekNo.intValue()));
 weekNoDates.add(Dates.getInstance(cal.getTime(), weekNoDates.getType()));
 }
 return dates;
 }
 final DateList yearDayDates = getDateListInstance(dates);
 for (final Iterator i = dates.iterator(); i.hasNext();) {
 final Date date = (Date) i.next();
-final Calendar cal = Dates.getCalendarInstance(date);
+final Calendar cal = getCalendarInstance(date, true);
-cal.setTime(date);
 for (final Iterator j = getYearDayList().iterator(); j.hasNext();) {
 final Integer yearDay = (Integer) j.next();
 cal.set(Calendar.DAY_OF_YEAR, Dates.getAbsYearDay(cal.getTime(), yearDay.intValue()));
 yearDayDates.add(Dates.getInstance(cal.getTime(), yearDayDates.getType()));
 }
 return dates;
 }
 final DateList monthDayDates = getDateListInstance(dates);
 for (final Iterator i = dates.iterator(); i.hasNext();) {
 final Date date = (Date) i.next();
-final Calendar cal = Dates.getCalendarInstance(date);
+final Calendar cal = getCalendarInstance(date, false);
-cal.setLenient(false);
-cal.setTime(date);
 for (final Iterator j = getMonthDayList().iterator(); j.hasNext();) {
 final Integer monthDay = (Integer) j.next();
 try {
 cal.set(Calendar.DAY_OF_MONTH, Dates.getAbsMonthDay(cal.getTime(), monthDay.intValue()));
 monthDayDates.add(Dates.getInstance(cal.getTime(), monthDayDates.getType()));
 for (final Iterator j = getDayList().iterator(); j.hasNext();) {
 final WeekDay weekDay = (WeekDay) j.next();
 // if BYYEARDAY or BYMONTHDAY is specified filter existing
 // list..
 if (!getYearDayList().isEmpty() || !getMonthDayList().isEmpty()) {
-final Calendar cal = Dates.getCalendarInstance(date);
+final Calendar cal = getCalendarInstance(date, true);
-cal.setTime(date);
 if (weekDay.equals(WeekDay.getWeekDay(cal))) {
 weekDayDates.add(date);
 }
 }
 else {
 * @param date
 * @param weekDay
 * @return
 */
 private List getAbsWeekDays(final Date date, final Value type, final WeekDay weekDay) {
-final Calendar cal = Dates.getCalendarInstance(date);
+final Calendar cal = getCalendarInstance(date, true);
-// default week start is Monday per RFC5545
-int calendarWeekStartDay = Calendar.MONDAY;
-if (weekStartDay != null) {
-	calendarWeekStartDay = WeekDay.getCalendarDay(new WeekDay(weekStartDay));
-}
-cal.setFirstDayOfWeek(calendarWeekStartDay);
-cal.setTime(date);
 final DateList days = new DateList(type);
 if (date instanceof DateTime) {
 if (((DateTime) date).isUtc()) {
 days.setUtc(true);
 }
 return dates;
 }
 final DateList hourlyDates = getDateListInstance(dates);
 for (final Iterator i = dates.iterator(); i.hasNext();) {
 final Date date = (Date) i.next();
-final Calendar cal = Dates.getCalendarInstance(date);
+final Calendar cal = getCalendarInstance(date, true);
-cal.setTime(date);
 for (final Iterator j = getHourList().iterator(); j.hasNext();) {
 final Integer hour = (Integer) j.next();
 cal.set(Calendar.HOUR_OF_DAY, hour.intValue());
 hourlyDates.add(Dates.getInstance(cal.getTime(), hourlyDates.getType()));
 }
 return dates;
 }
 final DateList minutelyDates = getDateListInstance(dates);
 for (final Iterator i = dates.iterator(); i.hasNext();) {
 final Date date = (Date) i.next();
-final Calendar cal = Dates.getCalendarInstance(date);
+final Calendar cal = getCalendarInstance(date, true);
-cal.setTime(date);
 for (final Iterator j = getMinuteList().iterator(); j.hasNext();) {
 final Integer minute = (Integer) j.next();
 cal.set(Calendar.MINUTE, minute.intValue());
 minutelyDates.add(Dates.getInstance(cal.getTime(), minutelyDates.getType()));
 }
 return dates;
 }
 final DateList secondlyDates = getDateListInstance(dates);
 for (final Iterator i = dates.iterator(); i.hasNext();) {
 final Date date = (Date) i.next();
-final Calendar cal = Dates.getCalendarInstance(date);
+final Calendar cal = getCalendarInstance(date, true);
-cal.setTime(date);
 for (final Iterator j = getSecondList().iterator(); j.hasNext();) {
 final Integer second = (Integer) j.next();
 cal.set(Calendar.SECOND, second.intValue());
 secondlyDates.add(Dates.getInstance(cal.getTime(), secondlyDates.getType()));
 }
 this.until = until;
 this.count = -1;
 }
 /**
+* Construct a Calendar object and sets the time.
+* @param date
+* @param lenient
+* @return
+*/
+private Calendar getCalendarInstance(final Date date, final boolean lenient) {
+Calendar cal = Dates.getCalendarInstance(date);
+// A week should have at least 4 days to be considered as such per RFC5545
+cal.setMinimalDaysInFirstWeek(4);
+cal.setFirstDayOfWeek(calendarWeekStartDay);
+cal.setLenient(lenient);
+cal.setTime(date);
+return cal;
+}
+/**
 * @param stream
 * @throws IOException
 * @throws ClassNotFoundException
 */
 private void readObject(final java.io.ObjectInputStream stream) throws IOException, ClassNotFoundException {
 * Instantiate a new datelist with the same type, timezone and utc settings
 *  as the origList.
 * @param origList
 * @return a new empty list.
 */
-private static final DateList getDateListInstance(final DateList origList) {
+private static DateList getDateListInstance(final DateList origList) {
 final DateList list = new DateList(origList.getType());
 if (origList.isUtc()) {
 list.setUtc(true);
 } else {
 list.setTimeZone(origList.getTimeZone());

Caldavsync Sources / file comparison

comparison: src/net/fortuna/ical4j/model/Recur.java

src/net/fortuna/ical4j/model/Recur.java