Fix RTXINITIALIZER Conditional

JMRI · Jan 8, 2020 · 9a7c9e5 · 9a7c9e5
1 parent 280e46b
commit 9a7c9e5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/java/src/jmri/managers/configurexml/DefaultConditionalManagerXml.java b/java/src/jmri/managers/configurexml/DefaultConditionalManagerXml.java
@@ -302,8 +302,10 @@ public void loadConditionals(Element conditionals) {
                 }
                 variable.setType(Conditional.Type.getOperatorFromIntValue(
                         Integer.parseInt(cvar.getAttribute("type").getValue())));  // NOI18N
-                variable.setName(cvar
-                        .getAttribute("systemName").getValue());  // NOI18N
+
+                String tempName = cvar.getAttribute("systemName").getValue();  // NOI18N
+                variable.setName(tempName.equals("RTXINITIALIZER") ? systemNamePrefix + ":" + tempName : tempName);  // NOI18N
+
                 if (cvar.getAttribute("dataString") != null) {  // NOI18N
                     variable.setDataString(cvar
                             .getAttribute("dataString").getValue());  // NOI18N

diff --git a/java/test/jmri/jmrit/entryexit/load/EntryExitTest.xml b/java/test/jmri/jmrit/entryexit/load/EntryExitTest.xml
@@ -520,7 +520,7 @@
     <conditional systemName="IX:RTXINITIALIZER1T" userName="Route 1C Initialize" antecedent="R1" logicType="3" triggerOnChange="yes">
       <systemName>IX:RTXINITIALIZER1T</systemName>
       <userName>Route 1C Initialize</userName>
-      <conditionalStateVariable operator="4" negated="no" type="0" systemName="RTXINITIALIZER" dataString="" num1="0" num2="0" triggersCalc="yes" />
+      <conditionalStateVariable operator="4" negated="no" type="0" systemName="IX:RTXINITIALIZER" dataString="" num1="0" num2="0" triggersCalc="yes" />
       <conditionalAction option="1" type="9" systemName="Reset" data="2" delay="0" string="" />
     </conditional>
   </conditionals>

diff --git a/java/test/jmri/jmrit/logix/valid/LogixActionTest.xml b/java/test/jmri/jmrit/logix/valid/LogixActionTest.xml
@@ -414,7 +414,7 @@
         <conditional systemName="IX:RTXINITIALIZER1T" userName="Route 1C " antecedent="R1" logicType="3" triggerOnChange="yes">
             <systemName>IX:RTXINITIALIZER1T</systemName>
             <userName>Route 1C</userName>
-            <conditionalStateVariable operator="4" negated="no" type="0" systemName="RTXINITIALIZER" dataString="" num1="0" num2="0" triggersCalc="yes" />
+            <conditionalStateVariable operator="4" negated="no" type="0" systemName="IX:RTXINITIALIZER" dataString="" num1="0" num2="0" triggersCalc="yes" />
             <conditionalAction option="1" type="9" systemName="Occupancy OB1" data="4" delay="0" string="" />
             <conditionalAction option="1" type="9" systemName="Occupancy OB2" data="4" delay="0" string="" />
             <conditionalAction option="1" type="9" systemName="Occupancy OB3" data="4" delay="0" string="" />