Closedown

2015-06-23 10:55:07 +02:00
parent 768210774f
commit f181ea908a
6 changed files with 123 additions and 101 deletions
--- a/plugins/TestingListDetails.java
+++ b/plugins/TestingListDetails.java
@@ -41,20 +41,21 @@ public class TestingListDetails extends javax.swing.JPanel {
        txtDeviceName = new javax.swing.JTextField();
        jLabel2 = new javax.swing.JLabel();
        txtDeviceDescription = new javax.swing.JTextField();
-        jLabel3 = new javax.swing.JLabel();
        jLabel4 = new javax.swing.JLabel();
        txtTestSuite = new javax.swing.JTextField();
        jLabel5 = new javax.swing.JLabel();
        txtTestName = new javax.swing.JTextField();
        jLabel6 = new javax.swing.JLabel();
-        txtTestResult = new javax.swing.JTextField();
        jScrollPane1 = new javax.swing.JScrollPane();
        jTableParams = new javax.swing.JTable();
        jLabel7 = new javax.swing.JLabel();
        cmCancel = new javax.swing.JButton();
        cmOk = new javax.swing.JButton();
        cmDefault = new javax.swing.JButton();
-        txtTime = new javax.swing.JTextField();
+        jScrollPane2 = new javax.swing.JScrollPane();
+        txtTestResult = new javax.swing.JTextArea();
+        jLabel8 = new javax.swing.JLabel();
+        txtTestDescription = new javax.swing.JTextField();

        jLabel1.setText("Device name");

@@ -64,9 +65,6 @@ public class TestingListDetails extends javax.swing.JPanel {

        txtDeviceDescription.setText("jTextField2");

-        jLabel3.setFont(new java.awt.Font("Tahoma", 0, 18)); // NOI18N
-        jLabel3.setText("Test details");
-
        jLabel4.setText("Test Case/Suite");

        txtTestSuite.setText("jTextField2");
@@ -77,8 +75,6 @@ public class TestingListDetails extends javax.swing.JPanel {

        jLabel6.setText("Last Test Result");

-        txtTestResult.setText("jTextField2");
-
        jTableParams.setModel(new javax.swing.table.DefaultTableModel(
            new Object [][] {

@@ -88,7 +84,7 @@ public class TestingListDetails extends javax.swing.JPanel {
            }
        ) {
            boolean[] canEdit = new boolean [] {
-                false, false, false
+                false, true, false
            };

            public boolean isCellEditable(int rowIndex, int columnIndex) {
@@ -125,7 +121,13 @@ public class TestingListDetails extends javax.swing.JPanel {
        this.cmOk.setVisible(false);
        this.cmDefault.setVisible(false);

-        txtTime.setText("jTextField1");
+        txtTestResult.setColumns(20);
+        txtTestResult.setRows(5);
+        jScrollPane2.setViewportView(txtTestResult);
+
+        jLabel8.setText("Test Description");
+
+        txtTestDescription.setText("jTextField2");

        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
        this.setLayout(layout);
@@ -141,18 +143,21 @@ public class TestingListDetails extends javax.swing.JPanel {
                        .addComponent(jLabel5, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                        .addGap(383, 383, 383))
                    .addGroup(layout.createSequentialGroup()
-                        .addComponent(jLabel6, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                        .addGap(246, 246, 246))
+                        .addComponent(jLabel8, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                        .addGap(362, 362, 362))
                    .addGroup(layout.createSequentialGroup()
-                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                            .addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, 528, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
+                            .addGroup(layout.createSequentialGroup()
+                                .addGap(0, 109, Short.MAX_VALUE)
+                                .addComponent(txtTestDescription, javax.swing.GroupLayout.PREFERRED_SIZE, 673, javax.swing.GroupLayout.PREFERRED_SIZE))
                            .addGroup(layout.createSequentialGroup()
                                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                                    .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
                                        .addComponent(jLabel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                                        .addComponent(jLabel2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
-                                    .addComponent(jLabel7))
-                                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                                    .addComponent(jLabel7)
+                                    .addComponent(jLabel6, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
                                    .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
                                        .addComponent(cmDefault, javax.swing.GroupLayout.PREFERRED_SIZE, 132, javax.swing.GroupLayout.PREFERRED_SIZE)
@@ -160,23 +165,18 @@ public class TestingListDetails extends javax.swing.JPanel {
                                        .addComponent(cmOk, javax.swing.GroupLayout.PREFERRED_SIZE, 96, javax.swing.GroupLayout.PREFERRED_SIZE)
                                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                                        .addComponent(cmCancel, javax.swing.GroupLayout.PREFERRED_SIZE, 98, javax.swing.GroupLayout.PREFERRED_SIZE))
-                                    .addComponent(txtTestName, javax.swing.GroupLayout.Alignment.TRAILING)
                                    .addComponent(txtDeviceName)
                                    .addComponent(txtDeviceDescription)
+                                    .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 673, Short.MAX_VALUE)
                                    .addComponent(txtTestSuite)
-                                    .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 666, Short.MAX_VALUE)
-                                    .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
-                                        .addComponent(txtTestResult)
-                                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                                        .addComponent(txtTime, javax.swing.GroupLayout.PREFERRED_SIZE, 148, javax.swing.GroupLayout.PREFERRED_SIZE)))))
+                                    .addComponent(txtTestName, javax.swing.GroupLayout.Alignment.TRAILING)
+                                    .addComponent(jScrollPane2))))
                        .addContainerGap(21, Short.MAX_VALUE))))
        );
        layout.setVerticalGroup(
            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
            .addGroup(layout.createSequentialGroup()
                .addContainerGap()
-                .addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, 22, javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addGap(18, 18, 18)
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                    .addComponent(jLabel1)
                    .addComponent(txtDeviceName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
@@ -194,13 +194,16 @@ public class TestingListDetails extends javax.swing.JPanel {
                    .addComponent(txtTestName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                    .addComponent(jLabel6)
-                    .addComponent(txtTestResult, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(txtTime, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                .addGap(18, 18, 18)
+                    .addComponent(jLabel8)
+                    .addComponent(txtTestDescription, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addGap(8, 8, 8)
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addComponent(jScrollPane2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(jLabel6))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                    .addComponent(jLabel7)
-                    .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 200, javax.swing.GroupLayout.PREFERRED_SIZE))
+                    .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 212, javax.swing.GroupLayout.PREFERRED_SIZE))
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                    .addComponent(cmOk, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
@@ -213,10 +216,10 @@ public class TestingListDetails extends javax.swing.JPanel {
    private void fillComponents(HashMap hDetails) {
        this.txtDeviceName.setText(hDetails.get("deviceName").toString());
        this.txtDeviceDescription.setText(hDetails.get("deviceDescription").toString());
+        this.txtTestDescription.setText(hDetails.get("testDescription").toString());
        this.txtTestSuite.setText(hDetails.get("testSuite").toString());
        this.txtTestName.setText(hDetails.get("testName").toString());
-        this.txtTestResult.setText(hDetails.get("testResult").toString());
-        this.txtTime.setText(hDetails.get("time").toString());
+        this.txtTestResult.setText(hDetails.get("time").toString() + "\n" + hDetails.get("testResult").toString());
        //parameters table
        HashMap hParams = (HashMap) hDetails.get("parameters");
        String name="", value="", description="";
@@ -246,18 +249,19 @@ public class TestingListDetails extends javax.swing.JPanel {
    private javax.swing.JButton cmOk;
    private javax.swing.JLabel jLabel1;
    private javax.swing.JLabel jLabel2;
-    private javax.swing.JLabel jLabel3;
    private javax.swing.JLabel jLabel4;
    private javax.swing.JLabel jLabel5;
    private javax.swing.JLabel jLabel6;
    private javax.swing.JLabel jLabel7;
+    private javax.swing.JLabel jLabel8;
    private javax.swing.JScrollPane jScrollPane1;
+    private javax.swing.JScrollPane jScrollPane2;
    private javax.swing.JTable jTableParams;
    private javax.swing.JTextField txtDeviceDescription;
    private javax.swing.JTextField txtDeviceName;
+    private javax.swing.JTextField txtTestDescription;
    private javax.swing.JTextField txtTestName;
-    private javax.swing.JTextField txtTestResult;
+    private javax.swing.JTextArea txtTestResult;
    private javax.swing.JTextField txtTestSuite;
-    private javax.swing.JTextField txtTime;
    // End of variables declaration//GEN-END:variables
 }