diff --git a/plugins/TestingList.form b/plugins/TestingList.form
index 44ca9f0..091b617 100644
--- a/plugins/TestingList.form
+++ b/plugins/TestingList.form
@@ -18,19 +18,23 @@
-
+
-
+
+
+
+
+
-
-
+
+
-
+
@@ -40,8 +44,16 @@
-
-
+
+
+
+
+
+
+
+
+
+
@@ -93,5 +105,7 @@
+
+
diff --git a/plugins/TestingList.java b/plugins/TestingList.java
index adbf715..4d3cee0 100644
--- a/plugins/TestingList.java
+++ b/plugins/TestingList.java
@@ -54,6 +54,7 @@ public class TestingList extends Panel {
Object ret = eval("ret");
if (ret != null) {
SwingUtils.showMessage(getComponent(), "", ret.toString() + " - " + ret.getClass().getName());
+
//showResult(ret.toString());
}
break;
@@ -64,9 +65,6 @@ public class TestingList extends Panel {
}
}
-
-
-
public class NetbeansPluginPanel extends MonitoredPanel {
@@ -88,6 +86,7 @@ public class TestingList extends Panel {
txtOutput = new javax.swing.JTextArea();
jScrollPane2 = new javax.swing.JScrollPane();
jTable1 = new javax.swing.JTable();
+ deviceStatePanel1 = new ch.psi.pshell.swing.DeviceStatePanel();
jButton1.setText("jButton1");
jButton1.addActionListener(new java.awt.event.ActionListener() {
@@ -122,12 +121,15 @@ public class TestingList extends Panel {
.addGroup(layout.createSequentialGroup()
.addGap(244, 244, 244)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addGroup(layout.createSequentialGroup()
+ .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(deviceStatePanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addComponent(jButton1)))
.addGroup(layout.createSequentialGroup()
- .addGap(144, 144, 144)
- .addComponent(jScrollPane2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
- .addContainerGap(224, Short.MAX_VALUE))
+ .addContainerGap()
+ .addComponent(jScrollPane2, javax.swing.GroupLayout.PREFERRED_SIZE, 783, javax.swing.GroupLayout.PREFERRED_SIZE)))
+ .addContainerGap(25, Short.MAX_VALUE))
);
layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -135,8 +137,13 @@ public class TestingList extends Panel {
.addGap(42, 42, 42)
.addComponent(jButton1)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
- .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addGap(28, 28, 28)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createSequentialGroup()
+ .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addGap(28, 28, 28))
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
+ .addComponent(deviceStatePanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addGap(90, 90, 90)))
.addComponent(jScrollPane2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addContainerGap(18, Short.MAX_VALUE))
);
@@ -147,6 +154,7 @@ public class TestingList extends Panel {
}//GEN-LAST:event_jButton1ActionPerformed
// Variables declaration - do not modify//GEN-BEGIN:variables
+ private ch.psi.pshell.swing.DeviceStatePanel deviceStatePanel1;
private javax.swing.JButton jButton1;
private javax.swing.JScrollPane jScrollPane1;
private javax.swing.JScrollPane jScrollPane2;
@@ -163,7 +171,7 @@ public class TestingList extends Panel {
String sDate = dateFormat.format(date);
Object[] columnNames = {"Time", "Device", "Test", "Result", "Success"};
Object[][] data = {
- {sDate, "LS", "Check Status", "No comm", Boolean.TRUE},
+ {sDate, "LS", "Check Status", "No comm", false},
{sDate, "RS", "Calibrate", "Calibration done", true},
{sDate, "MWD", "Display Test", "Sequence terminated", true},
{sDate, "FIXL", "Lamp Test", "Failure", false}