From 6ebdf92f83cec53fb68f710bfe5138ae4f1d04b6 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sat, 2 Sep 2017 09:38:26 +1200 Subject: Update Java libraries --- src/org/traccar/model/Calendar.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/org') diff --git a/src/org/traccar/model/Calendar.java b/src/org/traccar/model/Calendar.java index 3d855b1be..56d3eb74c 100644 --- a/src/org/traccar/model/Calendar.java +++ b/src/org/traccar/model/Calendar.java @@ -27,11 +27,11 @@ import net.fortuna.ical4j.data.CalendarBuilder; import net.fortuna.ical4j.data.ParserException; import net.fortuna.ical4j.filter.Filter; import net.fortuna.ical4j.filter.PeriodRule; -import net.fortuna.ical4j.filter.Rule; import net.fortuna.ical4j.model.DateTime; import net.fortuna.ical4j.model.Dur; import net.fortuna.ical4j.model.Period; import net.fortuna.ical4j.model.component.CalendarComponent; +import org.apache.commons.collections4.Predicate; import org.traccar.database.QueryIgnore; public class Calendar extends ExtendedModel { @@ -69,8 +69,8 @@ public class Calendar extends ExtendedModel { public boolean checkMoment(Date date) { if (calendar != null) { Period period = new Period(new DateTime(date), new Dur(0, 0, 0, 0)); - Rule periodRule = new PeriodRule<>(period); - Filter filter = new Filter<>(new Rule[] {periodRule}, Filter.MATCH_ANY); + Predicate periodRule = new PeriodRule<>(period); + Filter filter = new Filter<>(new Predicate[] {periodRule}, Filter.MATCH_ANY); Collection events = filter.filter(calendar.getComponents(CalendarComponent.VEVENT)); if (events != null && !events.isEmpty()) { return true; -- cgit v1.2.3