Changeset 61 in tmcsimulator-scriptbuilder for trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java

Timestamp:

08/19/2017 04:42:55 AM (9 years ago)

Author:

bmcguffin

Message:

Made a few cosmetic changes to the code. Added a statement in the update method of IncidentEditorFrame? which tries to set the maximum scale of the zoom slider at an appropriate level.

File:

• trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java (modified) (6 diffs)

trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java

@@ -8 +8 @@
 import java.awt.Adjustable;
 import java.awt.Color;
-import java.awt.Cursor;
 import java.awt.event.AdjustmentEvent;
 import java.awt.event.AdjustmentListener;
@@ -15 +14 @@
 import java.io.File;
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Observable;
 import java.util.Observer;
@@ -23 +21 @@
 import java.util.logging.Logger;
 import javax.swing.DefaultListModel;
-import javax.swing.JButton;
 import javax.swing.JFileChooser;
 import javax.swing.JOptionPane;
@@ -1585 +1582 @@
         if (fc.showOpenDialog(this) == JFileChooser.APPROVE_OPTION)
         {
+            script = new SimulationScript();
             System.out.println(fc.getSelectedFile().getName());
             script.loadScriptFromFile(fc.getSelectedFile());
             script.saveFile = fc.getSelectedFile();
         }
+        update(script, script);
         zoomSlider.setValue(zoomSlider.getMinimum());
-        update(script, script);
+        repaint();
     }//GEN-LAST:event_fileOpenActionPerformed
 
@@ -1876 +1875 @@
     private void fileNewActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_fileNewActionPerformed
     {//GEN-HEADEREND:event_fileNewActionPerformed
-        System.out.println("NEW SCRIPT");
         script = new SimulationScript();
         script.update();
@@ -1897 +1895 @@
                 script.incidents.get(0));
 
-        System.out.println("RESULT = " + result.toString());
-
-        input = result.toString();
-
-        System.out.println("INPUT = " + input);
-
-        int i = 0;
-        for (ScriptIncident incident : script.incidents)
-        {
-            if (incident == null)
-            {
-                continue;
-            }
-            System.out.println((++i) + ": " + incident.toString());
-            if (incident.toString().equals(input))
-            {
-                inc = incident;
-            }
-        }
-
-        if (inc != null)
-        {
-            new IncidentEditorFrame(inc).setVisible(true);
+        if (result != null)
+        {
+            System.out.println("RESULT = " + result.toString());
+
+            input = result.toString();
+
+            System.out.println("INPUT = " + input);
+
+            int i = 0;
+            for (ScriptIncident incident : script.incidents)
+            {
+                if (incident == null)
+                {
+                    continue;
+                }
+                System.out.println((++i) + ": " + incident.toString());
+                if (incident.toString().equals(input))
+                {
+                    inc = incident;
+                }
+            }
+
+            if (inc != null)
+            {
+                new IncidentEditorFrame(inc).setVisible(true);
+            }
         }
         update(script, script);