A bug fix, help text for stat jsp pages and style improvements

[jabaws.git] / webservices / compbio / stat / collector / JobStat.java

diff --git a/webservices/compbio/stat/collector/JobStat.java b/webservices/compbio/stat/collector/JobStat.java
index 25e0aa6..6f68845 100644 (file)
--- a/webservices/compbio/stat/collector/JobStat.java
+++ b/webservices/compbio/stat/collector/JobStat.java
@@ -1,9 +1,11 @@
 package compbio.stat.collector;\r
 \r
 import java.sql.Timestamp;\r
+import java.text.DateFormat;\r
 import java.text.SimpleDateFormat;\r
 import java.util.Comparator;\r
 import java.util.Date;\r
+import java.util.Locale;\r
 \r
 import compbio.engine.client.ConfExecutable;\r
 import compbio.util.Util;\r
@@ -32,6 +34,9 @@ public class JobStat {
                }\r
        };\r
 \r
+       private static DateFormat DATE_TIME = SimpleDateFormat.getDateTimeInstance(\r
+                       DateFormat.DEFAULT, DateFormat.DEFAULT, Locale.UK);\r
+\r
        Services webService;\r
        String clusterJobId;\r
        String jobname;\r
@@ -210,30 +215,28 @@ public class JobStat {
 \r
        public String getStart() {\r
                if (start != ExecutionStatCollector.UNDEFINED) {\r
-                       return SimpleDateFormat.getDateTimeInstance().format(\r
-                                       new Date(start));\r
+                       return DATE_TIME.format(new Date(start));\r
                }\r
                return "?";\r
        }\r
 \r
        public String getFinish() {\r
                if (finish != ExecutionStatCollector.UNDEFINED) {\r
-                       return SimpleDateFormat.getDateTimeInstance().format(\r
-                                       new Date(finish));\r
+                       return DATE_TIME.format(new Date(finish));\r
                }\r
                return "?";\r
        }\r
 \r
        public long getInputSize() {\r
                if (inputSize != ExecutionStatCollector.UNDEFINED) {\r
-                       return inputSize / 1000;\r
+                       return inputSize;\r
                }\r
                return 0;\r
        }\r
 \r
        public long getResultSize() {\r
                if (resultSize > 0) {\r
-                       return resultSize / 1000;\r
+                       return resultSize;\r
                }\r
                return 0;\r
        }\r