remove deprecated consistManagerInstance

JMRI · Feb 3, 2018 · b0fe0c3 · b0fe0c3
1 parent 2ac4fb5
commit b0fe0c3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/jython/AutoDispatcher2.py b/jython/AutoDispatcher2.py
@@ -788,7 +788,7 @@ def userSettings(self):
 
         # Get consists from JMRI
         # Any consist must be defined before starting AutoDispatcher
-        consistMan = InstanceManager.consistManagerInstance()
+        consistMan = InstanceManager.getDefault(jmri.ConsistManager)
         consists = consistMan.getConsistList()
         # Any consist?
         if len(consists) == 0 :

diff --git a/jython/ConsistExample.py b/jython/ConsistExample.py
@@ -37,7 +37,7 @@ def init(self):
 		self.throttle3.setSpeedSetting(0)
 
 		# create the consist
-		self.myConsist=jmri.InstanceManager.consistManagerInstance().getConsist(jmri.DccLocoAddress(24,False))
+		self.myConsist=jmri.InstanceManager.getDefault(jmri.ConsistManager).getConsist(jmri.DccLocoAddress(24,False))
 
 		# Add locomotive 1234 to the consist with it's forward as the 
 		# consist forward direction, and 5678 to the consist with its 			# normal forward direction as the reverse direction.
@@ -70,7 +70,7 @@ def handle(self):
 		self.myConsist.remove(jmri.DccLocoAddress(5678,True))
 
 		# and for good measure, delete the consist
-		self.myConsist=jmri.InstanceManager.consistManagerInstance().delConsist(jmri.DccLocoAddress(24,False))
+		self.myConsist=jmri.InstanceManager.getDefault(jmri.ConsistManager).delConsist(jmri.DccLocoAddress(24,False))
 
 		return 0	# to stop