Changeset 1520 for trunk/applications/NXvalidate/src/org/nexusformat/nxvalidate/NXLoadFilesDialog.java

Timestamp:

02/09/10 18:26:36 (21 months ago)

Author:

Stephen Rankin

Message:

Added save results feature and single file checking (NXDL). Update of Javadocs. ref#236.

File:

• trunk/applications/NXvalidate/src/org/nexusformat/nxvalidate/NXLoadFilesDialog.java (modified) (6 diffs)

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

@@ -28 +28 @@
 
 import java.io.File;
+import java.util.ResourceBundle;
 
 /**
@@ -38 +39 @@
     private File nxdl = null;
     private boolean OKButtonUsed = false;
-
+    private CheckNexusFileType check = null;
+    private ResourceBundle bundle = null;
     /** Creates new form NXLoadFilesDialog */
     public NXLoadFilesDialog(java.awt.Frame parent, boolean modal) {
         super(parent, modal);
         initComponents();
+        check = new CheckNexusFileType();
+        bundle = ResourceBundle.getBundle(
+                "org/nexusformat/nxvalidate/resources/nxvalidate");
     }
 
@@ -55 +60 @@
 
         jFileChooser1 = new javax.swing.JFileChooser();
+        messageOptionPane = new javax.swing.JOptionPane();
         jPanel1 = new javax.swing.JPanel();
         nxsLabel = new javax.swing.JLabel();
@@ -172 +178 @@
             if (returnVal == jFileChooser1.APPROVE_OPTION) {
                 nxs = jFileChooser1.getSelectedFile();
-                nxsTextField.setText(nxs.getAbsolutePath());
-                nxsTextField.setToolTipText(nxs.getAbsolutePath());
+
+                if(check.checkNexusFile(nxs)){
+                    nxsTextField.setText(nxs.getAbsolutePath());
+                    nxsTextField.setToolTipText(nxs.getAbsolutePath());
+                } else{
+                    nxs = null;
+                    messageOptionPane.showMessageDialog(this,
+                        bundle.getString("notNXDLFileMessage"));
+                }
+
+                
             } else {
                 nxs = null;
@@ -189 +204 @@
             if (returnVal == jFileChooser1.APPROVE_OPTION) {
                 nxdl = jFileChooser1.getSelectedFile();
-                nxdcTextField.setText(nxdl.getAbsolutePath());
-                nxdcTextField.setToolTipText(nxdl.getAbsolutePath());
+
+                if(check.checkNXDLFile(nxdl)){
+                    nxdcTextField.setText(nxdl.getAbsolutePath());
+                    nxdcTextField.setToolTipText(nxdl.getAbsolutePath());
+                } else{
+                    nxdl = null;
+                    messageOptionPane.showMessageDialog(this,
+                        bundle.getString("notNXDLFileMessage"));
+                }
+                
+                
             } else {
                 nxdl = null;
@@ -247 +271 @@
     private javax.swing.JFileChooser jFileChooser1;
     private javax.swing.JPanel jPanel1;
+    private javax.swing.JOptionPane messageOptionPane;
     private javax.swing.JTextField nxdcTextField;
     private javax.swing.JLabel nxdlLabel;