Changeset 42 in tmcsimulator-scriptbuilder for trunk/src/scriptbuilder/structures

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.

Location:

trunk/src/scriptbuilder/structures/events

Files:

• ATMSEvaluationEvent.java (modified) (1 diff)
• ActivityLogEvaluationEvent.java (modified) (1 diff)
• CADEvaluationEvent.java (modified) (1 diff)
• CMSEvaluationEvent.java (modified) (2 diffs)
• FacilitatorEvaluationEvent.java (modified) (1 diff)
• RadioEvaluationEvent.java (modified) (5 diffs)

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

@@ -54 +54 @@
     {
         String output = openTag(ELEMENT.ATMS_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.ATMS_EVALUATION.tag);

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

@@ -49 +49 @@
         expectedAction.remove(index);
     }
-    
+
     @Override
     public String toXML()
     {
         String output = openTag(ELEMENT.ACTIVITY_LOG_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.ACTIVITY_LOG_EVALUATION.tag);
-        
+
         return output;
     }

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

@@ -54 +54 @@
     {
         String output = openTag(ELEMENT.CAD_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.CAD_EVALUATION.tag);
-        
+
         return output;
     }

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

@@ -62 +62 @@
     public String toXML()
     {
-        String output = openTag(ELEMENT.CMS_EVALUATION.tag+" cmsID=\""+cmsID+"\" type=\""+cmsType+"\"");
+        String output = openTag(ELEMENT.CMS_EVALUATION.tag + " cmsID=\"" + cmsID + "\" type=\"" + cmsType + "\"");
         output += openTag(ELEMENT.LOCATION.tag);
         output += location;
         output += closeTag(ELEMENT.LOCATION.tag);
-        
-        if(message.size() > 0)
+
+        if (message.size() > 0)
         {
             output += openTag(ELEMENT.SAMPLE_MESSAGE.tag);
-            for(String str: message)
+            for (String str : message)
             {
+                if (str == null)
+                {
+                    str = "";
+                }
                 output += openTag(ELEMENT.CMS_LINE.tag);
                 output += str;
@@ -78 +82 @@
             output += closeTag(ELEMENT.SAMPLE_MESSAGE.tag);
         }
-        
+
         output += closeTag(ELEMENT.CMS_EVALUATION.tag);
-        
+
         return output;
     }

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

@@ -49 +49 @@
         expectedAction.remove(index);
     }
-    
+
     @Override
     public String toXML()
     {
         String output = openTag(ELEMENT.FACILITATOR_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.FACILITATOR_EVALUATION.tag);
-        
+
         return output;
     }

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;
     }