From: Bob J. <jac...@us...> - 2010-09-29 20:11:56
|
Update of /cvsroot/jmri/jmri/jmrix In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv20088/src/jmri/jmrix Modified Files: DCCManufacturerList.java Log Message: refer to jmrix.powerline as Powerline, instead of X10 Index: DCCManufacturerList.java =================================================================== RCS file: /cvsroot/jmri/jmri/jmrix/DCCManufacturerList.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** DCCManufacturerList.java 29 Sep 2010 02:50:57 -0000 1.11 --- DCCManufacturerList.java 29 Sep 2010 20:11:48 -0000 1.12 *************** *** 37,40 **** --- 37,41 ---- public static final String OPENLCB = "OpenLCB"; public static final String OTHER = "Others"; + public static final String POWERLINE = "Powerline"; public static final String PROTRAK = "Protrak"; public static final String QSI = "QSI Solutions"; *************** *** 46,50 **** public static final String UHLEN = "Uhlenbrock"; public static final String WANGROW = "Wangrow"; - public static final String X10 = "X10"; public static final String ZIMO = "Zimo"; public static final String ZTC = "ZTC"; --- 47,50 ---- *************** *** 73,76 **** --- 73,77 ---- OPENLCB, OTHER, + POWERLINE, PROTRAK, QSI, *************** *** 81,85 **** UHLEN, WANGROW, - X10, ZIMO, ZTC --- 82,85 ---- *************** *** 109,112 **** --- 109,113 ---- if(System.equals(OAK)) { return new jmri.jmrix.oaktree.SerialConnectionTypeList().getAvailableProtocolClasses(); } if(System.equals(OPENLCB)) { return new jmri.jmrix.openlcb.ConnectionTypeList().getAvailableProtocolClasses(); } + if(System.equals(POWERLINE)) { return new jmri.jmrix.powerline.SerialConnectionTypeList().getAvailableProtocolClasses(); } if(System.equals(PROTRAK)) { return new jmri.jmrix.grapevine.SerialConnectionTypeList().getAvailableProtocolClasses(); } if(System.equals(QSI)) { return new jmri.jmrix.qsi.QSIConnectionTypeList().getAvailableProtocolClasses(); } *************** *** 117,121 **** if(System.equals(UHLEN)) { return new jmri.jmrix.loconet.Intellibox.ConnectionTypeList().getAvailableProtocolClasses(); } if(System.equals(WANGROW)) { return new jmri.jmrix.wangrow.WangrowConnectionTypeList().getAvailableProtocolClasses(); } - if(System.equals(X10)) { return new jmri.jmrix.powerline.SerialConnectionTypeList().getAvailableProtocolClasses(); } if(System.equals(ZIMO)) { return new jmri.jmrix.zimo.Mx1ConnectionTypeList().getAvailableProtocolClasses(); } if(System.equals(ZTC)) { return new jmri.jmrix.lenz.ztc640.ZTC640ConnectionTypeList().getAvailableProtocolClasses(); } --- 118,121 ---- |