From f61c47b2942df4423d9f1f8c6813d896aa101bdc Mon Sep 17 00:00:00 2001 From: Tefek <31473117+493msi@users.noreply.github.com> Date: Tue, 5 Jan 2021 00:14:33 +0100 Subject: [PATCH] [PlutoLib] Cleanup in MiniTime.java --- UPDATE_NOTES.md | 1 + .../main/java/cz/tefek/pluto/chrono/MiniTime.java | 14 ++++++-------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/UPDATE_NOTES.md b/UPDATE_NOTES.md index 923ca84..d4eb328 100644 --- a/UPDATE_NOTES.md +++ b/UPDATE_NOTES.md @@ -20,6 +20,7 @@ * Added support for version objects * As a result, all fields except the version string are no longer compile-time constants * `[PlutoCore]` Made `PlutoApplication`'s constructor private +* `[PlutoLib]` `MiniTimeParseException` no longer contains a hardcoded String message Awaiting implementation: * `[PlutoLib]` Moved `cz.tefek.pluto.io.pluto.pp` to `cz.tefek.pluto.io.plutopackage` diff --git a/plutolib/src/main/java/cz/tefek/pluto/chrono/MiniTime.java b/plutolib/src/main/java/cz/tefek/pluto/chrono/MiniTime.java index 9875381..505d874 100644 --- a/plutolib/src/main/java/cz/tefek/pluto/chrono/MiniTime.java +++ b/plutolib/src/main/java/cz/tefek/pluto/chrono/MiniTime.java @@ -47,12 +47,10 @@ public class MiniTime { public MiniTimeParseException() { - super("Time period could not be parsed. Correct format: \\_w\\_d\\_h\\_m\\_s **without spaces** between the units. You can skip a time unit. Example: 1h15m"); + } } - private static final TimeUnit miliseconds = TimeUnit.MILLISECONDS; - private static final int DAYS_IN_WEEK = 7; private static final int HOURS_IN_DAY = 24; private static final int MINUTES_IN_HOUR = 60; @@ -264,17 +262,17 @@ public class MiniTime throw new IllegalArgumentException("Negative time span cannot be converted to MiniTime."); } - var xweeks = miliseconds.toDays(diff) / DAYS_IN_WEEK; + var xweeks = TimeUnit.MILLISECONDS.toDays(diff) / DAYS_IN_WEEK; if (xweeks > Integer.MAX_VALUE) { return "forever"; } - var xdays = miliseconds.toDays(diff) % DAYS_IN_WEEK; - var xhours = miliseconds.toHours(diff) % HOURS_IN_DAY; - var xminutes = miliseconds.toMinutes(diff) % MINUTES_IN_HOUR; - var xseconds = miliseconds.toSeconds(diff) % SECONDS_IN_MINUTE; + var xdays = TimeUnit.MILLISECONDS.toDays(diff) % DAYS_IN_WEEK; + var xhours = TimeUnit.MILLISECONDS.toHours(diff) % HOURS_IN_DAY; + var xminutes = TimeUnit.MILLISECONDS.toMinutes(diff) % MINUTES_IN_HOUR; + var xseconds = TimeUnit.MILLISECONDS.toSeconds(diff) % SECONDS_IN_MINUTE; return formatTime(xweeks, xdays, xhours, xminutes, xseconds); }