diff --git a/src/main/java/org/nanoboot/utils/timecalc/gui/progress/HourBattery.java b/src/main/java/org/nanoboot/utils/timecalc/gui/progress/HourBattery.java index ab08e5a..71b6b23 100644 --- a/src/main/java/org/nanoboot/utils/timecalc/gui/progress/HourBattery.java +++ b/src/main/java/org/nanoboot/utils/timecalc/gui/progress/HourBattery.java @@ -12,6 +12,9 @@ public class HourBattery extends Battery{ } public static double getHourProgress(TimeHM timeRemains, int secondsRemains, int millisecondsRemains) { + if(secondsRemains < 0 || millisecondsRemains < 0 || timeRemains.getHour() < 0 || timeRemains.getMinute() < 0) { + return 1; + } double minutesRemainsD = timeRemains.getMinute(); double secondsRemainsD = secondsRemains; double millisecondsRemainsD = millisecondsRemains; diff --git a/src/main/java/org/nanoboot/utils/timecalc/gui/progress/MonthBattery.java b/src/main/java/org/nanoboot/utils/timecalc/gui/progress/MonthBattery.java index 48e3b96..a1115a0 100644 --- a/src/main/java/org/nanoboot/utils/timecalc/gui/progress/MonthBattery.java +++ b/src/main/java/org/nanoboot/utils/timecalc/gui/progress/MonthBattery.java @@ -9,6 +9,9 @@ public class MonthBattery extends Battery{ super("Month", x, i, i1); } public static double getMonthProgress(int weekDayWhenMondayIsOne, int workDaysDone, int workDaysTotal, double done) { + if(done >1) { + done = 1; + } return weekDayWhenMondayIsOne == 0 || weekDayWhenMondayIsOne == 6 ? workDaysDone / workDaysTotal : diff --git a/src/main/java/org/nanoboot/utils/timecalc/gui/progress/WeekBattery.java b/src/main/java/org/nanoboot/utils/timecalc/gui/progress/WeekBattery.java index c169edd..e8be4d7 100644 --- a/src/main/java/org/nanoboot/utils/timecalc/gui/progress/WeekBattery.java +++ b/src/main/java/org/nanoboot/utils/timecalc/gui/progress/WeekBattery.java @@ -11,6 +11,9 @@ public class WeekBattery extends Battery{ super("Week", x, i, i1); } public static double getWeekProgress(int weekDayWhenMondayIsOne, double done) { + if(done >1) { + done = 1; + } return weekDayWhenMondayIsOne == 0 || weekDayWhenMondayIsOne == 6 ? 100 : ((weekDayWhenMondayIsOne - 1) * 0.20 + done * 0.20);