[Jmri-commits] jmri/jmrix/lenz/li100 LI100XNetProgrammer.java,2.1,2.2

[Paul B. <pb...@us...>]

Update of /cvsroot/jmri/jmri/jmrix/lenz/li100
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv3235/li100

Modified Files:
	LI100XNetProgrammer.java 
Log Message:
extend error handling to include communications errors.


Index: LI100XNetProgrammer.java
===================================================================
RCS file: /cvsroot/jmri/jmri/jmrix/lenz/li100/LI100XNetProgrammer.java,v
retrieving revision 2.1
retrieving revision 2.2
diff -C2 -d -r2.1 -r2.2
*** LI100XNetProgrammer.java	5 Dec 2005 08:03:33 -0000	2.1
--- LI100XNetProgrammer.java	29 May 2006 21:51:36 -0000	2.2
***************
*** 202,206 ****
                                                              this);
  			   notifyProgListenerEnd(_val, jmri.ProgListener.ProgrammingShort);
! 			}
  		} else if (progState == INQUIRESENT) {
  			if (log.isDebugEnabled()) log.debug("reply in INQUIRESENT state");
--- 202,216 ----
                                                              this);
  			   notifyProgListenerEnd(_val, jmri.ProgListener.ProgrammingShort);
!                         } else if(m.isCommErrorMessage()) {
!                            // We experienced a communicatiosn error
!                            // If this is a Timeslot error, ignore it,
!                            //otherwise report it as an error
!                            if(m.getElement(1)==XNetConstants.LI_MESSAGE_RESPONSE_TIMESLOT_ERROR)
!                                    return;
!                            log.error("Communications error in REQUESTSENT state while programming.  Error: " + m.toString());
!                                 progState = NOTPROGRAMMING;
!                            stopTimer();
!                            notifyProgListenerEnd(_val, jmri.ProgListener.UnknownError);
!    			}
  		} else if (progState == INQUIRESENT) {
  			if (log.isDebugEnabled()) log.debug("reply in INQUIRESENT state");
***************
*** 266,269 ****
--- 276,289 ----
                                                              this);
  			   notifyProgListenerEnd(_val, jmri.ProgListener.ProgrammingShort);
+                         } else if(m.isCommErrorMessage()) {
+                            // We experienced a communicatiosn error
+                            // If this is a Timeslot error, ignore it,
+                            //otherwise report it as an error
+                            if(m.getElement(1)==XNetConstants.LI_MESSAGE_RESPONSE_TIMESLOT_ERROR)
+                                    return;
+                            log.error("Communications error in INQUIRESENT state while programming.  Error: " + m.toString());
+                                 progState = NOTPROGRAMMING;
+                            stopTimer();
+                            notifyProgListenerEnd(_val, jmri.ProgListener.UnknownError);
  			} else {
                             // nothing important, ignore