From a8dadf74dda05a9cbb555ca2be14e17efd10ab5a Mon Sep 17 00:00:00 2001 From: boccioli_m Date: Tue, 16 Jun 2015 15:31:44 +0200 Subject: [PATCH] Closedown --- plugins/TestingList.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/plugins/TestingList.java b/plugins/TestingList.java index fbc9502..c3582cf 100644 --- a/plugins/TestingList.java +++ b/plugins/TestingList.java @@ -80,9 +80,8 @@ public class TestingList extends Panel { sStatus = TestStatus.FAILURE.toString(); String[] dsDeviceName = testingList.getTestInProgress(); //SwingUtils.showException(getComponent(), ex ); - //SwingUtils.showMessage(getComponent(), "", ex.toString() + deviceName[0]); - if(deviceName != null){ - iCurrentTestPos = testingList.showResult(deviceName.toString(), fileName, ret.toString(), sStatus); + if(dsDeviceName[0] != ""){ + iCurrentTestPos = testingList.showResult(dsDeviceName[0], fileName, ret.toString(), sStatus); //start next test if(iCurrentTestPos>=0 && testingList.isTestRunAllowed()) { @@ -463,10 +462,8 @@ public class TestingList extends Panel { logger.log(Level.INFO, "Running Test: " + testName + "."); break; } - - jTable1.setValueAt(icon, rowD, COL.ICON.ordinal()); - if (rowD >= 0) { + jTable1.setValueAt(icon, rowD, COL.ICON.ordinal()); jTable1.setValueAt(getNow(), rowD, COL.TIME.ordinal()); jTable1.setValueAt(res, rowD, COL.RESULT.ordinal()); jTable1.setValueAt(status, rowD, COL.STATUS.ordinal()); @@ -549,7 +546,7 @@ public class TestingList extends Panel { HashMap args = new HashMap(); //scan through the table starting from 'position' and execute the first selected test found int row = position; - if (row <= jTable1.getRowCount()-1 ) { + if (row >=0 && row <= jTable1.getRowCount()-1 ) { for(row = position ; row <= jTable1.getRowCount()-1 ; row++){ bSelected = (boolean) jTable1.getValueAt(row, COL.CHECK.ordinal()); if(bSelected) break;