[Jmri-commits] jmri/jmrix/nce/consist NceConsistRoster.java, 1.3, 1.4

[Dan B. <dan...@us...>]

Update of /cvsroot/jmri/jmri/jmrix/nce/consist
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv17882/src/jmri/jmrix/nce/consist

Modified Files:
	NceConsistRoster.java 
Log Message:
Minor improvement to eliminate error message if NCE consist file doesn't exist.

Index: NceConsistRoster.java
===================================================================
RCS file: /cvsroot/jmri/jmri/jmrix/nce/consist/NceConsistRoster.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** NceConsistRoster.java	27 Mar 2008 01:00:12 -0000	1.3
--- NceConsistRoster.java	31 May 2008 14:46:40 -0000	1.4
***************
*** 59,72 ****
       */
      public static synchronized NceConsistRoster instance() {
!         if (_instance == null) {
!             if (log.isDebugEnabled()) log.debug("ConsistRoster creating instance");
!             // create and load
!             _instance = new NceConsistRoster();
!             try {
!                 _instance.readFile(defaultNceConsistRosterFilename());
!             } catch (Exception e) {
!                 log.error("Exception during ConsistRoster reading: "+e);
!             }
!         }
          if (log.isDebugEnabled()) log.debug("ConsistRoster returns instance "+_instance);
          return _instance;
--- 59,74 ----
       */
      public static synchronized NceConsistRoster instance() {
!     	if (_instance == null) {
!     		if (log.isDebugEnabled()) log.debug("ConsistRoster creating instance");
!     		// create and load
!     		_instance = new NceConsistRoster();
!     		if(_instance.checkFile(defaultNceConsistRosterFilename())){
!     			try {
!     				_instance.readFile(defaultNceConsistRosterFilename());
!     			} catch (Exception e) {
!     				log.error("Exception during ConsistRoster reading: "+e);
!     			}
!     		}
!     	}
          if (log.isDebugEnabled()) log.debug("ConsistRoster returns instance "+_instance);
          return _instance;