Closedown
This commit is contained in:
@@ -85,7 +85,6 @@ public class TestingList extends Panel {
|
||||
int COL_RESULT = 3;
|
||||
int COL_SUCCESS = 4;
|
||||
|
||||
txtOutput.setText(res);
|
||||
int rowD=-1, colT=-1;
|
||||
//search for device name in table
|
||||
for (int row = 0; row <= jTable1.getRowCount() - 1; row++) {
|
||||
@@ -110,7 +109,15 @@ public class TestingList extends Panel {
|
||||
}
|
||||
if(colT>0 && rowD>0){
|
||||
jTable1.setValueAt(res, rowD, COL_RESULT);
|
||||
jTable1.setValueAt(success, rowD, COL_SUCCESS);
|
||||
String sStatus;
|
||||
if(success){
|
||||
sStatus = "Success";
|
||||
}
|
||||
else{
|
||||
sStatus = "Fail";
|
||||
}
|
||||
|
||||
jTable1.setValueAt(sStatus, rowD, COL_SUCCESS);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -118,8 +125,6 @@ public class TestingList extends Panel {
|
||||
private void initComponents() {
|
||||
|
||||
jButton1 = new javax.swing.JButton();
|
||||
jScrollPane1 = new javax.swing.JScrollPane();
|
||||
txtOutput = new javax.swing.JTextArea();
|
||||
jScrollPane2 = new javax.swing.JScrollPane();
|
||||
jTable1 = new javax.swing.JTable();
|
||||
deviceStatePanel1 = new ch.psi.pshell.swing.DeviceStatePanel();
|
||||
@@ -131,10 +136,6 @@ public class TestingList extends Panel {
|
||||
}
|
||||
});
|
||||
|
||||
txtOutput.setColumns(20);
|
||||
txtOutput.setRows(5);
|
||||
jScrollPane1.setViewportView(txtOutput);
|
||||
|
||||
jTable1.setModel(new javax.swing.table.DefaultTableModel(
|
||||
new Object [][] {
|
||||
{null, null, null, null},
|
||||
@@ -158,8 +159,7 @@ public class TestingList extends Panel {
|
||||
.addGap(244, 244, 244)
|
||||
.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)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addGap(213, 213, 213)
|
||||
.addComponent(deviceStatePanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addComponent(jButton1)))
|
||||
.addGroup(layout.createSequentialGroup()
|
||||
@@ -172,14 +172,9 @@ public class TestingList extends Panel {
|
||||
.addGroup(layout.createSequentialGroup()
|
||||
.addGap(42, 42, 42)
|
||||
.addComponent(jButton1)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||
.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)))
|
||||
.addGap(28, 28, 28)
|
||||
.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))
|
||||
);
|
||||
@@ -207,10 +202,8 @@ public class TestingList extends Panel {
|
||||
// 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;
|
||||
private javax.swing.JTable jTable1;
|
||||
private javax.swing.JTextArea txtOutput;
|
||||
// End of variables declaration//GEN-END:variables
|
||||
|
||||
//table with checkboxes
|
||||
@@ -219,7 +212,7 @@ public class TestingList extends Panel {
|
||||
DateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
|
||||
Date date = new Date();
|
||||
String sDate = dateFormat.format(date);
|
||||
Object[] columnNames = {"Time", "Device", "Test", "Result", "Success"};
|
||||
Object[] columnNames = {"Time", "Device", "Test", "Result", "Status"};
|
||||
Object[][] data = {
|
||||
{sDate, "LS", "Check Status", "No comm", false},
|
||||
{sDate, "RS", "Calibrate", "Calibration done", true},
|
||||
|
||||
Reference in New Issue
Block a user