mirror/Spark
3
0
Fork 0
mirror of https://github.com/igniterealtime/Spark.git synced 2025-10-29 19:57:28 +00:00
Code Issues Projects Releases Wiki Activity

WorkgroupManager: use ModelUtil.getTimeFromLong() and remove the duplicated FormUtils.getTimeFromLong()

Browse Source 
Signed-off-by: Sergey Ponomarev <stokito@gmail.com>
This commit is contained in:
Sergey Ponomarev 2024-08-18 20:49:51 +03:00
parent 45eb87a653
commit 141893368e
2 changed files with 1 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
plugins/fastpath/src/main/java/org/jivesoftware/fastpath/internal/FormUtils.java
View File

@ -155,49 +155,4 @@ final public class FormUtils {
return message.getFrom().getResourceOrThrow();
}
/**
* Returns better looking time String.
* @param seconds the number of seconds to calculate.
*/
public static String getTimeFromLong(long seconds) {
final String DAYS = Res.getString("time.days");
final String HOURS = Res.getString("time.hours");
final String MINUTES = Res.getString("time.minutes");
final String SECONDS = Res.getString("time.seconds");
final String LESS_THAN_ONE_MINUTE = Res.getString("time.less.than.one.minute");
final long MS_IN_A_DAY = 1000 * 60 * 60 * 24;
final long MS_IN_AN_HOUR = 1000 * 60 * 60;
final long MS_IN_A_MINUTE = 1000 * 60;
final long MS_IN_A_SECOND = 1000;
Date currentTime = new Date();
long numDays = seconds / MS_IN_A_DAY;
seconds = seconds % MS_IN_A_DAY;
long numHours = seconds / MS_IN_AN_HOUR;
seconds = seconds % MS_IN_AN_HOUR;
long numMinutes = seconds / MS_IN_A_MINUTE;
seconds = seconds % MS_IN_A_MINUTE;
long numSeconds = seconds / MS_IN_A_SECOND;
seconds = seconds % MS_IN_A_SECOND;
long numMilliseconds = seconds;
StringBuilder buf = new StringBuilder();
if (numHours > 0) {
buf.append(numHours).append(" ").append(HOURS).append(", ");
}
if (numMinutes > 0) {
buf.append(numMinutes).append(" ").append(MINUTES);
}
String result = buf.toString();
if (numMinutes < 1) {
result = LESS_THAN_ONE_MINUTE;
}
return result;
}
}

2
plugins/fastpath/src/main/java/org/jivesoftware/fastpath/internal/WorkgroupManager.java
View File

@ -365,7 +365,7 @@ public class WorkgroupManager {
while (true) {
if (workgroup.isInQueue()) {
queuePostionLabel.setText("Current Position in Queue: " + workgroup.getQueuePosition());
queueWaitTime.setText("It is estimated your wait time to now be " + FormUtils.getTimeFromLong(workgroup.getQueueRemainingTime()));
queueWaitTime.setText("It is estimated your wait time to now be " + ModelUtil.getTimeFromLong(workgroup.getQueueRemainingTime()));
}
else {
return true;