From 223b0fb36b21f14bd8a1337ea6371cfd835ca10d Mon Sep 17 00:00:00 2001
From: boccioli_m <boccioli_m@PC11577.psi.ch>
Date: Mon, 8 Jun 2015 09:45:14 +0200
Subject: [PATCH] Closedown

---
 plugins/TestingList.java | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/plugins/TestingList.java b/plugins/TestingList.java
index 18f2dee..2cb7dd4 100644
--- a/plugins/TestingList.java
+++ b/plugins/TestingList.java
@@ -54,12 +54,12 @@ public class TestingList extends Panel {
                 switch(fileName){
                     case "power-supply":
                                      Object ret = eval("ret");
-                                     boolean success = (boolean) eval("success");
+                                     Object success = eval("success");
                                      Object deviceName = eval("deviceName");
                                      Object testName = eval("testName");
                                     if (ret != null) {
                                         //SwingUtils.showMessage(getComponent(), "", ret.toString() + " - " + ret.getClass().getName());
-                                        testingList.showResult(deviceName.toString(), testName.toString(), ret.toString(), success);
+                                        testingList.showResult(deviceName.toString(), testName.toString(), ret.toString(), success.toString());
                                     }
                     break;
             }
@@ -80,7 +80,7 @@ public class TestingList extends Panel {
         
        
 
-    public void showResult(String deviceName, String testName, String res, boolean success){
+    public void showResult(String deviceName, String testName, String res, String success){
        
        int COL_RESULT = 3;
        int COL_SUCCESS = 4;
@@ -109,15 +109,7 @@ public class TestingList extends Panel {
        }
        if(colT>0 && rowD>0){
             jTable1.setValueAt(res, rowD, COL_RESULT);
-            String sStatus;
-            if(success){
-                sStatus = "Success";
-            }
-            else{
-                sStatus = "Fail";
-            }
-                
-            jTable1.setValueAt(sStatus, rowD, COL_SUCCESS);
+            jTable1.setValueAt(success, rowD, COL_SUCCESS);
        }
     }
     
@@ -190,6 +182,9 @@ public class TestingList extends Panel {
                 args.put("relative", var1);
                 args.put("steps", var2);
                 run("power-supply", args);
+                Object deviceName = eval("deviceName");
+                Object testName = eval("testName");
+                showResult(deviceName.toString(), testName.toString(),"","Performing");
              
 
                 //evalAsync("run('args', locals = {'relative':" + (var1 ? "True" :"False")  + ", 'steps':" + var2 + "})");