X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=webservices%2Fcompbio%2Fstat%2Fcollector%2FJobStat.java;fp=webservices%2Fcompbio%2Fstat%2Fcollector%2FJobStat.java;h=6f688454d9ef3df89cbf3005d95c23471efe2879;hb=d866a29d849b599983e1102d88bfe0cd40188f5b;hp=25e0aa69bcf5b2df196cff5a9611d6649225eea3;hpb=19685c31d84c935f09082eae573bc6d3dc38c446;p=jabaws.git diff --git a/webservices/compbio/stat/collector/JobStat.java b/webservices/compbio/stat/collector/JobStat.java index 25e0aa6..6f68845 100644 --- a/webservices/compbio/stat/collector/JobStat.java +++ b/webservices/compbio/stat/collector/JobStat.java @@ -1,9 +1,11 @@ package compbio.stat.collector; import java.sql.Timestamp; +import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Comparator; import java.util.Date; +import java.util.Locale; import compbio.engine.client.ConfExecutable; import compbio.util.Util; @@ -32,6 +34,9 @@ public class JobStat { } }; + private static DateFormat DATE_TIME = SimpleDateFormat.getDateTimeInstance( + DateFormat.DEFAULT, DateFormat.DEFAULT, Locale.UK); + Services webService; String clusterJobId; String jobname; @@ -210,30 +215,28 @@ public class JobStat { public String getStart() { if (start != ExecutionStatCollector.UNDEFINED) { - return SimpleDateFormat.getDateTimeInstance().format( - new Date(start)); + return DATE_TIME.format(new Date(start)); } return "?"; } public String getFinish() { if (finish != ExecutionStatCollector.UNDEFINED) { - return SimpleDateFormat.getDateTimeInstance().format( - new Date(finish)); + return DATE_TIME.format(new Date(finish)); } return "?"; } public long getInputSize() { if (inputSize != ExecutionStatCollector.UNDEFINED) { - return inputSize / 1000; + return inputSize; } return 0; } public long getResultSize() { if (resultSize > 0) { - return resultSize / 1000; + return resultSize; } return 0; }