[Jmri-commits] jmri/jmrix JmrixConfigPane.java,1.64,1.65

[Kevin D. <kev...@us...>]

Update of /cvsroot/jmri/jmri/jmrix
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv10164/jmri/jmrix

Modified Files:
	JmrixConfigPane.java 
Log Message:
Updated to dynamically add layout connections, rather than being fixed to 4.

Index: JmrixConfigPane.java
===================================================================
RCS file: /cvsroot/jmri/jmri/jmrix/JmrixConfigPane.java,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -d -r1.64 -r1.65
*** JmrixConfigPane.java	6 Mar 2010 16:57:12 -0000	1.64
--- JmrixConfigPane.java	12 Mar 2010 15:43:31 -0000	1.65
***************
*** 59,62 ****
--- 59,64 ----
          return retval;
      }
+     
+     public static int getNumberOfInstances() { return configPaneTable.size(); }
  
      static final java.util.Hashtable<Integer, JmrixConfigPane> configPaneTable 
***************
*** 69,130 ****
      public static final String NO_PORTS_FOUND = rb.getString("noPortsFound");
      
-     public String[] availableProtocolClasses() {
-         return  new String[] {
- 
-                               "jmri.jmrix.internal.ConnectionConfig",
-                               "jmri.jmrix.acela.serialdriver.ConnectionConfig",
-                               "jmri.jmrix.bachrus.serialdriver.ConnectionConfig",
-                               "jmri.jmrix.cmri.serial.serialdriver.ConnectionConfig",
-                               "jmri.jmrix.cmri.serial.sim.ConnectionConfig",
-                               "jmri.jmrix.easydcc.serialdriver.ConnectionConfig",
-                               "jmri.jmrix.easydcc.networkdriver.ConnectionConfig",  
-                               "jmri.jmrix.grapevine.serialdriver.ConnectionConfig",
-                               "jmri.jmrix.lenz.hornbyelite.ConnectionConfig",
-                               "jmri.jmrix.lenz.li100.ConnectionConfig",
-                               "jmri.jmrix.lenz.li100f.ConnectionConfig",
-                               "jmri.jmrix.lenz.li101.ConnectionConfig",
-                               "jmri.jmrix.lenz.liusb.ConnectionConfig",
-                               "jmri.jmrix.loconet.locobufferusb.ConnectionConfig",
-                               "jmri.jmrix.loconet.pr2.ConnectionConfig",
-                               "jmri.jmrix.loconet.pr3.ConnectionConfig",
-                               "jmri.jmrix.loconet.hexfile.ConnectionConfig",
-                               "jmri.jmrix.loconet.Intellibox.ConnectionConfig",
-                               "jmri.jmrix.loconet.locormi.ConnectionConfig",
-                               "jmri.jmrix.loconet.loconetovertcp.ConnectionConfig",
-                               "jmri.jmrix.loconet.locobufferii.ConnectionConfig",
-                               "jmri.jmrix.loconet.locobuffer.ConnectionConfig",
-                               "jmri.jmrix.loconet.ms100.ConnectionConfig",
-                               "jmri.jmrix.nce.serialdriver.ConnectionConfig",
-                               "jmri.jmrix.nce.networkdriver.ConnectionConfig",
-                               "jmri.jmrix.nce.usbdriver.ConnectionConfig",
-                               "jmri.jmrix.oaktree.serialdriver.ConnectionConfig",
-                               "jmri.jmrix.powerline.serialdriver.ConnectionConfig",
-                               "jmri.jmrix.qsi.serialdriver.ConnectionConfig",
-                               "jmri.jmrix.rps.serial.ConnectionConfig",
-                               "jmri.jmrix.secsi.serialdriver.ConnectionConfig",
-                               "jmri.jmrix.sprog.sprog.ConnectionConfig",
-                               "jmri.jmrix.sprog.sprogCS.ConnectionConfig",
-                               "jmri.jmrix.tmcc.serialdriver.ConnectionConfig",
-                               "jmri.jmrix.wangrow.serialdriver.ConnectionConfig",
-                               "jmri.jmrix.lenz.xntcp.ConnectionConfig",
-                               "jmri.jmrix.xpa.serialdriver.ConnectionConfig",
-                               "jmri.jmrix.zimo.mx1.ConnectionConfig",
-                               "jmri.jmrix.lenz.ztc640.ConnectionConfig",
-                               // "jmri.jmrix.mrc.serialdriver.ConnectionConfig",     // experimental
-                               "jmri.jmrix.srcp.networkdriver.ConnectionConfig",
-                               "jmri.jmrix.direct.serial.ConnectionConfig",            // experimental
- 
-                               "jmri.jmrix.can.adapters.gridconnect.canrs.serialdriver.ConnectionConfig",
-                               "jmri.jmrix.can.adapters.gridconnect.canusb.serialdriver.ConnectionConfig",
-                               "jmri.jmrix.can.adapters.lawicell.canusb.serialdriver.ConnectionConfig",
-                               "jmri.jmrix.can.adapters.loopback.ConnectionConfig",
- 
-                               "jmri.jmrix.ecos.networkdriver.ConnectionConfig",
-                               "jmri.jmrix.maple.serialdriver.ConnectionConfig",
-                               "jmri.jmrix.lenz.xnetsimulator.ConnectionConfig", // experimental
-                               "jmri.jmrix.lenz.liusbserver.ConnectionConfig" // experimental
-         };
-     }
- 
      JComboBox modeBox = new JComboBox();
      JComboBox manuBox = new JComboBox();
--- 71,74 ----
***************
*** 194,197 ****
--- 138,142 ----
                          Class<?> cl = Class.forName(classConnectionNameList[i]);
                          config = (ConnectionConfig)cl.newInstance();
+                         
                          modeBox.addItem(config.name());
                      }