Skip to content

small changes in preparation for refactor #837

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

Merged
labkey-matthewb merged 2 commits into from
Feb 17, 2025
Merged

small changes in preparation for refactor #837

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
375c034
small changes in preparation for refactor
labkey-matthewb Feb 15, 2025
ff77d4b
Merge remote-tracking branch 'origin/develop' into fb_parseTimeToMillis
labkey-matthewb Feb 15, 2025
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
8 changes: 4 additions & 4 deletions flow/enginesrc/org/labkey/flow/analysis/model/FCSHeader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ public long getBeginTime()
if (btim == null)
return 0;

return parseTime(btim);
return parseTimeToMillis(btim);
}

public long getEndTime()
Expand All @@ -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
Expand All @@ -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. */
Expand Down