From 375c0340b97bf2dfbc031bbb143c5940aa20b2ab Mon Sep 17 00:00:00 2001 From: labkey-matthewb Date: Fri, 14 Feb 2025 16:59:19 -0800 Subject: [PATCH] small changes in preparation for refactor change parseEN(TimeOnly) to be consistent with java.sql.Time.valueOf(), parseXMLDate(), and DateUtil.fromTimeString() parseEN() handles yyyyMMdd DateUtil.getDateParser() --- .../org/labkey/flow/analysis/model/FCSHeader.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flow/enginesrc/org/labkey/flow/analysis/model/FCSHeader.java b/flow/enginesrc/org/labkey/flow/analysis/model/FCSHeader.java index 7fdb2fb004..835d49b06c 100644 --- a/flow/enginesrc/org/labkey/flow/analysis/model/FCSHeader.java +++ b/flow/enginesrc/org/labkey/flow/analysis/model/FCSHeader.java @@ -166,7 +166,7 @@ public long getBeginTime() if (btim == null) return 0; - return parseTime(btim); + return parseTimeToMillis(btim); } public long getEndTime() @@ -175,7 +175,7 @@ public long getEndTime() if (etim == null) return 0; - return parseTime(etim); + return parseTimeToMillis(etim); } // Issue 38649: flow: parse fractional seconds used in $BTIM keyword @@ -187,9 +187,9 @@ private long parseDateTime(String dateStr) // Issue 38649: flow: parse fractional seconds used in $BTIM keyword // turns off strict to allow overflow of jiffy seconds - private long parseTime(String dateStr) + private long parseTimeToMillis(String dateStr) { - return DateUtil.parseTime(dateStr, false); + return DateUtil.parseTimeToMillis(dateStr, false); } /** Get the duration in seconds. */