From ec14c949fa9b1f1a6c45535040f2e06c5672fa76 Mon Sep 17 00:00:00 2001
From: Ziver Koc <ziver.koc@ericsson.com>
Date: Mon, 9 Feb 2015 13:47:32 +0100
Subject: [PATCH] Changes so that UI displays execution time in milliseconds
 also. [artf485006]

---
 .../com/ericsson/uecontrol/core/UeControlExecutor.java |  1 +
 .../uecontrol/core/behaviour/UeBehaviourSleep.java     | 10 +++++-----
 .../com/ericsson/uecontrol/core/util/StringUtil.java   |  8 ++++++--
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/ericsson/uecontrol/core/UeControlExecutor.java b/app/src/main/java/com/ericsson/uecontrol/core/UeControlExecutor.java
index dcf2655..1ce211c 100755
--- a/app/src/main/java/com/ericsson/uecontrol/core/UeControlExecutor.java
+++ b/app/src/main/java/com/ericsson/uecontrol/core/UeControlExecutor.java
@@ -153,6 +153,7 @@ public class UeControlExecutor implements Runnable{
             UeBehaviour execBehaviour = currentlyActive;
             log.info("Running behaviour: " + execBehaviour.getName());
             execBehaviour.run(this);
+            log.info("Behaviour done, execution time: "+execBehaviour.getExecTime()+"ms");
 
             // Before deciding on the next behaviour check if currentlyActive
             // has been changed by the previous behaviour
diff --git a/app/src/main/java/com/ericsson/uecontrol/core/behaviour/UeBehaviourSleep.java b/app/src/main/java/com/ericsson/uecontrol/core/behaviour/UeBehaviourSleep.java
index 8a47f14..a54fbaa 100755
--- a/app/src/main/java/com/ericsson/uecontrol/core/behaviour/UeBehaviourSleep.java
+++ b/app/src/main/java/com/ericsson/uecontrol/core/behaviour/UeBehaviourSleep.java
@@ -25,13 +25,13 @@ public class UeBehaviourSleep extends UeBehaviour{
 
     @Override
     protected void execute() throws InterruptedException {
-        log.debug(toString());
+        log.debug("Will sleep for "+time+" milliseconds");
         int elapsedTime = 0;
-        while(elapsedTime < time){
+        while(elapsedTime < time && !super.stopExecution()){
             super.setProgress((float)elapsedTime/time);
-            if(super.stopExecution()) break;
-            Thread.sleep(SLEEP_PERIOD);
-            elapsedTime += SLEEP_PERIOD;
+            int sleep = (elapsedTime+SLEEP_PERIOD < time ? SLEEP_PERIOD : time-elapsedTime);
+            Thread.sleep(sleep);
+            elapsedTime += sleep;
         }
     }
 
diff --git a/app/src/main/java/com/ericsson/uecontrol/core/util/StringUtil.java b/app/src/main/java/com/ericsson/uecontrol/core/util/StringUtil.java
index 7f5d8dd..86ad595 100755
--- a/app/src/main/java/com/ericsson/uecontrol/core/util/StringUtil.java
+++ b/app/src/main/java/com/ericsson/uecontrol/core/util/StringUtil.java
@@ -1,5 +1,7 @@
 package com.ericsson.uecontrol.core.util;
 
+import java.text.DecimalFormat;
+
 /**
  * Created by ezivkoc on 2015-01-16.
  */
@@ -30,12 +32,14 @@ public class StringUtil {
         int timeSec = (int)(time / 1000);
         int hours = timeSec / (60*60);
         int minutes = (timeSec-(hours*60*60)) / 60;
-        int seconds = timeSec-(hours*60*60)-(minutes*60);
+        double seconds = (time-((hours*60*60)-(minutes*60))*1000)/1000.0;
 
         String ret = "";
+        DecimalFormat df = new DecimalFormat("#0.##"); // Round to 2 decimals of seconds
         if(hours > 0) ret += hours+"h ";
         if(minutes > 0) ret += minutes+"m ";
-        if(seconds > 0) ret += seconds+"s ";
+        if(seconds > 0) ret += df.format(seconds)+"s ";
+
         return ret;
     }
 }