Menu
▾
▴
[Jmri-commits] SF.net SVN: jmri:[24270] trunk/jmri/java/src/jmri/jmrix
|
From: <jac...@us...> - 2013-10-21 09:09:24
|
Revision: 24270
http://sourceforge.net/p/jmri/code/24270
Author: jacobsen
Date: 2013-10-21 09:09:20 +0000 (Mon, 21 Oct 2013)
Log Message:
-----------
remove redundant getCanRead methods (just reimplement parent), add @Override to rest
Modified Paths:
--------------
trunk/jmri/java/src/jmri/jmrix/can/cbus/CbusDccOpsModeProgrammer.java
trunk/jmri/java/src/jmri/jmrix/can/cbus/CbusDccProgrammer.java
trunk/jmri/java/src/jmri/jmrix/can/cbus/CbusProgrammer.java
trunk/jmri/java/src/jmri/jmrix/dcc4pc/Dcc4PcOpsModeProgrammer.java
trunk/jmri/java/src/jmri/jmrix/easydcc/EasyDccOpsModeProgrammer.java
trunk/jmri/java/src/jmri/jmrix/easydcc/EasyDccProgrammer.java
trunk/jmri/java/src/jmri/jmrix/lenz/XNetOpsModeProgrammer.java
trunk/jmri/java/src/jmri/jmrix/lenz/XNetProgrammer.java
trunk/jmri/java/src/jmri/jmrix/loconet/LnOpsModeProgrammer.java
trunk/jmri/java/src/jmri/jmrix/loconet/SlotManager.java
trunk/jmri/java/src/jmri/jmrix/nce/NceOpsModeProgrammer.java
trunk/jmri/java/src/jmri/jmrix/nce/NceProgrammer.java
trunk/jmri/java/src/jmri/jmrix/qsi/QsiProgrammer.java
trunk/jmri/java/src/jmri/jmrix/sprog/SprogOpsModeProgrammer.java
trunk/jmri/java/src/jmri/jmrix/sprog/SprogProgrammer.java
trunk/jmri/java/src/jmri/jmrix/srcp/SRCPOpsModeProgrammer.java
trunk/jmri/java/src/jmri/jmrix/srcp/SRCPProgrammer.java
trunk/jmri/java/src/jmri/jmrix/tams/TamsOpsModeProgrammer.java
trunk/jmri/java/src/jmri/jmrix/tams/TamsProgrammer.java
trunk/jmri/java/src/jmri/jmrix/zimo/Mx1Programmer.java
Modified: trunk/jmri/java/src/jmri/jmrix/can/cbus/CbusDccOpsModeProgrammer.java
===================================================================
--- trunk/jmri/java/src/jmri/jmrix/can/cbus/CbusDccOpsModeProgrammer.java 2013-10-21 09:07:37 UTC (rev 24269)
+++ trunk/jmri/java/src/jmri/jmrix/can/cbus/CbusDccOpsModeProgrammer.java 2013-10-21 09:09:20 UTC (rev 24270)
@@ -81,6 +81,7 @@
*
* @return always false
*/
+ @Override
public boolean getCanRead() {
return false;
}
Modified: trunk/jmri/java/src/jmri/jmrix/can/cbus/CbusDccProgrammer.java
===================================================================
--- trunk/jmri/java/src/jmri/jmrix/can/cbus/CbusDccProgrammer.java 2013-10-21 09:07:37 UTC (rev 24269)
+++ trunk/jmri/java/src/jmri/jmrix/can/cbus/CbusDccProgrammer.java 2013-10-21 09:09:20 UTC (rev 24270)
@@ -76,11 +76,6 @@
@Override
public int getMode() { return _mode; }
- @Override
- public boolean getCanRead() {
- return true;
- }
-
// notify property listeners - see AbstractProgrammer for more
@SuppressWarnings("unchecked")
Modified: trunk/jmri/java/src/jmri/jmrix/can/cbus/CbusProgrammer.java
===================================================================
--- trunk/jmri/java/src/jmri/jmrix/can/cbus/CbusProgrammer.java 2013-10-21 09:07:37 UTC (rev 24269)
+++ trunk/jmri/java/src/jmri/jmrix/can/cbus/CbusProgrammer.java 2013-10-21 09:09:20 UTC (rev 24270)
@@ -69,8 +69,6 @@
}
public int getMode() { return Programmer.CBUSNODEVARMODE; }
- public boolean getCanRead() { return true; }
-
// notify property listeners - see AbstractProgrammer for more
@SuppressWarnings("unchecked")
Modified: trunk/jmri/java/src/jmri/jmrix/dcc4pc/Dcc4PcOpsModeProgrammer.java
===================================================================
--- trunk/jmri/java/src/jmri/jmrix/dcc4pc/Dcc4PcOpsModeProgrammer.java 2013-10-21 09:07:37 UTC (rev 24269)
+++ trunk/jmri/java/src/jmri/jmrix/dcc4pc/Dcc4PcOpsModeProgrammer.java 2013-10-21 09:09:20 UTC (rev 24270)
@@ -93,15 +93,6 @@
return defaultProgrammer.hasMode(mode);
}
- /**
- * Can this ops-mode programmer read back values?
- * The RailCom reader allows this kind of feedback
- * @return true to allow us to trigger an ops mode read
- */
- public boolean getCanRead() {
- return true;
- }
-
synchronized protected void timeout(){
rcTag.removePropertyChangeListener(this);
rcTag.setExpectedCv(-1);
Modified: trunk/jmri/java/src/jmri/jmrix/easydcc/EasyDccOpsModeProgrammer.java
===================================================================
--- trunk/jmri/java/src/jmri/jmrix/easydcc/EasyDccOpsModeProgrammer.java 2013-10-21 09:07:37 UTC (rev 24269)
+++ trunk/jmri/java/src/jmri/jmrix/easydcc/EasyDccOpsModeProgrammer.java 2013-10-21 09:09:20 UTC (rev 24270)
@@ -89,6 +89,7 @@
* but maybe later.
* @return always false for now
*/
+ @Override
public boolean getCanRead() {
return false;
}
Modified: trunk/jmri/java/src/jmri/jmrix/easydcc/EasyDccProgrammer.java
===================================================================
--- trunk/jmri/java/src/jmri/jmrix/easydcc/EasyDccProgrammer.java 2013-10-21 09:07:37 UTC (rev 24269)
+++ trunk/jmri/java/src/jmri/jmrix/easydcc/EasyDccProgrammer.java 2013-10-21 09:09:20 UTC (rev 24270)
@@ -62,8 +62,6 @@
}
public int getMode() { return _mode; }
- public boolean getCanRead() { return true; }
-
// notify property listeners - see AbstractProgrammer for more
@SuppressWarnings("unchecked")
Modified: trunk/jmri/java/src/jmri/jmrix/lenz/XNetOpsModeProgrammer.java
===================================================================
--- trunk/jmri/java/src/jmri/jmrix/lenz/XNetOpsModeProgrammer.java 2013-10-21 09:07:37 UTC (rev 24269)
+++ trunk/jmri/java/src/jmri/jmrix/lenz/XNetOpsModeProgrammer.java 2013-10-21 09:09:20 UTC (rev 24270)
@@ -92,24 +92,21 @@
return (mode==Programmer.OPSBYTEMODE);
}
- /**
+ /*
* Can this ops-mode programmer read back values?
* Indirectly we can, though this requires an external display
* (a Lenz LRC120) and enabling railcom.
* @return true to allow us to trigger an ops mode read
*/
- public boolean getCanRead() {
- // An operations mode read can be triggered on command
- // stations which support Operations Mode Writes (LZ100,
- // LZV100,MultiMouse). Whether or not the operation produces
- // a result depends on additional external hardware (a booster
- // with an enabled RailCom cutout (LV102 or similar) and a
- // RailCom receiver circuit (LRC120 or similar)).
- // We have no way of determining if the required external
- // hardware is present, so we return true for all command
- // stations on which the Operations Mode Programmer is enabled.
- return(true);
- }
+ // An operations mode read can be triggered on command
+ // stations which support Operations Mode Writes (LZ100,
+ // LZV100,MultiMouse). Whether or not the operation produces
+ // a result depends on additional external hardware (a booster
+ // with an enabled RailCom cutout (LV102 or similar) and a
+ // RailCom receiver circuit (LRC120 or similar)).
+ // We have no way of determining if the required external
+ // hardware is present, so we return true for all command
+ // stations on which the Operations Mode Programmer is enabled.
synchronized public void message(XNetReply l) {
if (progState == XNetProgrammer.NOTPROGRAMMING) {
Modified: trunk/jmri/java/src/jmri/jmrix/lenz/XNetProgrammer.java
===================================================================
--- trunk/jmri/java/src/jmri/jmrix/lenz/XNetProgrammer.java 2013-10-21 09:07:37 UTC (rev 24269)
+++ trunk/jmri/java/src/jmri/jmrix/lenz/XNetProgrammer.java 2013-10-21 09:09:20 UTC (rev 24270)
@@ -96,6 +96,7 @@
return false;
}
+ @Override
public boolean getCanRead() {
// Multimaus cannot read CVs, unless Rocomotion interface is used, assume other Command Stations do.
// To be revised if and when a Rocomotion adapter is introduced!!!
Modified: trunk/jmri/java/src/jmri/jmrix/loconet/LnOpsModeProgrammer.java
===================================================================
--- trunk/jmri/java/src/jmri/jmrix/loconet/LnOpsModeProgrammer.java 2013-10-21 09:07:37 UTC (rev 24269)
+++ trunk/jmri/java/src/jmri/jmrix/loconet/LnOpsModeProgrammer.java 2013-10-21 09:09:20 UTC (rev 24270)
@@ -75,15 +75,21 @@
* if transponding hardware is present, but we don't check that here.
* @return always true
*/
+ @Override
public boolean getCanRead() {
return true;
}
+ @Override
public boolean getCanRead(String addr) {
return getCanRead() && Integer.parseInt(addr)<=1024; }
+ @Override
public boolean getCanRead(int mode, String addr) { return getCanRead(addr); }
+ @Override
public boolean getCanWrite() { return true; }
+ @Override
public boolean getCanWrite(String addr) { return Integer.parseInt(addr)<=1024; }
+ @Override
public boolean getCanWrite(int mode, String addr) { return getCanWrite(addr); }
public void addPropertyChangeListener(PropertyChangeListener p) {
Modified: trunk/jmri/java/src/jmri/jmrix/loconet/SlotManager.java
===================================================================
--- trunk/jmri/java/src/jmri/jmrix/loconet/SlotManager.java 2013-10-21 09:07:37 UTC (rev 24269)
+++ trunk/jmri/java/src/jmri/jmrix/loconet/SlotManager.java 2013-10-21 09:09:20 UTC (rev 24270)
@@ -655,6 +655,7 @@
* the known state of that.
* @return True if reads are possible
*/
+ @Override
public boolean getCanRead() { return mCanRead; }
/**
Modified: trunk/jmri/java/src/jmri/jmrix/nce/NceOpsModeProgrammer.java
===================================================================
--- trunk/jmri/java/src/jmri/jmrix/nce/NceOpsModeProgrammer.java 2013-10-21 09:07:37 UTC (rev 24269)
+++ trunk/jmri/java/src/jmri/jmrix/nce/NceOpsModeProgrammer.java 2013-10-21 09:09:20 UTC (rev 24270)
@@ -107,6 +107,7 @@
* but maybe later.
* @return always false for now
*/
+ @Override
public boolean getCanRead() {
return false;
}
Modified: trunk/jmri/java/src/jmri/jmrix/nce/NceProgrammer.java
===================================================================
--- trunk/jmri/java/src/jmri/jmrix/nce/NceProgrammer.java 2013-10-21 09:07:37 UTC (rev 24269)
+++ trunk/jmri/java/src/jmri/jmrix/nce/NceProgrammer.java 2013-10-21 09:09:20 UTC (rev 24270)
@@ -82,6 +82,7 @@
public int getMode() { return _mode; }
+ @Override
public boolean getCanRead() {
if (tc != null && tc.getUsbSystem() != NceTrafficController.USB_SYSTEM_POWERCAB &&
tc.getUsbSystem() != NceTrafficController.USB_SYSTEM_NONE)
@@ -90,11 +91,6 @@
return true;
}
- public boolean getCanRead(String cv) {
- if (!getCanRead()) return false;
- return true;
- }
-
public boolean getCanWrite(String cv) {
if ((Integer.parseInt(cv) > 256) &&
((getMode() == Programmer.PAGEMODE) ||
Modified: trunk/jmri/java/src/jmri/jmrix/qsi/QsiProgrammer.java
===================================================================
--- trunk/jmri/java/src/jmri/jmrix/qsi/QsiProgrammer.java 2013-10-21 09:07:37 UTC (rev 24269)
+++ trunk/jmri/java/src/jmri/jmrix/qsi/QsiProgrammer.java 2013-10-21 09:09:20 UTC (rev 24270)
@@ -75,8 +75,6 @@
}
public int getMode() { return _mode; }
- public boolean getCanRead() { return true; }
-
// notify property listeners - see AbstractProgrammer for more
@SuppressWarnings("unchecked")
Modified: trunk/jmri/java/src/jmri/jmrix/sprog/SprogOpsModeProgrammer.java
===================================================================
--- trunk/jmri/java/src/jmri/jmrix/sprog/SprogOpsModeProgrammer.java 2013-10-21 09:07:37 UTC (rev 24269)
+++ trunk/jmri/java/src/jmri/jmrix/sprog/SprogOpsModeProgrammer.java 2013-10-21 09:09:20 UTC (rev 24270)
@@ -79,6 +79,7 @@
* but maybe later.
* @return always false for now
*/
+ @Override
public boolean getCanRead() {
return false;
}
Modified: trunk/jmri/java/src/jmri/jmrix/sprog/SprogProgrammer.java
===================================================================
--- trunk/jmri/java/src/jmri/jmrix/sprog/SprogProgrammer.java 2013-10-21 09:07:37 UTC (rev 24269)
+++ trunk/jmri/java/src/jmri/jmrix/sprog/SprogProgrammer.java 2013-10-21 09:09:20 UTC (rev 24270)
@@ -89,6 +89,7 @@
}
public int getMode() { return _mode; }
+ @Override
public boolean getCanRead() {
if (jmri.InstanceManager.programmerManagerInstance().isAddressedModePossible())
return false;
Modified: trunk/jmri/java/src/jmri/jmrix/srcp/SRCPOpsModeProgrammer.java
===================================================================
--- trunk/jmri/java/src/jmri/jmrix/srcp/SRCPOpsModeProgrammer.java 2013-10-21 09:07:37 UTC (rev 24269)
+++ trunk/jmri/java/src/jmri/jmrix/srcp/SRCPOpsModeProgrammer.java 2013-10-21 09:09:20 UTC (rev 24270)
@@ -91,6 +91,7 @@
* but maybe later.
* @return always false for now
*/
+ @Override
public boolean getCanRead() {
return false;
}
Modified: trunk/jmri/java/src/jmri/jmrix/srcp/SRCPProgrammer.java
===================================================================
--- trunk/jmri/java/src/jmri/jmrix/srcp/SRCPProgrammer.java 2013-10-21 09:07:37 UTC (rev 24269)
+++ trunk/jmri/java/src/jmri/jmrix/srcp/SRCPProgrammer.java 2013-10-21 09:09:20 UTC (rev 24270)
@@ -65,8 +65,6 @@
}
public int getMode() { return _mode; }
- public boolean getCanRead() { return true; }
-
// notify property listeners - see AbstractProgrammer for more
@SuppressWarnings("unchecked")
Modified: trunk/jmri/java/src/jmri/jmrix/tams/TamsOpsModeProgrammer.java
===================================================================
--- trunk/jmri/java/src/jmri/jmrix/tams/TamsOpsModeProgrammer.java 2013-10-21 09:07:37 UTC (rev 24269)
+++ trunk/jmri/java/src/jmri/jmrix/tams/TamsOpsModeProgrammer.java 2013-10-21 09:09:20 UTC (rev 24270)
@@ -89,6 +89,7 @@
* but maybe later.
* @return always false for now
*/
+ @Override
public boolean getCanRead() {
return false;
}
Modified: trunk/jmri/java/src/jmri/jmrix/tams/TamsProgrammer.java
===================================================================
--- trunk/jmri/java/src/jmri/jmrix/tams/TamsProgrammer.java 2013-10-21 09:07:37 UTC (rev 24269)
+++ trunk/jmri/java/src/jmri/jmrix/tams/TamsProgrammer.java 2013-10-21 09:09:20 UTC (rev 24270)
@@ -73,10 +73,6 @@
public int getMode() { return _mode; }
- public boolean getCanRead() {
- return true;
- }
-
// notify property listeners - see AbstractProgrammer for more
@SuppressWarnings("unchecked")
Modified: trunk/jmri/java/src/jmri/jmrix/zimo/Mx1Programmer.java
===================================================================
--- trunk/jmri/java/src/jmri/jmrix/zimo/Mx1Programmer.java 2013-10-21 09:07:37 UTC (rev 24269)
+++ trunk/jmri/java/src/jmri/jmrix/zimo/Mx1Programmer.java 2013-10-21 09:09:20 UTC (rev 24270)
@@ -90,8 +90,6 @@
return false;
}
- public boolean getCanRead() { return true; }
-
// notify property listeners - see AbstractProgrammer for more
@SuppressWarnings("unchecked")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
