From ec22d0cc5ca54a5e1d311aae26fdb3db6c015925 Mon Sep 17 00:00:00 2001 From: joniles Date: Thu, 31 Oct 2024 14:59:19 +0000 Subject: [PATCH] Tidy up timestamp conversion --- .idea/runConfigurations/ProjectExplorer.xml | 20 ------------------- .../sf/mpxj/mpp/ProjectPropertiesReader.java | 6 ++---- 2 files changed, 2 insertions(+), 24 deletions(-) delete mode 100644 .idea/runConfigurations/ProjectExplorer.xml diff --git a/.idea/runConfigurations/ProjectExplorer.xml b/.idea/runConfigurations/ProjectExplorer.xml deleted file mode 100644 index 1bc63de00b..0000000000 --- a/.idea/runConfigurations/ProjectExplorer.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/main/java/net/sf/mpxj/mpp/ProjectPropertiesReader.java b/src/main/java/net/sf/mpxj/mpp/ProjectPropertiesReader.java index b834c6fa75..9d46cdb781 100644 --- a/src/main/java/net/sf/mpxj/mpp/ProjectPropertiesReader.java +++ b/src/main/java/net/sf/mpxj/mpp/ProjectPropertiesReader.java @@ -28,6 +28,7 @@ import java.util.Calendar; import java.util.Date; import java.util.Map; +import java.util.TimeZone; import java.util.TreeMap; import net.sf.mpxj.common.DayOfWeekHelper; @@ -242,9 +243,6 @@ private LocalDateTime getLocalDateTime(Date date) return null; } - m_calendar.setTime(date); - return LocalDateTime.of(m_calendar.get(Calendar.YEAR), m_calendar.get(Calendar.MONTH) + 1, m_calendar.get(Calendar.DAY_OF_MONTH), m_calendar.get(Calendar.HOUR_OF_DAY), m_calendar.get(Calendar.MINUTE), m_calendar.get(Calendar.SECOND)); + return LocalDateTime.ofInstant(date.toInstant(), TimeZone.getDefault().toZoneId()); } - - private final Calendar m_calendar = Calendar.getInstance(); }