small fixes + processing time now shown in job queue

[mir.git] / source / mircoders / global / JobQueue.java

diff --git a/source/mircoders/global/JobQueue.java b/source/mircoders/global/JobQueue.java
index fe20e67..22a6be7 100755 (executable)
--- a/source/mircoders/global/JobQueue.java
+++ b/source/mircoders/global/JobQueue.java
@@ -18,18 +18,19 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with  any library licensed under the Apache Software License, 
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library 
- * (or with modified versions of the above that use the same license as the above), 
- * and distribute linked combinations including the two.  You must obey the 
- * GNU General Public License in all respects for all of the code used other than 
- * the above mentioned libraries.  If you modify this file, you may extend this 
- * exception to your version of the file, but you are not obligated to do so.  
+ * the code of this program with  any library licensed under the Apache Software License,
+ * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
+ * (or with modified versions of the above that use the same license as the above),
+ * and distribute linked combinations including the two.  You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries.  If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
  * If you do not wish to do so, delete this exception statement from your version.
  */
 
 package mircoders.global;
 
+
 import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.HashMap;
@@ -168,9 +169,12 @@ public class JobQueue {
   public class Job implements Cloneable {
     private Object data;
     private Date lastChange;
+    private long starttime;
+    private long endtime;
     private String identifier;
     private int status;
     private int priority;
+    private boolean hasRun;
 
     public Job(Object aData, String anIdentifier, int aStatus, int aPriority, Date aLastChange) {
       data = aData;
@@ -178,20 +182,14 @@ public class JobQueue {
       identifier = anIdentifier;
       priority = aPriority;
       lastChange = aLastChange;
+
+      hasRun = false;
     }
 
     public Job(Object aData, String anIdentifier, int aStatus, int aPriority) {
       this(aData, anIdentifier, aStatus, aPriority, (new GregorianCalendar()).getTime());
     }
 
-    public Date getLastChange() {
-      return lastChange;
-    }
-
-    public String getIdentifier() {
-      return identifier;
-    }
-
     public Job(Object aData, String anIdentifier) {
       this(aData, anIdentifier, STATUS_PENDING, PRIORITY_NORMAL);
     }
@@ -206,6 +204,29 @@ public class JobQueue {
       }
     }
 
+    public Date getLastChange() {
+      return lastChange;
+    }
+
+    public String getIdentifier() {
+      return identifier;
+    }
+
+    public long getRunningTime() {
+      long result = 0;
+
+      if (hasRun) {
+        if (isFinished())
+          result = endtime;
+        else
+          result = System.currentTimeMillis();
+
+        result = result-starttime;
+      }
+
+      return result;
+    }
+
     public int getPriority() {
       return priority;
     }
@@ -255,6 +276,14 @@ public class JobQueue {
         if (status == anOldStatus) {
           status = aNewStatus;
           lastChange = (new GregorianCalendar()).getTime();
+          if (isProcessing()) {
+            starttime = System.currentTimeMillis();
+            hasRun = true;
+          }
+
+          if (isFinished()) {
+            endtime = System.currentTimeMillis();
+          }
           return true;
         }
         else {