Closedown

This commit is contained in:
boccioli_m
2015-06-12 11:46:18 +02:00
parent 2133325ea1
commit 6bd2eda255
2 changed files with 8 additions and 8 deletions

View File

@@ -67,7 +67,7 @@ public class TestingList extends Panel {
Object ret = eval("ret");
boolean status = (boolean) eval("status");
Object deviceName = eval("DEVICE");
String sStatus = (status == true) ? "Success" : "Failed";
String sStatus = (status == true) ? "Success" : "Failure";
if (ret != "" ) {
@@ -81,7 +81,7 @@ public class TestingList extends Panel {
}
else{ // ret empty means that either the test script does not have variable ret, or that the script could not be started at all
ret = "Could not start test script";
sStatus = "Failed";
sStatus = "Failure";
String[] dsDeviceName = testingList.getTestInProgress();
//SwingUtils.showException(getComponent(), ex );
//SwingUtils.showMessage(getComponent(), "", ex.toString() + deviceName[0]);
@@ -96,7 +96,7 @@ public class TestingList extends Panel {
}
} catch (Exception ex) {
String ret = "Could not start test script";
String sStatus = "Failed";
String sStatus = "Failure";
String[] dsDeviceName = testingList.getTestInProgress();
//SwingUtils.showException(getComponent(), ex );
SwingUtils.showMessage(getComponent(), "onExecutedFile()", ex.toString() + dsDeviceName[0]);
@@ -379,7 +379,7 @@ public class TestingList extends Panel {
iconSource = "/icons/button_ok-16px.png";
logger.log(Level.INFO, "Device: " + testName + "; Test: " + testName + " Result: " + res + " (" + status + ")");
break;
case "Failed":
case "Failure":
iconSource = "/icons/button_close-16px.png";
logger.log(Level.SEVERE, "Device: " + testName + "; Test: " + testName + " Result: " + res + " (" + status + ")");
break;
@@ -452,10 +452,10 @@ public class TestingList extends Panel {
bSelected = (boolean) jTable1.getValueAt(row, COL_CHECK);
if (bSelected) {
sStatus = "Pending";
iconSource = "/icons/button_pause-16px.png";
iconSource = "/icons/button_stop-16px.png";
} else {
sStatus = "Disabled";
iconSource = "/icons/button_stop-16px.png";
iconSource = null;
}
ImageIcon icon = new ImageIcon(getClass().getResource(iconSource));
jTable1.setValueAt(bSelected, row, COL_CHECK);