diff --git a/plugins/TestingList.java b/plugins/TestingList.java index c0f5115..3c77675 100644 --- a/plugins/TestingList.java +++ b/plugins/TestingList.java @@ -132,44 +132,51 @@ public class TestingList extends Panel { public int index(){ return (int) value; } - - - }; -/* - public enum Column{ - PENNY(1) { - @Override - public String color() { - return "copper"; - } - }, NICKLE(5) { - @Override - public String color() { - return "bronze"; - } - }, DIME(10) { - @Override - public String color() { - return "silver"; - } - }, QUARTER(25) { - @Override - public String color() { - return "silver"; - } - }; - private int value; - - public abstract String color(); + public enum TestStatus { + SUCCESS (0), + FAILURE (1), + PENDING (2), + DISABLED (3), + RUNNING (4); - private Currency(int value) { - this.value = value; - } - } -*/ - public class NetbeansPluginPanel extends MonitoredPanel { + private int value; + + private TestStatus(int value) { + this.value = value; + } + + public int index(){ + return (int) value; + } + + public String IconFilename(){ + switch (this){ + case SUCCESS: + return "/icons/button_ok-16px.png"; + case FAILURE: + return "/icons/button_close-16px.png"; + case PENDING: + return "/icons/button_stop-16px.png"; + case DISABLED: + return ""; + case RUNNING: + return "/icons/button_play-16px.png"; + } + return null; + } + + public ImageIcon Icon(){ + ImageIcon icon = new ImageIcon(getClass().getResource(this.IconFilename())); + return icon; + } + + }; + + + + public class NetbeansPluginPanel extends MonitoredPanel { Logger logger = Logger.getLogger("TestsLog"); //these paths are converted to unix or win path according to host OS @@ -180,15 +187,7 @@ public class TestingList extends Panel { private final String TESTS_LOG_DEFAULT_DIR = new java.io.File(".").getCanonicalPath() + FilenameUtils.separatorsToSystem("/home/script/tests/log/TestsLog" + getnow() + ".txt"); //table1 columns indexes - private final int COL_CHECK = 0; - private final int COL_TIME = 1; - private final int COL_DEVICENAME = 2; - private final int COL_DEVICEDESCR = 3; - private final int COL_TESTSUITE = 4; - private final int COL_TESTNAME = 5; - private final int COL_RESULT = 6; - private final int COL_STATUS = 7; - private final int COL_ICON = 8; + private void initLogger() { try { @@ -371,7 +370,7 @@ public class TestingList extends Panel { private void jTable1MouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_jTable1MouseClicked int colIndex = jTable1.getSelectedColumn(); - if (colIndex == COL_CHECK) updateStatus(); + if (colIndex == COL.CHECK.index()) updateStatus(); }//GEN-LAST:event_jTable1MouseClicked private void jTable1KeyTyped(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_jTable1KeyTyped @@ -404,7 +403,7 @@ public class TestingList extends Panel { private void jTable1KeyReleased(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_jTable1KeyReleased int colIndex = jTable1.getSelectedColumn(); - if (colIndex == COL_CHECK) updateStatus(); + if (colIndex == COL.CHECK.index()) updateStatus(); }//GEN-LAST:event_jTable1KeyReleased // Variables declaration - do not modify//GEN-BEGIN:variables @@ -425,8 +424,8 @@ public class TestingList extends Panel { int rowD = -1; //search for device name in table for (int row = 0; row <= jTable1.getRowCount() - 1; row++) { - if (deviceName.equals(jTable1.getValueAt(row, COL_DEVICENAME)) && - testName.equals(jTable1.getValueAt(row, COL_TESTNAME))) { + if (deviceName.equals(jTable1.getValueAt(row, COL.DEVICENAME.index())) && + testName.equals(jTable1.getValueAt(row, COL.TESTNAME.index()))) { rowD = row; break; } @@ -434,11 +433,11 @@ public class TestingList extends Panel { String iconSource = "/icons/button_help-16px.png"; switch (status) { case "Success": - iconSource = "/icons/button_ok-16px.png"; + iconSource = TestStatus.SUCCESS.IconFilename();// "/icons/button_ok-16px.png"; logger.log(Level.INFO, "Device: " + testName + "; Test: " + testName + " Result: " + res + " (" + status + ")"); break; case "Failure": - iconSource = "/icons/button_close-16px.png"; + iconSource = TestStatus.FAILURE.IconFilename();//"/icons/button_close-16px.png"; logger.log(Level.SEVERE, "Device: " + testName + "; Test: " + testName + " Result: " + res + " (" + status + ")"); break; case "Running": @@ -447,12 +446,12 @@ public class TestingList extends Panel { break; } ImageIcon icon = new ImageIcon(getClass().getResource(iconSource)); - jTable1.setValueAt(icon, rowD, COL_ICON); + jTable1.setValueAt(icon, rowD, COL.ICON.index()); if (rowD >= 0) { - jTable1.setValueAt(getNow(), rowD, COL_TIME); - jTable1.setValueAt(res, rowD, COL_RESULT); - jTable1.setValueAt(status, rowD, COL_STATUS); + jTable1.setValueAt(getNow(), rowD, COL.TIME.index()); + jTable1.setValueAt(res, rowD, COL.RESULT.index()); + jTable1.setValueAt(status, rowD, COL.STATUS.index()); } return rowD; } @@ -463,9 +462,9 @@ public class TestingList extends Panel { //search for device name in table try{ for (int row = 0; row <= jTable1.getRowCount() - 1; row++) { - if (jTable1.getValueAt(row, COL_STATUS).toString().equals("Running")) { - dsTestProperties[0] = jTable1.getValueAt(row, COL_DEVICENAME).toString(); - dsTestProperties[1] = jTable1.getValueAt(row, COL_TESTNAME).toString(); + if (jTable1.getValueAt(row, COL.STATUS.index()).toString().equals("Running")) { + dsTestProperties[0] = jTable1.getValueAt(row, COL.DEVICENAME.index()).toString(); + dsTestProperties[1] = jTable1.getValueAt(row, COL.TESTNAME.index()).toString(); break; } } @@ -485,19 +484,19 @@ public class TestingList extends Panel { int rowD = -1, colT = -1; //search for device name in table for (int row = 0; row <= jTable1.getRowCount() - 1; row++) { - if (deviceName.equals(jTable1.getValueAt(row, COL_DEVICENAME))) { + if (deviceName.equals(jTable1.getValueAt(row, COL.DEVICENAME.index()))) { rowD = row; break; } } if (rowD >= 0) { //search for test name in table - if (testName.equals(jTable1.getValueAt(rowD, COL_TESTNAME))) { - colT = COL_TESTNAME; + if (testName.equals(jTable1.getValueAt(rowD, COL.TESTNAME.index()))) { + colT = COL.TESTNAME.index(); } } if (colT >= 0 && rowD >= 0) { - sStatus = jTable1.getValueAt(rowD, COL_STATUS).toString(); + sStatus = jTable1.getValueAt(rowD, COL.STATUS.index()).toString(); } return sStatus; @@ -508,7 +507,7 @@ public class TestingList extends Panel { boolean bSelected; ImageIcon icon = null; for (int row = 0; row <= jTable1.getRowCount() - 1; row++) { - bSelected = (boolean) jTable1.getValueAt(row, COL_CHECK); + bSelected = (boolean) jTable1.getValueAt(row, COL.CHECK.index()); if (bSelected) { sStatus = "Pending"; String iconSource = "/icons/button_stop-16px.png"; @@ -518,8 +517,8 @@ public class TestingList extends Panel { icon = null; } jTable1.setValueAt(bSelected, row, COL.CHECK.index()); - jTable1.setValueAt(icon, row, COL_ICON); - jTable1.setValueAt(sStatus, row, COL_STATUS); + jTable1.setValueAt(icon, row, COL.ICON.index()); + jTable1.setValueAt(sStatus, row, COL.STATUS.index()); } } @@ -533,12 +532,12 @@ public class TestingList extends Panel { int row = position; if (row <= jTable1.getRowCount()-1 ) { for(row = position ; row <= jTable1.getRowCount()-1 ; row++){ - bSelected = (boolean) jTable1.getValueAt(row, COL_CHECK); + bSelected = (boolean) jTable1.getValueAt(row, COL.CHECK.index()); if(bSelected) break; } if (bSelected) { - sDeviceName = jTable1.getValueAt(row, COL_DEVICENAME).toString(); - sTestName = jTable1.getValueAt(row, COL_TESTNAME).toString(); + sDeviceName = jTable1.getValueAt(row, COL.DEVICENAME.index()).toString(); + sTestName = jTable1.getValueAt(row, COL.TESTNAME.index()).toString(); showResult(sDeviceName, sTestName, "Test running", "Running"); //launch the test try{ @@ -565,10 +564,10 @@ public class TestingList extends Panel { String sDate = getNow(); DefaultTableModel model = (DefaultTableModel) jTable1.getModel(); jTable1.setModel(model); - jTable1.getColumnModel().getColumn(COL_ICON).setMaxWidth(27); - jTable1.getColumnModel().getColumn(COL_CHECK).setMaxWidth(27); - jTable1.getColumnModel().getColumn(COL_DEVICENAME).setPreferredWidth(30); - jTable1.getColumnModel().getColumn(COL_STATUS).setPreferredWidth(30); + jTable1.getColumnModel().getColumn(COL.ICON.index()).setMaxWidth(27); + jTable1.getColumnModel().getColumn(COL.CHECK.index()).setMaxWidth(27); + jTable1.getColumnModel().getColumn(COL.DEVICENAME.index()).setPreferredWidth(30); + jTable1.getColumnModel().getColumn(COL.STATUS.index()).setPreferredWidth(30); jTable1.setAutoCreateRowSorter(true); updateStatus(); }