Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace Joda-Time with java.time in CalendarFXView #49

Merged
merged 2 commits into from
Jul 19, 2019
Merged

Replace Joda-Time with java.time in CalendarFXView #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ffbafb7
Replace Joda-Time with java.time in CalendarFXView
mkroening Jul 19, 2019
7e26a90
Merge branch 'master-11' into java-time
dlemmermann Jul 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CalendarFXView/src/main/java/com/calendarfx/model/Calendar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ private Map<LocalDate, List<Entry<?>>> doGetEntries(LocalDate startDate, LocalDa
* with the given day. We have to find a solution for
* this.
*/
// iterator.advanceTo(org.joda.time.LocalDate.fromDateFields(Date.from(st.toInstant())));
// iterator.advanceTo(st.toLocalDate());

while (iterator.hasNext()) {
LocalDate repeatingDate = iterator.next();
Expand Down
2 changes: 1 addition & 1 deletion CalendarFXView/src/main/java/com/calendarfx/model/Entry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1520,7 +1520,7 @@ private boolean isRecurrenceShowing(Entry<?> entry, ZonedDateTime st, ZonedDateT
* with the given day. We have to find a solution for
* this.
*/
// iterator.advanceTo(org.joda.time.LocalDate.fromDateFields(Date.from(st.toInstant())));
// iterator.advanceTo(st.toLocalDate());

while (iterator.hasNext()) {
LocalDate repeatingDate = iterator.next();
Expand Down
8 changes: 4 additions & 4 deletions CalendarFXView/src/main/java/impl/com/calendarfx/view/RecurrenceViewSkin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
import com.calendarfx.util.Util;
import com.calendarfx.view.Messages;
import com.calendarfx.view.RecurrenceView;
import com.google.ical.compat.jodatime.LocalDateIterator;
import com.google.ical.compat.jodatime.LocalDateIteratorFactory;
import com.google.ical.compat.javatime.LocalDateIterator;
import com.google.ical.compat.javatime.LocalDateIteratorFactory;
import com.google.ical.values.DateValue;
import com.google.ical.values.DateValueImpl;
import com.google.ical.values.RRule;
Expand Down Expand Up @@ -513,11 +513,11 @@ private void updateRule() {
try {
LocalDateIterator iterator = LocalDateIteratorFactory
.createLocalDateIterator(rule.toIcal(),
new org.joda.time.LocalDate(2015, 8, 18), true);
LocalDate.of(2015, 8, 18), true);

int counter = 0;
while (iterator.hasNext()) {
org.joda.time.LocalDate repeatingDate = iterator.next();
LocalDate repeatingDate = iterator.next();
LoggingDomain.RECURRENCE.fine(repeatingDate.toString());
counter++;
if (counter == 10) {
Expand Down
2 changes: 0 additions & 2 deletions CalendarFXView/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
requires javafx.fxml;
requires java.logging;
requires de.jensd.fx.glyphs.fontawesome;
requires org.joda.time;

requires transitive com.calendarfx.recurrence;

exports com.calendarfx.model;
Expand Down