diff --git a/plugins/Kollimators.form b/plugins/Kollimators.form index 857a444..5b3d8bd 100644 --- a/plugins/Kollimators.form +++ b/plugins/Kollimators.form @@ -171,9 +171,6 @@ - - - diff --git a/plugins/Kollimators.java b/plugins/Kollimators.java index d42ac5a..4730746 100644 --- a/plugins/Kollimators.java +++ b/plugins/Kollimators.java @@ -11,6 +11,8 @@ public class Kollimators extends javax.swing.JPanel { /** * Creates new form Kollimators + * + * @param params currently not used */ public Kollimators(String params) { initComponents(); @@ -70,11 +72,6 @@ public class Kollimators extends javax.swing.JPanel { jLabel7.setText("DIST:"); jTextDist.setEditable(false); - jTextDist.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - jTextDistActionPerformed(evt); - } - }); jTextRes.setEditable(false); @@ -158,13 +155,10 @@ public class Kollimators extends javax.swing.JPanel { ); }// //GEN-END:initComponents - private void jTextDistActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jTextDistActionPerformed - // TODO add your handling code here: - }//GEN-LAST:event_jTextDistActionPerformed - /** - * animate the panel (caget/caset). Called from TestingList + * animate the panel (caget/caset). Called from TestingList. + * This function MUST EXISTS in every custom panel callable from TestingList * @param deviceName */ public void animate(String deviceName){ diff --git a/plugins/TestingList.java b/plugins/TestingList.java index f9a3459..b4c7d36 100644 --- a/plugins/TestingList.java +++ b/plugins/TestingList.java @@ -513,7 +513,7 @@ public class TestingList extends Panel { if(sStartSequence.equals(StartSequence.TOGETHER.toString())){ SwingUtils.OptionResult ret = SwingUtils.showOption(this, "Modify Start mode", "A custom panel is active. Tests can only run in sequence (Start mode: 'After previous'). "+ - "\nDo you want to set all tests Start mode to 'After previous'?", + "\nDo you want to keep the custom panel open and set all tests Start mode to 'After previous'?", OptionType.YesNo); if(ret == SwingUtils.OptionResult.Yes){ changeSequenceToAfter = true ; @@ -2103,7 +2103,7 @@ public class TestingList extends Panel { //System.out.println(sParallelizeCommand); //run test(s) Object ret = eval(sParallelizeCommand); - System.out.println(ret); + //System.out.println(ret); String sTestResult, sTestStatus; if(ret == null){ SwingUtils.showMessage(TestingList.this, "executeParallelTestsGroup()", "The test script(s) did not return any feedback."); @@ -2135,7 +2135,7 @@ public class TestingList extends Panel { sDeviceName = String.valueOf(hTest.get(testArgNames.DEVICE.toString())); sTestName = String.valueOf(hTest.get(testArgNames.TEST.toString())); } - System.out.println("Result: " + sDeviceName + "|" + sTestPath + "|" + sTestResult + "|" + sTestStatus); + //System.out.println("Result: " + sDeviceName + "|" + sTestPath + "|" + sTestResult + "|" + sTestStatus); iLastExecutedTestIndex = showResult(sDeviceName, sTestPath, sTestResult, sTestStatus); } } catch (StatementException intEx) {