- save calculated Value in named constant
- cleanup unused code - comment out redundant printed information
This commit is contained in:
@@ -19,11 +19,12 @@ public class DrinkingBar extends AbstractLoadingBar {
|
||||
private static final int MINS_PER_HALF_HOUR = CommonTools.MINS_PER_HOUR / 2;
|
||||
private static final int MINUTES_BEFORE_PAUSE = 4 * CommonTools.MINS_PER_HOUR + MINS_PER_HALF_HOUR;
|
||||
private static final int MINUTES_WITH_PAUSE = 6 * CommonTools.MINS_PER_HOUR;
|
||||
private static final int DEFAULT_TOTAL_TIME = 8 * MINS_PER_HOUR + MINS_PER_HALF_HOUR;
|
||||
private static final DecimalFormat LITER_FORMAT = new DecimalFormat("0.00");
|
||||
|
||||
|
||||
protected DrinkingBar(LocalTime startTime) {
|
||||
super(startTime, 8 * CommonTools.MINS_PER_HOUR + MINS_PER_HALF_HOUR);
|
||||
super(startTime, DEFAULT_TOTAL_TIME);
|
||||
}
|
||||
|
||||
|
||||
@@ -31,7 +32,6 @@ public class DrinkingBar extends AbstractLoadingBar {
|
||||
var br = new BufferedReader(new InputStreamReader(System.in, StandardCharsets.UTF_8));
|
||||
print("Ankunftszeit: ");
|
||||
var startTime = LocalTime.parse(br.readLine(), FormatTools.TIME_FORMATTER).truncatedTo(ChronoUnit.MINUTES);
|
||||
long totalMinutes = 8 * CommonTools.MINS_PER_HOUR + MINS_PER_HALF_HOUR;
|
||||
var db = new DrinkingBar(startTime);
|
||||
db.showLoadingBar();
|
||||
}
|
||||
@@ -45,11 +45,11 @@ public class DrinkingBar extends AbstractLoadingBar {
|
||||
}
|
||||
double currentLitres = 2.0 / getTotalMinutes() * effectivePassedMinutes + 0.25;
|
||||
double printedLitres = currentLitres - (currentLitres % 0.25);
|
||||
double currentProgressToNextStep = 100 / 0.25 * (currentLitres - printedLitres);
|
||||
// double currentProgressToNextStep = 100 / 0.25 * (currentLitres - printedLitres);
|
||||
BigDecimal minutesToNextStep = getMinutesToNextStep(currentLitres);
|
||||
String progressivePart = progressive ? "\r" : "";
|
||||
return progressivePart + "Aktuelles Volumen: " + LITER_FORMAT.format(printedLitres) + "L - "
|
||||
+ FormatTools.PERCENTAGE_FORMAT.format(currentProgressToNextStep) + "% - "
|
||||
// + FormatTools.PERCENTAGE_FORMAT.format(currentProgressToNextStep) + "% - "
|
||||
+ FormatTools.minutesToTimeString(minutesToNextStep);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user