From 129119bdc4c5ea76e40696b6c33df3646f1256cf Mon Sep 17 00:00:00 2001
From: boccioli_m <boccioli_m@PC11577.psi.ch>
Date: Wed, 10 Jun 2015 14:27:33 +0200
Subject: [PATCH] Closedown

---
 plugins/TestingList.form | 2 +-
 plugins/TestingList.java | 2 +-
 script/power-supply.py   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/TestingList.form b/plugins/TestingList.form
index 0450c48..9c5059b 100644
--- a/plugins/TestingList.form
+++ b/plugins/TestingList.form
@@ -50,7 +50,7 @@
               <Font name="Tahoma" size="15" style="0"/>
             </Property>
             <Property name="model" type="javax.swing.table.TableModel" editor="org.netbeans.modules.form.RADConnectionPropertyEditor" postCode="jTable1.getTableHeader().setReorderingAllowed(false);">
-              <Connection code="new javax.swing.table.DefaultTableModel(&#xa;    new Object [][] {&#xa;&#xa;    },&#xa;    new String [] {&#xa;        &quot;Select&quot;, &quot;Time&quot;, &quot;Device Name&quot;, &quot;Device Description&quot;, &quot;Test Suite&quot;, &quot;Test Name&quot;, &quot;Test Result&quot;, &quot;Status&quot;, &quot;&quot;&#xa;    }&#xa;) {&#xa;    Class[] types = new Class [] {&#xa;        java.lang.Boolean.class, java.lang.Object.class, java.lang.Object.class, java.lang.Object.class, java.lang.Object.class, java.lang.Object.class, java.lang.Object.class, java.lang.Object.class, javax.swing.Icon.class&#xa;    };&#xa;    boolean[] canEdit = new boolean [] {&#xa;        true, true, true, true, true, true, true, true, false&#xa;    };&#xa;&#xa;    public Class getColumnClass(int columnIndex) {&#xa;        return types [columnIndex];&#xa;    }&#xa;&#xa;    public boolean isCellEditable(int rowIndex, int columnIndex) {&#xa;        return canEdit [columnIndex];&#xa;    }&#xa;}" type="code"/>
+              <Connection code="new javax.swing.table.DefaultTableModel(&#xa;    new Object [][] {&#xa;&#xa;    },&#xa;    new String [] {&#xa;        &quot;Select&quot;, &quot;Time&quot;, &quot;Device Name&quot;, &quot;Device Description&quot;, &quot;Test Suite&quot;, &quot;Test Name&quot;, &quot;Last Test Result&quot;, &quot;Status&quot;, &quot;&quot;&#xa;    }&#xa;) {&#xa;    Class[] types = new Class [] {&#xa;        java.lang.Boolean.class, java.lang.Object.class, java.lang.Object.class, java.lang.Object.class, java.lang.Object.class, java.lang.Object.class, java.lang.Object.class, java.lang.Object.class, javax.swing.Icon.class&#xa;    };&#xa;    boolean[] canEdit = new boolean [] {&#xa;        true, true, true, true, true, true, true, true, false&#xa;    };&#xa;&#xa;    public Class getColumnClass(int columnIndex) {&#xa;        return types [columnIndex];&#xa;    }&#xa;&#xa;    public boolean isCellEditable(int rowIndex, int columnIndex) {&#xa;        return canEdit [columnIndex];&#xa;    }&#xa;}" type="code"/>
             </Property>
             <Property name="columnModel" type="javax.swing.table.TableColumnModel" editor="org.netbeans.modules.form.editors2.TableColumnModelEditor">
               <TableColumnModel selectionModel="0"/>
diff --git a/plugins/TestingList.java b/plugins/TestingList.java
index 9f36ee7..ac3490a 100644
--- a/plugins/TestingList.java
+++ b/plugins/TestingList.java
@@ -175,7 +175,7 @@ public class TestingList extends Panel {
 
             },
             new String [] {
-                "Select", "Time", "Device Name", "Device Description", "Test Suite", "Test Name", "Test Result", "Status", ""
+                "Select", "Time", "Device Name", "Device Description", "Test Suite", "Test Name", "Last Test Result", "Status", ""
             }
         ) {
             Class[] types = new Class [] {
diff --git a/script/power-supply.py b/script/power-supply.py
index aa06117..a75ce7a 100644
--- a/script/power-supply.py
+++ b/script/power-supply.py
@@ -65,7 +65,7 @@ for setpoint1 in frange(0.0, 20.0, 10.0, True):
         #append(setpoints, positions, values)
         scan.append ([detector1], [detector1], [readback1, detector2, detector3]) 
         sleep( 0.1 ) # Settling time        
-    ret = 'test completed'
+    ret = 'Test completed'
     status = True
 
 #reset output to 0V