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

Timestamp:

09/19/2017 02:41:52 PM (9 years ago)

Author:

bmcguffin

Message:

Fixed a bug in saveIncidentActionPerformed() which caused a null pointer exception if the user didn't select an incident to save.

Changed the color of the absolute-time TimeStamp? panel to a more neutral color.

Added "Script:" and "Incident:" labels at the beginning of the absolute-time and relative-time TimeStamp? panels, respectively.

File:

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

trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java

@@ -1544 +1544 @@
             script.numberOfIncidents++;
             IncidentEditorFrame editor = new IncidentEditorFrame(script.incidents.get(indx), this);
-            
+
             editor.setVisible(true);
         }
@@ -1616 +1616 @@
 
         addIncidentName.setText("");
-        
+
         int newLogNum = 100;
         boolean found = false;
@@ -1633 +1633 @@
                 }
             }
-        } 
-        
+        }
+
         addIncidentNumber.setValue(newLogNum);
         addIncidentStart.setValue(0);
@@ -1837 +1837 @@
                 incidentList,
                 script.incidents.get(0));
+        if (result == null)
+        {
+            return;
+        }
         input = result.toString();
         int i = 0;