Changeset 1504 for trunk/applications/NXconvertpy/src/org/nexusformat/nxvalidate/NXLoadFilesDialog.java

Timestamp:

13/08/10 16:34:17 (22 months ago)

Author:

Stephen Rankin

Message:

Bulk Load working but not really tested. Fixed various bugs fixed, but single file validation is not working now! Close all files function added. Check for NEXUS/HDF files added. Added threads for file loading actions. Some refactoring of code. refs #236.

File:

• trunk/applications/NXconvertpy/src/org/nexusformat/nxvalidate/NXLoadFilesDialog.java (modified) (9 diffs)

trunk/applications/NXconvertpy/src/org/nexusformat/nxvalidate/NXLoadFilesDialog.java

@@ -21 +21 @@
 
     private File nxs = null;
-    private File nxdc = null;
+    private File nxdl = null;
     private boolean OKButtonUsed = false;
     /** Creates new form NXLoadFilesDialog */
@@ -43 +43 @@
         nxsTextField = new javax.swing.JTextField();
         openButton1 = new javax.swing.JButton();
-        nxdcLabel = new javax.swing.JLabel();
+        nxdlLabel = new javax.swing.JLabel();
         nxdcTextField = new javax.swing.JTextField();
         openButton2 = new javax.swing.JButton();
@@ -66 +66 @@
         });
 
-        nxdcLabel.setText("Load NXDC:");
+        nxdlLabel.setText("Load NXDL:");
 
         nxdcTextField.setEditable(false);
@@ -101 +101 @@
                         .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                             .addComponent(nxsLabel)
-                            .addComponent(nxdcLabel))
+                            .addComponent(nxdlLabel))
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                         .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
@@ -109 +109 @@
                 .addGap(15, 15, 15)
                 .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
-                    .addGroup(jPanel1Layout.createSequentialGroup()
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(openButton1)
-                        .addContainerGap())
-                    .addGroup(jPanel1Layout.createSequentialGroup()
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(openButton2)
-                        .addContainerGap())
-                    .addGroup(jPanel1Layout.createSequentialGroup()
-                        .addComponent(OKButton)
-                        .addContainerGap())))
+                    .addComponent(openButton1)
+                    .addComponent(openButton2)
+                    .addComponent(OKButton))
+                .addContainerGap())
         );
         jPanel1Layout.setVerticalGroup(
@@ -131 +124 @@
                 .addGap(28, 28, 28)
                 .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                    .addComponent(nxdcLabel)
+                    .addComponent(nxdlLabel)
                     .addComponent(nxdcTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                     .addComponent(openButton2))
@@ -179 +172 @@
 
             if (returnVal == jFileChooser1.APPROVE_OPTION) {
-                nxdc = jFileChooser1.getSelectedFile();
-                nxdcTextField.setText(nxdc.getAbsolutePath());
-                nxdcTextField.setToolTipText(nxdc.getAbsolutePath());
+                nxdl = jFileChooser1.getSelectedFile();
+                nxdcTextField.setText(nxdl.getAbsolutePath());
+                nxdcTextField.setToolTipText(nxdl.getAbsolutePath());
             } else {
-                nxdc = null;
+                nxdl = null;
             }
 
@@ -207 +200 @@
         return nxs;
     }
-    public File getNXDCFile(){
-        return nxdc;
+    public File getNXDLFile(){
+        return nxdl;
     }
 
@@ -237 +230 @@
     private javax.swing.JFileChooser jFileChooser1;
     private javax.swing.JPanel jPanel1;
-    private javax.swing.JLabel nxdcLabel;
     private javax.swing.JTextField nxdcTextField;
+    private javax.swing.JLabel nxdlLabel;
     private javax.swing.JLabel nxsLabel;
     private javax.swing.JTextField nxsTextField;