diff --git a/plugins/TestingList.form b/plugins/TestingList.form
index 49ac59c..91107d7 100644
--- a/plugins/TestingList.form
+++ b/plugins/TestingList.form
@@ -16,14 +16,14 @@
-
+
-
+
@@ -87,7 +87,7 @@
-
+
diff --git a/plugins/TestingList.java b/plugins/TestingList.java
index 808447e..2caab02 100644
--- a/plugins/TestingList.java
+++ b/plugins/TestingList.java
@@ -159,7 +159,7 @@ public class TestingList extends Panel {
// //GEN-BEGIN:initComponents
private void initComponents() {
- jButton1 = new javax.swing.JButton();
+ jButtonRun = new javax.swing.JButton();
jScrollPane2 = new javax.swing.JScrollPane();
jTable1 = new javax.swing.JTable();
jCheckBox1 = new javax.swing.JCheckBox();
@@ -168,13 +168,13 @@ public class TestingList extends Panel {
setLayout(new java.awt.BorderLayout());
- jButton1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icons/button_play.png"))); // NOI18N
- jButton1.addActionListener(new java.awt.event.ActionListener() {
+ jButtonRun.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icons/button_play.png"))); // NOI18N
+ jButtonRun.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
- jButton1ActionPerformed(evt);
+ jButtonRunActionPerformed(evt);
}
});
- add(jButton1, java.awt.BorderLayout.CENTER);
+ add(jButtonRun, java.awt.BorderLayout.CENTER);
jTable1.setFont(new java.awt.Font("Tahoma", 0, 15)); // NOI18N
jTable1.setModel(new javax.swing.table.DefaultTableModel(
@@ -207,12 +207,12 @@ public class TestingList extends Panel {
}
});
jTable1.addInputMethodListener(new java.awt.event.InputMethodListener() {
- public void inputMethodTextChanged(java.awt.event.InputMethodEvent evt) {
- jTable1InputMethodTextChanged(evt);
- }
public void caretPositionChanged(java.awt.event.InputMethodEvent evt) {
jTable1CaretPositionChanged(evt);
}
+ public void inputMethodTextChanged(java.awt.event.InputMethodEvent evt) {
+ jTable1InputMethodTextChanged(evt);
+ }
});
jTable1.addKeyListener(new java.awt.event.KeyAdapter() {
public void keyTyped(java.awt.event.KeyEvent evt) {
@@ -235,10 +235,10 @@ public class TestingList extends Panel {
jTextField1.setRows(5);
jScrollPane1.setViewportView(jTextField1);
- add(jScrollPane1, java.awt.BorderLayout.LINE_END);
+ add(jScrollPane1, java.awt.BorderLayout.PAGE_START);
}// //GEN-END:initComponents
- private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
+ private void jButtonRunActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButtonRunActionPerformed
try {
boolean var1 = true;
int var2 = 2;// (Integer)spinner.getValue();
@@ -254,7 +254,7 @@ public class TestingList extends Panel {
} catch (Exception ex) {
SwingUtils.showException(this, ex);
}
- }//GEN-LAST:event_jButton1ActionPerformed
+ }//GEN-LAST:event_jButtonRunActionPerformed
private void jCheckBox1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jCheckBox1ActionPerformed
boolean bSelected = jCheckBox1.isSelected();
@@ -303,7 +303,7 @@ public class TestingList extends Panel {
}//GEN-LAST:event_jTable1KeyTyped
// Variables declaration - do not modify//GEN-BEGIN:variables
- private javax.swing.JButton jButton1;
+ private javax.swing.JButton jButtonRun;
private javax.swing.JCheckBox jCheckBox1;
private javax.swing.JScrollPane jScrollPane1;
private javax.swing.JScrollPane jScrollPane2;
@@ -316,10 +316,10 @@ public class TestingList extends Panel {
String sDate = getNow();
ImageIcon icon = new ImageIcon(getClass().getResource("/icons/button_pause-16px.png"));
DefaultTableModel model = (DefaultTableModel) jTable1.getModel();
- model.addRow(new Object[] {false, sDate, "LS", "Check Status", "No comm", "Pending", icon});
+ /*model.addRow(new Object[] {false, sDate, "LS", "Check Status", "No comm", "Pending", icon});
model.addRow(new Object[] {true, sDate, "RS", "Calibrate", "Calibration done", "Pending", icon});
model.addRow(new Object[] {false, sDate, "MWD", "Display Test", "Sequence terminated", "Pending", icon});
- model.addRow(new Object[] {false, sDate, "FIXL", "Lamp Test", "Failure", "Pending", icon});
+ model.addRow(new Object[] {false, sDate, "FIXL", "Lamp Test", "Failure", "Pending", icon});*/
jTable1.setModel(model);
jTable1.getColumnModel().getColumn(6).setMaxWidth(27);
jTable1.getColumnModel().getColumn(0).setMaxWidth(27);
@@ -359,7 +359,7 @@ public class TestingList extends Panel {
public void loadTests() throws FileNotFoundException, IOException{
Properties prop = new Properties();
- String fileName = new java.io.File( "." ).getCanonicalPath()+ "\\home\\script\\tests\\devices";
+ String fileName = new java.io.File( "." ).getCanonicalPath()+ "\\home\\script\\tests\\production";
this.jTextField1.setText(fileName + "\n");
File folder = new File(fileName);
@@ -375,17 +375,13 @@ public class TestingList extends Panel {
prop.load(is);
- addToTable(prop.getProperty("name"), prop.getProperty("description"));
+ addToTable(prop.getProperty("name"), prop.getProperty("tests"));
this.jTextField1.append(prop.getProperty("name"));
+ this.jTextField1.append(prop.getProperty("description"));
+ this.jTextField1.append(prop.getProperty("tests"));
}
}
}
- //InputStream is = new FileInputStream(fileName);
-
- //prop.load(is);
-
- //addToTable(prop.getProperty("name"), prop.getProperty("description"));
- //this.jTextField1.append(prop.getProperty("name"));
}
public void selectFile(){