From 971bf224959c9774a374a0f101d56a0ad1c6a223 Mon Sep 17 00:00:00 2001 From: fabianArbeit Date: Fri, 8 Aug 2025 14:58:37 +0200 Subject: [PATCH] - handle negative endTimeOffset - deduplicated code --- zeitlaeufer/src/main/java/de/szimnau/LoadingBar.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/zeitlaeufer/src/main/java/de/szimnau/LoadingBar.java b/zeitlaeufer/src/main/java/de/szimnau/LoadingBar.java index f7c3665..fec2ac7 100644 --- a/zeitlaeufer/src/main/java/de/szimnau/LoadingBar.java +++ b/zeitlaeufer/src/main/java/de/szimnau/LoadingBar.java @@ -367,12 +367,11 @@ public class LoadingBar extends AbstractProgressBar { private long getMinLunchDuration(int endTimeOffset) { - if (endTimeOffset == 0) { + if (endTimeOffset <= 0) { return MIN_LUNCH_DURATION; } long totalDuration = MAX_NUMBER_WORK_MINS + endTimeOffset; - long effectiveLunchDuration = totalDuration - MAX_NUMBER_WORK_MINS_WITHOUT_LUNCH; - return getMinLunchDuration(effectiveLunchDuration); + return getMinLunchDuration(totalDuration); } @@ -381,12 +380,12 @@ public class LoadingBar extends AbstractProgressBar { return MIN_LUNCH_DURATION; } long totalDuration = getStartTime().until(manualEndTime, ChronoUnit.MINUTES); - long effectiveLunchDuration = totalDuration - MAX_NUMBER_WORK_MINS_WITHOUT_LUNCH; - return getMinLunchDuration(effectiveLunchDuration); + return getMinLunchDuration(totalDuration); } - private long getMinLunchDuration(long effectiveLunchDuration) { + private long getMinLunchDuration(long precalculatedTotalDuration) { + long effectiveLunchDuration = precalculatedTotalDuration - MAX_NUMBER_WORK_MINS_WITHOUT_LUNCH; if (effectiveLunchDuration < 0) { effectiveLunchDuration = 0; }