Closedown

This commit is contained in:
boccioli_m
2015-06-16 15:58:04 +02:00
parent 6fa42abeff
commit cf88cdd4c3

View File

@@ -443,7 +443,7 @@ public class TestingList extends Panel {
//search for device name in table
for (int row = 0; row <= jTable1.getRowCount() - 1; row++) {
if (deviceName.equals(jTable1.getValueAt(row, COL.DEVICENAME.ordinal())) &&
testName.equals(jTable1.getValueAt(row, COL.TESTNAME.ordinal()))) {
testName.equals(jTable1.getValueAt(row, COL.TESTPATH.ordinal()))) {
rowD = row;
break;
}
@@ -480,7 +480,7 @@ public class TestingList extends Panel {
for (int row = 0; row <= jTable1.getRowCount() - 1; row++) {
if (jTable1.getValueAt(row, COL.STATUS.ordinal()).toString().equals(TestStatus.RUNNING.toString())) {
dsTestProperties[0] = jTable1.getValueAt(row, COL.DEVICENAME.ordinal()).toString();
dsTestProperties[1] = jTable1.getValueAt(row, COL.TESTNAME.ordinal()).toString();
dsTestProperties[1] = jTable1.getValueAt(row, COL.TESTPATH.ordinal()).toString();
break;
}
}
@@ -507,7 +507,7 @@ public class TestingList extends Panel {
}
if (rowD >= 0) {
//search for test name in table
if (testName.equals(jTable1.getValueAt(rowD, COL.TESTNAME.ordinal()))) {
if (testName.equals(jTable1.getValueAt(rowD, COL.TESTPATH.ordinal()))) {
colT = COL.TESTNAME.ordinal();
}
}
@@ -561,10 +561,10 @@ public class TestingList extends Panel {
File f = new File(sTestPath);
if(!f.exists() || f.isDirectory()){
logger.log(Level.SEVERE, "Test file not found: " + sTestPath);
showResult(sDeviceName, sTestName, "Test file not found: " + sTestPath, TestStatus.FAILURE.toString());
showResult(sDeviceName, sTestPath, "Test file not found: " + sTestPath, TestStatus.FAILURE.toString());
return;
}
showResult(sDeviceName, sTestName, "Test running", TestStatus.RUNNING.toString());
showResult(sDeviceName, sTestPath, "Test running", TestStatus.RUNNING.toString());
//launch the test
try{
args.put("DEVICE", sDeviceName);
@@ -574,7 +574,7 @@ public class TestingList extends Panel {
} catch (Exception ex) {
SwingUtils.showMessage(this, "executeTest()", ex.toString());
logger.log(Level.SEVERE, ex.toString());
showResult(sDeviceName, sTestName, ex.toString(), TestStatus.FAILURE.toString());
showResult(sDeviceName, sTestPath, ex.toString(), TestStatus.FAILURE.toString());
setButtonToStop();
}
}