[Jmri-commits] SF.net SVN: jmri:[21736] branches/jmri/releases/3.1.6

[<jac...@us...>]

Revision: 21736
          http://sourceforge.net/p/jmri/code/21736
Author:   jacobsen
Date:     2012-11-30 04:41:42 +0000 (Fri, 30 Nov 2012)
Log Message:
-----------
as of today

Modified Paths:
--------------
    branches/jmri/releases/3.1.6/jython/Jynstruments/ThrottleFrame/Bell.jyn/Bell.py
    branches/jmri/releases/3.1.6/jython/Jynstruments/ThrottleFrame/Direction.jyn/Direction.py
    branches/jmri/releases/3.1.6/jython/Jynstruments/ThrottleFrame/EStop.jyn/EStop.py
    branches/jmri/releases/3.1.6/jython/Jynstruments/ThrottleFrame/Horn.jyn/Horn.py
    branches/jmri/releases/3.1.6/jython/Jynstruments/ThrottleFrame/Light.jyn/Light.py
    branches/jmri/releases/3.1.6/jython/Jynstruments/ThrottleFrame/SoundOn2xF0.jyn/SoundOn2xF0.py
    branches/jmri/releases/3.1.6/jython/Jynstruments/ThrottleFrame/SoundOnF8.jyn/SoundOnF8.py
    branches/jmri/releases/3.1.6/jython/Jynstruments/ThrottleWindowToolBar/USBThrottle.jyn/USBThrottle.py
    branches/jmri/releases/3.1.6/jython/Jynstruments/ThrottleWindowToolBar/WiimoteThrottle.jyn/WiimoteThrottle.py

Property Changed:
----------------
    branches/jmri/releases/3.1.6/
    branches/jmri/releases/3.1.6/java/src/jmri/jmrix/loconet/duplexgroup/DuplexGroupScan.properties
    branches/jmri/releases/3.1.6/java/src/jmri/jmrix/loconet/duplexgroup/swing/DuplexGroupScanPanel.java


Property changes on: branches/jmri/releases/3.1.6
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/jmri/jetty-test:20091-20352
/branches/jmri/users/zoo/jmri-head:19479-19491
   + /branches/jmri/jetty-test:20091-20352
/branches/jmri/users/zoo/jmri-head:19479-19491
/trunk/jmri:21730-21733


Property changes on: branches/jmri/releases/3.1.6/java/src/jmri/jmrix/loconet/duplexgroup/DuplexGroupScan.properties
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/jmri/jetty-test/java/src/jmri/jmrix/loconet/duplexgroup/DuplexGroupScan.properties:20091-20352
/branches/jmri/releases/2.13.6/java/src/jmri/jmrix/loconet/duplexgroup/DuplexGroupScan.properties:19350
   + /branches/jmri/jetty-test/java/src/jmri/jmrix/loconet/duplexgroup/DuplexGroupScan.properties:20091-20352
/branches/jmri/releases/2.13.6/java/src/jmri/jmrix/loconet/duplexgroup/DuplexGroupScan.properties:19350
/trunk/jmri/java/src/jmri/jmrix/loconet/duplexgroup/DuplexGroupScan.properties:21730-21733


Property changes on: branches/jmri/releases/3.1.6/java/src/jmri/jmrix/loconet/duplexgroup/swing/DuplexGroupScanPanel.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/jmri/jetty-test/java/src/jmri/jmrix/loconet/duplexgroup/swing/DuplexGroupScanPanel.java:20091-20352
/branches/jmri/releases/2.13.6/java/src/jmri/jmrix/loconet/duplexgroup/swing/DuplexGroupScanPanel.java:19350
   + /branches/jmri/jetty-test/java/src/jmri/jmrix/loconet/duplexgroup/swing/DuplexGroupScanPanel.java:20091-20352
/branches/jmri/releases/2.13.6/java/src/jmri/jmrix/loconet/duplexgroup/swing/DuplexGroupScanPanel.java:19350
/trunk/jmri/java/src/jmri/jmrix/loconet/duplexgroup/swing/DuplexGroupScanPanel.java:21730-21733

Modified: branches/jmri/releases/3.1.6/jython/Jynstruments/ThrottleFrame/Bell.jyn/Bell.py
===================================================================
--- branches/jmri/releases/3.1.6/jython/Jynstruments/ThrottleFrame/Bell.jyn/Bell.py	2012-11-30 04:41:12 UTC (rev 21735)
+++ branches/jmri/releases/3.1.6/jython/Jynstruments/ThrottleFrame/Bell.jyn/Bell.py	2012-11-30 04:41:42 UTC (rev 21736)
@@ -59,7 +59,7 @@
             self.setIcon()
 
 #AddressListener part: to listen for address changes in address panel (release, acquired)
-    def notifyAddressChosen(self, address, isLong):
+    def notifyAddressChosen(self, address):
         pass
 
     def notifyAddressThrottleFound(self, throttle):
@@ -67,10 +67,19 @@
         self.updateThrottle()
         self.setIcon()
     
-    def notifyAddressReleased(self, address, isLong):
+    def notifyAddressReleased(self, address):
         self.cleanThrottle()
         self.setIcon()
 
+    def notifyConsistAddressChosen(self, address, isLong):
+        self.notifyAddressChosen(address)
+
+    def notifyConsistAddressThrottleFound(self, throttle):
+        self.notifyAddressThrottleFound(throttle)
+
+    def notifyConsistAddressReleased(self, address, isLong):
+        self.notifyAddressReleased(address)
+
 #MouseListener part: to listen for mouse events
     def mouseReleased(self, event):
         self.switch()

Modified: branches/jmri/releases/3.1.6/jython/Jynstruments/ThrottleFrame/Direction.jyn/Direction.py
===================================================================
--- branches/jmri/releases/3.1.6/jython/Jynstruments/ThrottleFrame/Direction.jyn/Direction.py	2012-11-30 04:41:12 UTC (rev 21735)
+++ branches/jmri/releases/3.1.6/jython/Jynstruments/ThrottleFrame/Direction.jyn/Direction.py	2012-11-30 04:41:42 UTC (rev 21736)
@@ -64,7 +64,7 @@
             self.setIcon()
 
 #AddressListener part: to listen for address changes in address panel (release, acquired)
-    def notifyAddressChosen(self, address, isLong):
+    def notifyAddressChosen(self, address):
         pass
 
     def notifyAddressThrottleFound(self, throttle):
@@ -72,10 +72,19 @@
         self.updateThrottle()
         self.setIcon()
     
-    def notifyAddressReleased(self, address, isLong):
+    def notifyAddressReleased(self, address):
         self.cleanThrottle()
         self.setIcon()
 
+    def notifyConsistAddressChosen(self, address, isLong):
+        self.notifyAddressChosen(address)
+
+    def notifyConsistAddressThrottleFound(self, throttle):
+        self.notifyAddressThrottleFound(throttle)
+
+    def notifyConsistAddressReleased(self, address, isLong):
+        self.notifyAddressReleased(address)
+
 #MouseListener part: to listen for mouse events
     def mouseReleased(self, event):
         self.switch()

Modified: branches/jmri/releases/3.1.6/jython/Jynstruments/ThrottleFrame/EStop.jyn/EStop.py
===================================================================
--- branches/jmri/releases/3.1.6/jython/Jynstruments/ThrottleFrame/EStop.jyn/EStop.py	2012-11-30 04:41:12 UTC (rev 21735)
+++ branches/jmri/releases/3.1.6/jython/Jynstruments/ThrottleFrame/EStop.jyn/EStop.py	2012-11-30 04:41:42 UTC (rev 21736)
@@ -61,17 +61,26 @@
             self.setIcon( event.getNewValue() == -1 )
 
 #AddressListener part: to listen for address changes in address panel (release, acquired)
-    def notifyAddressChosen(self, address, isLong):
+    def notifyAddressChosen(self, address):
         pass
 
     def notifyAddressThrottleFound(self, throttle):
         self.throttle = throttle
         self.updateThrottle()
     
-    def notifyAddressReleased(self, address, isLong):
+    def notifyAddressReleased(self, address):
         self.cleanThrottle()
         self.updateThrottle()
 
+    def notifyConsistAddressChosen(self, address, isLong):
+        self.notifyAddressChosen(address)
+
+    def notifyConsistAddressThrottleFound(self, throttle):
+        self.notifyAddressThrottleFound(throttle)
+
+    def notifyConsistAddressReleased(self, address, isLong):
+        self.notifyAddressReleased(address)
+
 #MouseListener part: to listen for mouse events
     def mouseReleased(self, event):
         self.switch()

Modified: branches/jmri/releases/3.1.6/jython/Jynstruments/ThrottleFrame/Horn.jyn/Horn.py
===================================================================
--- branches/jmri/releases/3.1.6/jython/Jynstruments/ThrottleFrame/Horn.jyn/Horn.py	2012-11-30 04:41:12 UTC (rev 21735)
+++ branches/jmri/releases/3.1.6/jython/Jynstruments/ThrottleFrame/Horn.jyn/Horn.py	2012-11-30 04:41:42 UTC (rev 21736)
@@ -64,7 +64,7 @@
             self.setIcon()
 
 #AddressListener part: to listen for address changes in address panel (release, acquired)
-    def notifyAddressChosen(self, address, isLong):
+    def notifyAddressChosen(self, address):
         pass
 
     def notifyAddressThrottleFound(self, throttle):
@@ -72,10 +72,19 @@
         self.updateThrottle()
         self.setIcon()
     
-    def notifyAddressReleased(self, address, isLong):
+    def notifyAddressReleased(self, address):
         self.cleanThrottle()
         self.setIcon()
 
+    def notifyConsistAddressChosen(self, address, isLong):
+        self.notifyAddressChosen(address)
+
+    def notifyConsistAddressThrottleFound(self, throttle):
+        self.notifyAddressThrottleFound(throttle)
+
+    def notifyConsistAddressReleased(self, address, isLong):
+        self.notifyAddressReleased(address)
+
 #MouseListener part: to listen for mouse events
     def mouseReleased(self, event):
         self.switchOff()

Modified: branches/jmri/releases/3.1.6/jython/Jynstruments/ThrottleFrame/Light.jyn/Light.py
===================================================================
--- branches/jmri/releases/3.1.6/jython/Jynstruments/ThrottleFrame/Light.jyn/Light.py	2012-11-30 04:41:12 UTC (rev 21735)
+++ branches/jmri/releases/3.1.6/jython/Jynstruments/ThrottleFrame/Light.jyn/Light.py	2012-11-30 04:41:42 UTC (rev 21736)
@@ -64,7 +64,7 @@
             self.setIcon()
 
 #AddressListener part: to listen for address changes in address panel (release, acquired)
-    def notifyAddressChosen(self, address, isLong):
+    def notifyAddressChosen(self, address):
         pass
 
     def notifyAddressThrottleFound(self, throttle):
@@ -72,10 +72,19 @@
         self.updateThrottle()
         self.setIcon()
     
-    def notifyAddressReleased(self, address, isLong):
+    def notifyAddressReleased(self, address):
         self.cleanThrottle()
         self.setIcon()
 
+    def notifyConsistAddressChosen(self, address, isLong):
+        self.notifyAddressChosen(address)
+
+    def notifyConsistAddressThrottleFound(self, throttle):
+        self.notifyAddressThrottleFound(throttle)
+
+    def notifyConsistAddressReleased(self, address, isLong):
+        self.notifyAddressReleased(address)
+
 #MouseListener part: to listen for mouse events
     def mouseReleased(self, event):
         self.switch()

Modified: branches/jmri/releases/3.1.6/jython/Jynstruments/ThrottleFrame/SoundOn2xF0.jyn/SoundOn2xF0.py
===================================================================
--- branches/jmri/releases/3.1.6/jython/Jynstruments/ThrottleFrame/SoundOn2xF0.jyn/SoundOn2xF0.py	2012-11-30 04:41:12 UTC (rev 21735)
+++ branches/jmri/releases/3.1.6/jython/Jynstruments/ThrottleFrame/SoundOn2xF0.jyn/SoundOn2xF0.py	2012-11-30 04:41:42 UTC (rev 21736)
@@ -57,7 +57,7 @@
             cl.show(self, "off")
 
 #AddressListener part: to listen for address changes in address panel (release, acquired)
-    def notifyAddressChosen(self, address, isLong):
+    def notifyAddressChosen(self, address):
         pass
 
     def notifyAddressThrottleFound(self, throttle):
@@ -65,10 +65,19 @@
         self.updateThrottle()
         self.setIcon()
     
-    def notifyAddressReleased(self, address, isLong):
+    def notifyAddressReleased(self, address):
         self.cleanThrottle()
         self.setIcon()
 
+    def notifyConsistAddressChosen(self, address, isLong):
+        self.notifyAddressChosen(address)
+
+    def notifyConsistAddressThrottleFound(self, throttle):
+        self.notifyAddressThrottleFound(throttle)
+
+    def notifyConsistAddressReleased(self, address, isLong):
+        self.notifyAddressReleased(address)
+
 #MouseListener part: to listen for mouse events
     def mouseReleased(self, event):
         self.switch()

Modified: branches/jmri/releases/3.1.6/jython/Jynstruments/ThrottleFrame/SoundOnF8.jyn/SoundOnF8.py
===================================================================
--- branches/jmri/releases/3.1.6/jython/Jynstruments/ThrottleFrame/SoundOnF8.jyn/SoundOnF8.py	2012-11-30 04:41:12 UTC (rev 21735)
+++ branches/jmri/releases/3.1.6/jython/Jynstruments/ThrottleFrame/SoundOnF8.jyn/SoundOnF8.py	2012-11-30 04:41:42 UTC (rev 21736)
@@ -59,7 +59,7 @@
             self.setIcon()
 
 #AddressListener part: to listen for address changes in address panel (release, acquired)
-    def notifyAddressChosen(self, address, isLong):
+    def notifyAddressChosen(self, address):
         pass
 
     def notifyAddressThrottleFound(self, throttle):
@@ -67,10 +67,19 @@
         self.updateThrottle()
         self.setIcon()
     
-    def notifyAddressReleased(self, address, isLong):
+    def notifyAddressReleased(self, address):
         self.cleanThrottle()
         self.setIcon()
 
+    def notifyConsistAddressChosen(self, address, isLong):
+        self.notifyAddressChosen(address)
+
+    def notifyConsistAddressThrottleFound(self, throttle):
+        self.notifyAddressThrottleFound(throttle)
+
+    def notifyConsistAddressReleased(self, address, isLong):
+        self.notifyAddressReleased(address)
+
 #MouseListener part: to listen for mouse events
     def mouseReleased(self, event):
         self.switch()

Modified: branches/jmri/releases/3.1.6/jython/Jynstruments/ThrottleWindowToolBar/USBThrottle.jyn/USBThrottle.py
===================================================================
--- branches/jmri/releases/3.1.6/jython/Jynstruments/ThrottleWindowToolBar/USBThrottle.jyn/USBThrottle.py	2012-11-30 04:41:12 UTC (rev 21735)
+++ branches/jmri/releases/3.1.6/jython/Jynstruments/ThrottleWindowToolBar/USBThrottle.jyn/USBThrottle.py	2012-11-30 04:41:42 UTC (rev 21736)
@@ -506,7 +506,7 @@
        return elt
 
 #AddressListener part: to listen for address changes in address panel (release, acquired)
-    def notifyAddressChosen(self, address, isLong):
+    def notifyAddressChosen(self, address):
         pass
         
     def notifyAddressThrottleFound(self, throttle):
@@ -514,11 +514,20 @@
         self.throttle = throttle
         self.speedAction.setThrottle( self.throttle )
             
-    def notifyAddressReleased(self, address, isLong):
+    def notifyAddressReleased(self, address):
         self.speedTimer.stop()
         self.throttle = None
         self.speedAction.setThrottle( self.throttle )
 
+    def notifyConsistAddressChosen(self, address, isLong):
+        self.notifyAddressChosen(address)
+
+    def notifyConsistAddressThrottleFound(self, throttle):
+        self.notifyAddressThrottleFound(throttle)
+
+    def notifyConsistAddressReleased(self, address, isLong):
+        self.notifyAddressReleased(address)
+
 # Item listeners for the PopUp menu
 class ControllerItemListener( java.awt.event.ItemListener):
     def __init__(self, ctrl, jyns):

Modified: branches/jmri/releases/3.1.6/jython/Jynstruments/ThrottleWindowToolBar/WiimoteThrottle.jyn/WiimoteThrottle.py
===================================================================
--- branches/jmri/releases/3.1.6/jython/Jynstruments/ThrottleWindowToolBar/WiimoteThrottle.jyn/WiimoteThrottle.py	2012-11-30 04:41:12 UTC (rev 21735)
+++ branches/jmri/releases/3.1.6/jython/Jynstruments/ThrottleWindowToolBar/WiimoteThrottle.jyn/WiimoteThrottle.py	2012-11-30 04:41:42 UTC (rev 21736)
@@ -224,7 +224,7 @@
         self.addressPanel = None
 
 #AddressListener part: to listen for address changes in address panel (release, acquired)
-    def notifyAddressChosen(self, address, isLong):
+    def notifyAddressChosen(self, address):
         pass
         
     def notifyAddressThrottleFound(self, throttle):
@@ -232,10 +232,19 @@
         self.throttle = throttle
         self.speedAction.setThrottle( self.throttle )
             
-    def notifyAddressReleased(self, address, isLong):
+    def notifyAddressReleased(self, address):
         self.speedTimer.stop()
         self.throttle = None
         self.speedAction.setThrottle( self.throttle )
+
+    def notifyConsistAddressChosen(self, address, isLong):
+        self.notifyAddressChosen(address)
+
+    def notifyConsistAddressThrottleFound(self, throttle):
+        self.notifyAddressThrottleFound(throttle)
+
+    def notifyConsistAddressReleased(self, address, isLong):
+        self.notifyAddressReleased(address)
                 
 # Speed timer class, to increase speed regularly once button pushed, thread stopped on button release
 class SpeedAction(ActionListener):

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.