Changeset 42 in tmcsimulator-scriptbuilder for trunk/src/scriptbuilder/structures/events/RadioEvaluationEvent.java

Timestamp:

08/07/2017 12:57:39 PM (9 years ago)

Author:

bmcguffin

Message:

Fixed a bug which caused null evaluation events to be improperly translated to text.

File:

• trunk/src/scriptbuilder/structures/events/RadioEvaluationEvent.java (modified) (5 diffs)

trunk/src/scriptbuilder/structures/events/RadioEvaluationEvent.java

@@ -4 +4 @@
  * and open the template in the editor.
  */
-
 package scriptbuilder.structures.events;
 
@@ -24 +23 @@
         super(ScriptEventType.RADIO_EVAL_EVENT);
     }
-    
+
     public ArrayList<String> expectedAction = new ArrayList<String>();
-    
+
     @Override
     public ArrayList<String> getExpectedActions()
@@ -32 +31 @@
         return expectedAction;
     }
-    
+
     @Override
     public void addAction(String act)
@@ -44 +43 @@
         expectedAction.set(index, act);
     }
-    
+
     @Override
     public void removeAction(int index)
@@ -55 +54 @@
     {
         String output = openTag(ELEMENT.RADIO_EVALUATION.tag);
-        for (String str : expectedAction)
+        if (expectedAction != null)
         {
-            output += openTag(ELEMENT.EXPECTED_ACTION.tag);
-            output += str;
-            output += closeTag(ELEMENT.EXPECTED_ACTION.tag);
+            for (String str : expectedAction)
+            {
+                if (str == null)
+                {
+                    str = "";
+                }
+                output += openTag(ELEMENT.EXPECTED_ACTION.tag);
+                output += str;
+                output += closeTag(ELEMENT.EXPECTED_ACTION.tag);
+            }
         }
         output += closeTag(ELEMENT.RADIO_EVALUATION.tag);
-        
+
         return output;
     }