Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[HAL-1976] fixed method humanReadableDuration #1123

Merged
merged 1 commit into from
Jun 4, 2024
Merged

[HAL-1976] fixed method humanReadableDuration #1123

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 25 additions & 23 deletions ballroom/src/main/java/org/jboss/hal/ballroom/Format.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ public final class Format {
private static final NumberFormat SIZE_FORMAT = NumberFormat.getFormat("#,##0.#");
private static final Constants CONSTANTS = GWT.create(Constants.class);
private static final String SPACE = " ";
private static final String COMMA = ", ";


public static String timestamp(Date date) {
Expand Down Expand Up @@ -73,50 +74,51 @@ public static String humanReadableDuration(long duration) {
return duration + " ms"; //NON-NLS
}

duration = Math.round(duration / 1000.0);
duration /= 1000;

int sec = (int) duration % 60;
duration = Math.round(duration / 60.0);
duration /= 60;

int min = (int) duration % 60;
duration = Math.round(duration / 60.0);
duration /= 60;

int hour = (int) duration % 24;
duration = Math.round(duration / 24.0);
duration /= 24;

int day = (int) duration;

String str = "";
StringBuilder sb = new StringBuilder();
if (day > 0) {
if (day > 1) {
str += day + SPACE + CONSTANTS.days() + ", ";
} else {
str += day + SPACE + CONSTANTS.day() + ", ";
}
sb.append(day)
.append(SPACE)
.append(day > 1 ? CONSTANTS.days() : CONSTANTS.day());
}
// prints 0 hour in case days exists. Otherwise prints 2 days, 34 min, sounds weird.
if (hour > 0 || (day > 0)) {
if (hour > 1) {
str += hour + SPACE + CONSTANTS.hours() + ", ";
} else {
str += hour + SPACE + CONSTANTS.hour() + ", ";
if (sb.length() > 0) {
sb.append(COMMA);
}
sb.append(hour)
.append(SPACE)
.append(hour > 1 ? CONSTANTS.hours() : CONSTANTS.hour());
}
if (min > 0) {
if (min > 1) {
str += min + SPACE + CONSTANTS.minutes() + ", ";
} else {
str += min + SPACE + CONSTANTS.minute() + ", ";
if (sb.length() > 0) {
sb.append(COMMA);
}
sb.append(min)
.append(SPACE)
.append(min > 1 ? CONSTANTS.minutes() : CONSTANTS.minute());
}
if (sec > 0) {
if (sec > 1) {
str += sec + SPACE + CONSTANTS.seconds();
} else {
str += sec + SPACE + CONSTANTS.second();
if (sb.length() > 0) {
sb.append(COMMA);
}
sb.append(sec)
.append(SPACE)
.append(sec > 1 ? CONSTANTS.seconds() : CONSTANTS.second());
}
return str;
return sb.toString();
}

/**
Expand Down
Loading