Changeset 158 in tmcsimulator-scriptbuilder for trunk/src

Timestamp:

11/22/2019 04:22:14 PM (6 years ago)

Author:

jdalbey

Message:

ScriptBuilderFrame?.java added new helper method loadCHPunits(). SimulationScript?.java changed load units method to accept an InputStream? instead of a File.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/scriptbuilder/gui/ScriptBuilderFrame.java (modified) (6 diffs)
• src/scriptbuilder/gui/application.properties (modified) (1 diff)
• src/scriptbuilder/structures/SimulationScript.java (modified) (1 diff)

trunk

@@ -1 +1 @@
 build
 dist
+deploy

@@ -1 +1 @@
 build
 dist
+deploy

trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java

@@ -16 +16 @@
 import java.awt.event.WindowEvent;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.FileNotFoundException;
+import java.io.InputStream;
 import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
 import java.util.Observable;
 import java.util.Observer;
 import java.util.Properties;
 import java.util.Random;
+import java.util.Scanner;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -52 +57 @@
 public class ScriptBuilderFrame extends javax.swing.JFrame implements Observer
 {
-
+    private final static String kUnitsFilename = "resources/units_template.xml";
     /**
      * The script model.
@@ -156 +161 @@
         script.addObserver(this);
         initComponents();
+        loadCHPunits();
         addCustomListeners();
         //add to listener helper method
@@ -179 +185 @@
 
     }
-    
+    /** Load the template file of standard CHP units into the script.
+     *  These units generally appear before any script events.
+     */
+    private void loadCHPunits()
+    {
+        // Read the file of CHP unit names
+        // This works within NetBeans or it can be run from the Jar file.
+        URL url = this.getClass().getResource("/"+kUnitsFilename);
+        InputStream inStream;
+        try {
+            inStream = url.openStream();
+            script.loadUnitsFromFile(inStream);
+        } catch (IOException ex) {
+            Logger.getLogger(ScriptBuilderFrame.class.getName()).log(Level.SEVERE, null, ex);
+        }   
+    }
     /**
      * Put all custom non-generated listeners in this method
      */
     private void addCustomListeners(){
-        
-        String fileName = "src/resources/units_template.xml";
-        File unitFile = new File(fileName);
-        script.loadUnitsFromFile(unitFile);
+
+
+
         //listener for window closing
         this.addWindowListener(new WindowAdapter(){
@@ -2215 +2235 @@
     {//GEN-HEADEREND:event_fileNewActionPerformed
         script = new SimulationScript();
-        String fileName = "units.xml";
-        File f = new File(fileName);
-        script.loadUnitsFromFile(f);
+        loadCHPunits();
         script.update();
         this.update(null, script);
@@ -2395 +2413 @@
         if (fc.showOpenDialog(this) == JFileChooser.APPROVE_OPTION)
         {
-            //load script with values from the selected file
-            script.loadUnitsFromFile(fc.getSelectedFile());
+            InputStream is = null;
+            try {
+                // create an input stream from the selected file
+                File pf = fc.getSelectedFile();
+                is = new FileInputStream(pf);
+                //load script with units from the selected file
+                script.loadUnitsFromFile(is);
+            } catch (FileNotFoundException ex) {
+                Logger.getLogger(ScriptBuilderFrame.class.getName()).log(Level.SEVERE, null, ex);
+            } finally {
+                try {
+                    is.close();
+                } catch (IOException ex) {
+                    Logger.getLogger(ScriptBuilderFrame.class.getName()).log(Level.SEVERE, null, ex);
+                }
+            }
         }
     }//GEN-LAST:event_loadUnitsActionPerformed

trunk/src/scriptbuilder/gui/application.properties

@@ -1 @@
-#Wed, 20 Nov 2019 16:03:11 -0800
+#Fri, 22 Nov 2019 17:54:32 -0800
 
-Application.revision=154
+Application.revision=156
 
-Application.buildnumber=43
+Application.buildnumber=52
 
 Incidents.directory=Incidents

trunk/src/scriptbuilder/structures/SimulationScript.java

@@ -207 +207 @@
     /**
      * Load in an existing list of units from an XML file.
-     * @param f the file containing the units
-     */
-    public void loadUnitsFromFile(File f){
+     * @param inStream the input stream for the file containing the units
+     */
+    public void loadUnitsFromFile(java.io.InputStream inStream){
         try
         {
-            SAXParserFactory.newInstance().newSAXParser().parse(f, sh);
+            SAXParserFactory.newInstance().newSAXParser().parse(inStream, sh);
             units.addAll(sh.getUnits());
         }

@@ -1 +1 @@
 build
 dist
+deploy