diff options
author | Abyss777 <abyss@fox5.ru> | 2016-12-15 09:45:29 +0500 |
---|---|---|
committer | Abyss777 <abyss@fox5.ru> | 2016-12-15 09:45:29 +0500 |
commit | ef9148eea8dd404aba5707898f244a4b7bc26feb (patch) | |
tree | 6c6af03e3ea06609e15fbfbbe651209a33b620a8 /src | |
parent | fff8f0c792606daff151624479d9ae9dc54187d5 (diff) | |
download | traccar-server-ef9148eea8dd404aba5707898f244a4b7bc26feb.tar.gz traccar-server-ef9148eea8dd404aba5707898f244a4b7bc26feb.tar.bz2 traccar-server-ef9148eea8dd404aba5707898f244a4b7bc26feb.zip |
- Set period duration to 0
- Remove setter
- Added test cases
- Style fix
Diffstat (limited to 'src')
-rw-r--r-- | src/org/traccar/model/Calendar.java | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/org/traccar/model/Calendar.java b/src/org/traccar/model/Calendar.java index e1ae5a93d..19b5fde16 100644 --- a/src/org/traccar/model/Calendar.java +++ b/src/org/traccar/model/Calendar.java @@ -55,7 +55,9 @@ public class Calendar extends Extensible { } public void setCalendarData(byte[] calendarData) throws IOException, ParserException, SQLException { - setCalendar(calendarData); + CalendarBuilder builder = new CalendarBuilder(); + calendar = builder.build(new ByteArrayInputStream(calendarData)); + this.calendarData = calendarData.clone(); } private net.fortuna.ical4j.model.Calendar calendar; @@ -65,15 +67,9 @@ public class Calendar extends Extensible { return calendar; } - public void setCalendar(byte[] calendarData) throws IOException, ParserException, SQLException { - CalendarBuilder builder = new CalendarBuilder(); - calendar = builder.build(new ByteArrayInputStream(calendarData)); - this.calendarData = calendarData.clone(); - } - public boolean checkMoment(Date date) { if (calendar != null) { - Period period = new Period(new DateTime(date), new Dur(0, 0, 0, 1)); + Period period = new Period(new DateTime(date), new Dur(0, 0, 0, 0)); Rule<Component> periodRule = new PeriodRule<Component>(period); Filter<CalendarComponent> filter = new Filter<CalendarComponent>(new Rule[] {periodRule}, Filter.MATCH_ANY); Collection<CalendarComponent> events = filter.filter(calendar.getComponents(Component.VEVENT)); |