Changeset 182 in tmcsimulator-scriptbuilder for trunk/src/scriptbuilder/structures/MyScriptHandler.java

Timestamp:

01/11/2020 05:45:23 PM (6 years ago)

Author:

jdalbey

Message:

Modifications to ScriptBuilderFrame?, SimulationScript?, MyScriptHandler? to fix #217

File:

• trunk/src/scriptbuilder/structures/MyScriptHandler.java (modified) (2 diffs)

trunk/src/scriptbuilder/structures/MyScriptHandler.java

@@ -749 +749 @@
             else if (currentElement == ELEMENT.COLOR)
             {
-                currInc.color = incColor;
+                // Validate that the color read is actually a legal color
+                // then assign it to the incident
+                currInc.color = SimulationScript.incidentColors[SimulationScript.lookupColor(incColor)];
             }
             else if (currentElement == ELEMENT.EXPECTED_ACTION)
@@ -906 +908 @@
                 if (incidentMap.get(incidentLogNumber) == null)
                 {
+                    // Select a random color to display for this incident
+                    // Will be overriden if a color tag is provided.
                     Color newColor = SimulationScript.incidentColors[Math.abs(new Random().nextInt())
                             % SimulationScript.incidentColors.length];
-
+                    
                     incidentMap.put(incidentLogNumber,
                             new ScriptIncident(newColor,