Changeset 49 in tmcsimulator-scriptbuilder for trunk/src/scriptbuilder

Timestamp:

08/08/2017 09:55:18 AM (9 years ago)

Author:

bmcguffin

Message:

Updated menu dropdowns; added functionality for Save, Save As, and Open Script menu options.

Location:

trunk/src/scriptbuilder

Files:

• gui/ScriptBuilderFrame.form (modified) (1 diff)
• gui/ScriptBuilderFrame.java (modified) (11 diffs)
• gui/panels/IncidentTimelinePanel.java (modified) (1 diff)
• structures/SimulationScript.java (modified) (1 diff)

trunk/src/scriptbuilder/gui/ScriptBuilderFrame.form

@@ -844 +844 @@
           </SubComponents>
         </Menu>
-        <Menu class="javax.swing.JMenu" name="jMenu2">
-          <Properties>
-            <Property name="text" type="java.lang.String" value="XML"/>
-          </Properties>
-          <SubComponents>
-            <MenuItem class="javax.swing.JMenuItem" name="XMLImportBtn">
-              <Properties>
-                <Property name="text" type="java.lang.String" value="Import from XML"/>
-              </Properties>
-              <Events>
-                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="XMLImportBtnActionPerformed"/>
-              </Events>
-            </MenuItem>
-            <MenuItem class="javax.swing.JMenuItem" name="XMLExportBtn">
-              <Properties>
-                <Property name="text" type="java.lang.String" value="Export to XML"/>
-              </Properties>
-              <Events>
-                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="XMLExportBtnActionPerformed"/>
-              </Events>
-            </MenuItem>
-          </SubComponents>
-        </Menu>
       </SubComponents>
     </Menu>

trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java

@@ -529 +529 @@
         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 +1307 @@
             .addGroup(scriptEventsPanelLayout.createSequentialGroup()
                 .addContainerGap()
-                .addComponent(scriptEventsPane, javax.swing.GroupLayout.DEFAULT_SIZE, 485, Short.MAX_VALUE)
+                .addComponent(scriptEventsPane)
                 .addContainerGap())
         );
@@ -1365 +1362 @@
                 .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 +1370 @@
                         .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 +1960 @@
         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 +2239 @@
     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 +2261 @@
     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 +2282 @@
      */
     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 +2735 @@
     }//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 +2829 @@
     }
     // 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 +2921 @@
     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;

trunk/src/scriptbuilder/gui/panels/IncidentTimelinePanel.java

@@ -161 +161 @@
             {
                 ed.setVisible(true);
-                System.out.println(incident.slices.get(newSlice).toXML());
             }
         }

trunk/src/scriptbuilder/structures/SimulationScript.java

@@ -49 +49 @@
         Color.GRAY
     };
+    
+    public File saveFile = null;
 
     public String title = "";