Index: trunk/src/scriptbuilder/structures/SimulationScript.java =================================================================== --- trunk/src/scriptbuilder/structures/SimulationScript.java (revision 46) +++ trunk/src/scriptbuilder/structures/SimulationScript.java (revision 49) @@ -49,4 +49,6 @@ Color.GRAY }; + + public File saveFile = null; public String title = ""; Index: trunk/src/scriptbuilder/gui/panels/IncidentTimelinePanel.java =================================================================== --- trunk/src/scriptbuilder/gui/panels/IncidentTimelinePanel.java (revision 31) +++ trunk/src/scriptbuilder/gui/panels/IncidentTimelinePanel.java (revision 49) @@ -161,5 +161,4 @@ { ed.setVisible(true); - System.out.println(incident.slices.get(newSlice).toXML()); } } Index: trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java =================================================================== --- trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java (revision 34) +++ trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java (revision 49) @@ -529,7 +529,4 @@ helpTutorial = new javax.swing.JMenuItem(); helpAbout = new javax.swing.JMenuItem(); - jMenu2 = new javax.swing.JMenu(); - XMLImportBtn = new javax.swing.JMenuItem(); - XMLExportBtn = new javax.swing.JMenuItem(); popupDeleteIncident.setText("Delete Incident..."); @@ -1310,5 +1307,5 @@ .addGroup(scriptEventsPanelLayout.createSequentialGroup() .addContainerGap() - .addComponent(scriptEventsPane, javax.swing.GroupLayout.DEFAULT_SIZE, 485, Short.MAX_VALUE) + .addComponent(scriptEventsPane) .addContainerGap()) ); @@ -1365,5 +1362,5 @@ .addContainerGap() .addGroup(scriptEventsPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(incidentDescriptionPane, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 453, Short.MAX_VALUE) + .addComponent(incidentDescriptionPane, javax.swing.GroupLayout.Alignment.TRAILING) .addComponent(jLabel4) .addGroup(scriptEventsPanel1Layout.createSequentialGroup() @@ -1373,6 +1370,6 @@ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(scriptEventsPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(incidentName, javax.swing.GroupLayout.DEFAULT_SIZE, 366, Short.MAX_VALUE) - .addComponent(incidentNumber, javax.swing.GroupLayout.DEFAULT_SIZE, 366, Short.MAX_VALUE)))) + .addComponent(incidentName) + .addComponent(incidentNumber)))) .addContainerGap()) ); @@ -1963,28 +1960,4 @@ scriptBuilderMenuBar.add(helpMenu); - jMenu2.setText("XML"); - - XMLImportBtn.setText("Import from XML"); - XMLImportBtn.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent evt) - { - XMLImportBtnActionPerformed(evt); - } - }); - jMenu2.add(XMLImportBtn); - - XMLExportBtn.setText("Export to XML"); - XMLExportBtn.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent evt) - { - XMLExportBtnActionPerformed(evt); - } - }); - jMenu2.add(XMLExportBtn); - - scriptBuilderMenuBar.add(jMenu2); - setJMenuBar(scriptBuilderMenuBar); @@ -2266,9 +2239,16 @@ private void fileOpenActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_fileOpenActionPerformed JFileChooser fc = new JFileChooser(); - fc.setFileFilter(new ExtensionFileFilter("Simulation Script (.xml)", new String[] - { - "xml" - })); - fc.showOpenDialog(this); + + fc.setFileFilter(new ExtensionFileFilter("Simulation Script XML (.xml)", + new String[] + { + "xml" + })); + if (fc.showOpenDialog(this) == JFileChooser.APPROVE_OPTION) + { + System.out.println(fc.getSelectedFile().getName()); + script.loadScriptFromFile(fc.getSelectedFile()); + script.saveFile = fc.getSelectedFile(); + } }//GEN-LAST:event_fileOpenActionPerformed @@ -2281,9 +2261,16 @@ private void fileSaveAsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_fileSaveAsActionPerformed JFileChooser fc = new JFileChooser(); - fc.setFileFilter(new ExtensionFileFilter("Simulation Script (.xml)", new String[] - { - "xml" - })); - fc.showSaveDialog(this); + + fc.setFileFilter(new ExtensionFileFilter("Simulation Script XML (.xml)", + new String[] + { + "xml" + })); + + if (fc.showSaveDialog(this) == JFileChooser.APPROVE_OPTION) + { + script.saveScriptToFile(fc.getSelectedFile()); + script.saveFile = fc.getSelectedFile(); + } }//GEN-LAST:event_fileSaveAsActionPerformed @@ -2295,10 +2282,12 @@ */ private void fileSaveActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_fileSaveActionPerformed - JFileChooser fc = new JFileChooser(); - fc.setFileFilter(new ExtensionFileFilter("Simulation Script (.xml)", new String[] - { - "xml" - })); - fc.showSaveDialog(this); + if (script.saveFile == null) + { + fileSaveAsActionPerformed(evt); + } + else + { + script.saveScriptToFile(script.saveFile); + } }//GEN-LAST:event_fileSaveActionPerformed @@ -2746,41 +2735,4 @@ }//GEN-LAST:event_jButton3ActionPerformed - private void XMLExportBtnActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_XMLExportBtnActionPerformed - {//GEN-HEADEREND:event_XMLExportBtnActionPerformed - JFileChooser fc = new JFileChooser(); - - fc.setFileFilter(new ExtensionFileFilter("Simulation Script XML (.xml)", - new String[] - { - "xml" - })); - - if (fc.showSaveDialog(this) == JFileChooser.APPROVE_OPTION) - { - script.saveScriptToFile(fc.getSelectedFile()); - } - }//GEN-LAST:event_XMLExportBtnActionPerformed - - /** - * Upon click of the "Import From XML" menu option, allows user to choose an - * XML script, and loads it into the script model. - * - * @param evt the button press event - */ - private void XMLImportBtnActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_XMLImportBtnActionPerformed - {//GEN-HEADEREND:event_XMLImportBtnActionPerformed - JFileChooser fc = new JFileChooser(); - - fc.setFileFilter(new ExtensionFileFilter("Simulation Script XML (.xml)", - new String[] - { - "xml" - })); - if (fc.showOpenDialog(this) == JFileChooser.APPROVE_OPTION) - { - System.out.println(fc.getSelectedFile().getName()); - script.loadScriptFromFile(fc.getSelectedFile()); - } - }//GEN-LAST:event_XMLImportBtnActionPerformed /* Help > About simply displays the current SVN revision number so * the user can determine which version of the source code was used to @@ -2877,6 +2829,4 @@ } // Variables declaration - do not modify//GEN-BEGIN:variables - private javax.swing.JMenuItem XMLExportBtn; - private javax.swing.JMenuItem XMLImportBtn; private javax.swing.JButton activityLogEvalButton; private javax.swing.JTextArea addIncidentDescription; @@ -2971,5 +2921,4 @@ private javax.swing.JLabel jLabel8; private javax.swing.JLabel jLabel9; - private javax.swing.JMenu jMenu2; private javax.swing.JMenuItem jMenuItem2; private javax.swing.JMenuItem jMenuItem3; Index: trunk/src/scriptbuilder/gui/ScriptBuilderFrame.form =================================================================== --- trunk/src/scriptbuilder/gui/ScriptBuilderFrame.form (revision 11) +++ trunk/src/scriptbuilder/gui/ScriptBuilderFrame.form (revision 49) @@ -844,27 +844,4 @@ - - - - - - - - - - - - - - - - - - - - - - -