Changeset 1520 for trunk/applications/NXvalidate/src/org/nexusformat/nxvalidate/NXvalidateFrame.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/NXvalidateFrame.java (modified) (11 diffs)

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

@@ -64 +64 @@
     private UserSettings settings = null;
     private File nxconvertFile = null;
+    private File saveDirectory = null;
     private boolean foundNXconvert = false;
     private MouseListener popupListener = null;
     private TextPaneStyle txtStyle = null;
-    private FileLoadingActions fileLoadingActions = null;
+    private FileActions fileLoadingActions = null;
 
     /** Creates new form NXvalidateFrame */
@@ -130 +131 @@
         txtStyle = new TextPaneStyle(jTextPane1);
 
-        fileLoadingActions = new FileLoadingActions(this, jTree1, builder, domTree, root);
+        fileLoadingActions = new FileActions(this, jTree1, builder, domTree, root);
 
     }
@@ -146 +147 @@
         treePopupMenu = new javax.swing.JPopupMenu();
         closeFileMenuItem = new javax.swing.JMenuItem();
+        jFileChooser1 = new javax.swing.JFileChooser();
         jPanel2 = new javax.swing.JPanel();
         jSplitPane1 = new javax.swing.JSplitPane();
@@ -156 +158 @@
         openFilesMenuItem = new javax.swing.JMenuItem();
         jSeparator4 = new javax.swing.JPopupMenu.Separator();
+        saveMenuItem = new javax.swing.JMenuItem();
+        jSeparator7 = new javax.swing.JPopupMenu.Separator();
         closeAllMenuItem = new javax.swing.JMenuItem();
         jSeparator5 = new javax.swing.JPopupMenu.Separator();
@@ -231 +235 @@
         fileMenu.add(jSeparator4);
 
+        saveMenuItem.setText("Save Results");
+        saveMenuItem.setToolTipText("Save results to files.");
+        saveMenuItem.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                saveMenuItemActionPerformed(evt);
+            }
+        });
+        fileMenu.add(saveMenuItem);
+        fileMenu.add(jSeparator7);
+
         closeAllMenuItem.setText("Close All Files");
         closeAllMenuItem.addActionListener(new java.awt.event.ActionListener() {
@@ -321 +335 @@
 
     private boolean loadOpenFilesDialog() {
+
+        NXLoadFilesDialog loadFile = new NXLoadFilesDialog(this, true);
+        loadFile.setModalityType(ModalityType.APPLICATION_MODAL);
+        loadFile.setVisible(true);
+        nxsFile = loadFile.getNXSFile();
+        nxdlFile = loadFile.getNXDLFile();
+        return loadFile.OKButtonUsed();
+
+    }
+
+    private boolean saveResultsFilesDialog() {
 
         NXLoadFilesDialog loadFile = new NXLoadFilesDialog(this, true);
@@ -461 +486 @@
                     dialogReportProblem.showMessageDialog(this,
                             bundle.getString("openSchemaFileMessage"));
-
-                    
                 }
             }
@@ -511 +534 @@
     private void exitAppMenuItemActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_exitAppMenuItemActionPerformed
         if (evt.getSource() == exitAppMenuItem) {
-
             this.dispose();
-
         }
     }//GEN-LAST:event_exitAppMenuItemActionPerformed
@@ -550 +571 @@
 
         if (evt.getSource() == filterMenuItem) {
-
             treeUtils.hideGoodNodes(jTree1);
-
         }
 
     }//GEN-LAST:event_filterMenuItemActionPerformed
+
+    private void saveMenuItemActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_saveMenuItemActionPerformed
+       if (evt.getSource() == saveMenuItem) {
+
+            jFileChooser1.setMultiSelectionEnabled(false);
+            jFileChooser1.setFileSelectionMode(jFileChooser1.DIRECTORIES_ONLY);
+            jFileChooser1.setApproveButtonText("Save");
+            int returnVal = jFileChooser1.showOpenDialog(this);
+
+            if (returnVal == jFileChooser1.APPROVE_OPTION) {
+
+                saveDirectory = jFileChooser1.getSelectedFile();
+
+                if(!saveDirectory.exists()){
+                    saveDirectory.mkdir();
+                }
+
+                fileLoadingActions.setSaveDirectory(saveDirectory);
+                fileLoadingActions.setWhich(6);
+                Thread thread = new Thread(fileLoadingActions);
+                thread.start();
+
+                dialogReportProblem.showMessageDialog(
+                    this,
+                    bundle.getString("savedResultsMessage"));
+
+            } else {
+                saveDirectory = null;
+            }
+
+        }
+    }//GEN-LAST:event_saveMenuItemActionPerformed
 
     /**
@@ -581 +632 @@
     private javax.swing.JMenu helpMenu;
     private javax.swing.JMenuItem helpMenuItem;
+    private javax.swing.JFileChooser jFileChooser1;
     private javax.swing.JMenuBar jMenuBar1;
     private javax.swing.JPanel jPanel2;
@@ -591 +643 @@
     private javax.swing.JPopupMenu.Separator jSeparator5;
     private javax.swing.JPopupMenu.Separator jSeparator6;
+    private javax.swing.JPopupMenu.Separator jSeparator7;
     private javax.swing.JSplitPane jSplitPane1;
     private javax.swing.JTextPane jTextPane1;
     private javax.swing.JTree jTree1;
     private javax.swing.JMenuItem openFilesMenuItem;
+    private javax.swing.JMenuItem saveMenuItem;
     private javax.swing.JMenuItem settingsMenuItem;
     private javax.swing.JMenu toolsMenu;