From e5580d3f89a2dd12d405f5ff2bc0e9b777e70731 Mon Sep 17 00:00:00 2001 From: Robert Vokac Date: Sat, 5 Aug 2023 16:50:38 +0200 Subject: [PATCH] Several improvements --- .../time/moment/LocalDateTime.java | 24 ++++++++++++++++++- .../time/utils/RemainingTimeCalculator.java | 4 ++-- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/power-time/src/main/java/org/nanoboot/powerframework/time/moment/LocalDateTime.java b/power-time/src/main/java/org/nanoboot/powerframework/time/moment/LocalDateTime.java index 7955138..d5aae75 100644 --- a/power-time/src/main/java/org/nanoboot/powerframework/time/moment/LocalDateTime.java +++ b/power-time/src/main/java/org/nanoboot/powerframework/time/moment/LocalDateTime.java @@ -21,6 +21,7 @@ package org.nanoboot.powerframework.time.moment; import java.time.format.DateTimeFormatter; +import java.util.Calendar; /** * This class stores date time without time zone information. @@ -55,12 +56,33 @@ public final class LocalDateTime extends DateTime { * * @param ldt java.time.LocalDateTime instance * - * @return a java.time.LocalDateTime instance from this object + * @return a org.nanoboot.powerframework.time.moment.LocalDateTime instance from this object */ public static LocalDateTime toPowerLocalDateTime(java.time.LocalDateTime ldt) { return new LocalDateTime(ldt.getYear(), ldt.getDayOfMonth(), ldt.getDayOfMonth(), ldt.getHour(), ldt.getMinute(), ldt.getSecond(), ldt.getSecond()); } + /** + * + ** Creates new LocalDateTime from java.util.Date. + * @param javaUtilDate java.util.Date instance + * + * @return a org.nanoboot.powerframework.time.moment.LocalDateTime instance from this object + */ + public static LocalDateTime convertJavaUtilDateToPowerLocalDateTime(java.util.Date javaUtilDate) { + Calendar cal = Calendar.getInstance(); + cal.setTime(javaUtilDate); + + return new LocalDateTime( + cal.get(Calendar.YEAR), + cal.get(Calendar.MONTH) + 1, + cal.get(Calendar.DAY_OF_MONTH), + cal.get(Calendar.HOUR_OF_DAY), + cal.get(Calendar.MINUTE), + cal.get(Calendar.SECOND), + cal.get(Calendar.MILLISECOND)); + } + /** * Constructor * diff --git a/power-time/src/main/java/org/nanoboot/powerframework/time/utils/RemainingTimeCalculator.java b/power-time/src/main/java/org/nanoboot/powerframework/time/utils/RemainingTimeCalculator.java index 740f19a..cc356c2 100644 --- a/power-time/src/main/java/org/nanoboot/powerframework/time/utils/RemainingTimeCalculator.java +++ b/power-time/src/main/java/org/nanoboot/powerframework/time/utils/RemainingTimeCalculator.java @@ -25,7 +25,7 @@ package org.nanoboot.powerframework.time.utils; * @author Robert Vokac * @since 0.0.0 */ -class RemainingTimeCalculator { +public class RemainingTimeCalculator { private long startNanoTime = 0; private long total; private long done = 0; @@ -63,6 +63,6 @@ class RemainingTimeCalculator { } public String getMessage() { - return "Time elapsed: " + this.elapsedSecondSinceStart() + " seconds. Time left: " + this.remainingSecondsUntilEnd() + " seconds. Done: " + this.getDoneCount() + " tasks."; + return "Elapsed=" + this.elapsedSecondSinceStart() + " seconds Left=" + this.remainingSecondsUntilEnd() + " seconds Done=" + this.getDoneCount() + " tasks."; } }