Merge branch 'develop' into Jalview-JS/develop

[jalview.git] / src / jalview / util / Platform.java

diff --git a/src/jalview/util/Platform.java b/src/jalview/util/Platform.java
index 1f03f88..0b9185c 100644 (file)
--- a/src/jalview/util/Platform.java
+++ b/src/jalview/util/Platform.java
@@ -201,23 +201,40 @@ public class Platform
   
   public final static int TIME_RESET = 0;
   public final static int TIME_MARK  = 1;
+  public static final int TIME_SET   = 2;
+  public static final int TIME_GET   = 3;
   
-  public static long time, mark;
+  public static long time, mark, set, duration;
   
   public static void timeCheck(String msg, int mode) {
+         long t = System.currentTimeMillis();
          switch (mode) {
          case TIME_RESET:
-                 time = mark = System.currentTimeMillis();
-                 System.err.println("Platform: timer reset\t\t\t" + msg);
+                 time = mark = t;
+                 if (msg != null)
+                         System.err.println("Platform: timer reset\t\t\t" + msg);
                  break;
          case TIME_MARK:
-                 long t = System.currentTimeMillis();
-                 if (time == 0)
-                         time = mark = t;
-                 System.err.println("Platform: timer mark\t" + ((t - time)/1000f) + "\t" + ((t - mark)/1000f) + "\t" + msg);
-                 mark = t;
+                 if (set > 0) {
+                         duration += (t - set);
+                 } else {
+                         if (time == 0)
+                                 time = mark = t;
+                         if (msg != null)
+                                 System.err.println("Platform: timer mark\t" + ((t - time)/1000f) + "\t" + ((t - mark)/1000f) + "\t" + msg);
+                         mark = t;
+                 }
+                 break;
+         case TIME_SET:
+                 set = t;
+                 break;
+         case TIME_GET:
+                 if (msg != null)
+                         System.err.println("Platform: timer dur\t" + ((t - time)/1000f) + "\t" + ((duration)/1000f) + "\t" + msg);
+                 set = 0;
                  break;
          }
   }
+
    
 }