diff --git a/zeitlaeufer/src/main/java/de/szimnau/AbstractLoadingBar.java b/zeitlaeufer/src/main/java/de/szimnau/AbstractLoadingBar.java index c94a3f2..d96cfbc 100644 --- a/zeitlaeufer/src/main/java/de/szimnau/AbstractLoadingBar.java +++ b/zeitlaeufer/src/main/java/de/szimnau/AbstractLoadingBar.java @@ -104,6 +104,11 @@ public abstract class AbstractLoadingBar { } + protected void showLoadingBar(boolean debug, boolean passedMinutesZero) { + showLoadingBar(debug, passedMinutesZero, 100L); + } + + protected void showLoadingBarDebug(boolean passedMinutesZero, long millisWaiting) { showLoadingBar(true, passedMinutesZero, millisWaiting); } diff --git a/zeitlaeufer/src/main/java/de/szimnau/LoadingBar.java b/zeitlaeufer/src/main/java/de/szimnau/LoadingBar.java index fec2ac7..5d5a673 100644 --- a/zeitlaeufer/src/main/java/de/szimnau/LoadingBar.java +++ b/zeitlaeufer/src/main/java/de/szimnau/LoadingBar.java @@ -76,16 +76,14 @@ public class LoadingBar extends AbstractProgressBar { print("Ankunftszeit: "); var startTime = LocalTime.parse(br.readLine(), FormatTools.TIME_FORMATTER).truncatedTo(ChronoUnit.MINUTES); var lb = new LoadingBar(startTime); - // boolean passedMinutesZero = true; // DEBUG - if (lb.hasMittagspauseArrived()) { - // if (lb.hasMittagspauseArrived(passedMinutesZero)) { // DEBUG + boolean debug = false; + boolean passedMinutesZero = false; + if (lb.hasMittagspauseArrived(debug && passedMinutesZero)) { handleMittagspause(br, lb); - lb.showLoadingBar(); - // lb.showLoadingBarDebug(passedMinutesZero); // DEBUG + lb.showLoadingBar(debug, passedMinutesZero); } handleZapfenstreich(br, lb); - lb.showLoadingBar(); - // lb.showLoadingBarDebug(passedMinutesZero); // DEBUG + lb.showLoadingBar(debug, passedMinutesZero); } @@ -140,8 +138,9 @@ public class LoadingBar extends AbstractProgressBar { private static void parseParametersAndRun(String[] args) { LoadingBar lb = getLoadingBarFromCLI(args); - lb.showLoadingBar(); - // wlb.showLoadingBarDebug(true); // DEBUG + boolean debug = false; + boolean passedMinutesZero = false; + wl.showLoadingBar(debug, passedMinutesZero); } diff --git a/zeitlaeufer/src/main/java/de/szimnau/WorkLoadingBar.java b/zeitlaeufer/src/main/java/de/szimnau/WorkLoadingBar.java index 64879e0..79230ec 100644 --- a/zeitlaeufer/src/main/java/de/szimnau/WorkLoadingBar.java +++ b/zeitlaeufer/src/main/java/de/szimnau/WorkLoadingBar.java @@ -41,16 +41,14 @@ public class WorkLoadingBar extends AbstractProgressBar { var lb = new LoadingBar(startTime); var db = new DrinkingBar(startTime); var wlb = new WorkLoadingBar(lb, db); - // boolean passedMinutesZero = true; // DEBUG - if (lb.hasMittagspauseArrived()) { - // if (lb.hasMittagspauseArrived(passedMinutesZero)) { // DEBUG + boolean debug = false; + boolean passedMinutesZero = false; + if (lb.hasMittagspauseArrived(debug && passedMinutesZero)) { handleMittagspause(br, wlb); - wlb.showLoadingBar(); - // wlb.showLoadingBarDebug(passedMinutesZero); // DEBUG + wlb.showLoadingBar(debug, passedMinutesZero); } handleZapfenstreich(br, wlb); - wlb.showLoadingBar(); - // wlb.showLoadingBarDebug(passedMinutesZero); // DEBUG + wlb.showLoadingBar(debug, passedMinutesZero); } @@ -71,8 +69,9 @@ public class WorkLoadingBar extends AbstractProgressBar { var db = new DrinkingBar(lb.getStartTime()); var wlb = new WorkLoadingBar(lb, db); wlb.setEndTime(wlb.loadingBar.getEndTime()); - wlb.showLoadingBar(); - // wlb.showLoadingBarDebug(true); // DEBUG + boolean debug = false; + boolean passedMinutesZero = false; + wlb.showLoadingBar(debug, passedMinutesZero); }