[Jmri-commits] jmri/jmrix/nce/consist NceConsistEditFrame.java, 1.34, 1.35 NceConsistRoster.java, 1

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

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

Modified Files:
	NceConsistEditFrame.java NceConsistRoster.java 
	NceConsistRestore.java NceConsistBackup.java 
Log Message:
Fix bugs reported by Hudson find bugs

Index: NceConsistRoster.java
===================================================================
RCS file: /cvsroot/jmri/jmri/jmrix/nce/consist/NceConsistRoster.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** NceConsistRoster.java	15 Feb 2010 18:22:18 -0000	1.10
--- NceConsistRoster.java	7 Sep 2010 01:03:41 -0000	1.11
***************
*** 244,248 ****
              NceConsistRosterEntry r = _list.get(i);
              String tempComment = r.getComment();
!             String xmlComment = new String();

              //transfer tempComment to xmlComment one character at a time, except
--- 244,248 ----
              NceConsistRosterEntry r = _list.get(i);
              String tempComment = r.getComment();
!             StringBuffer buf = new StringBuffer();

              //transfer tempComment to xmlComment one character at a time, except
***************
*** 250,260 ****
              for (int k = 0; k < tempComment.length(); k++) {
                  if (tempComment.startsWith("\n", k)) {
!                     xmlComment = xmlComment + "<?p?>";
                  }
                  else {
!                     xmlComment = xmlComment + tempComment.substring(k, k + 1);
                  }
              }
!             r.setComment(xmlComment);
          }
          //All Comments and Decoder Comment line feeds have been changed to processor directives
--- 250,260 ----
              for (int k = 0; k < tempComment.length(); k++) {
                  if (tempComment.startsWith("\n", k)) {
!                 	buf.append("<?p?>");
                  }
                  else {
!                 	buf.append(tempComment.substring(k, k + 1));
                  }
              }
!             r.setComment(buf.toString());
          }
          //All Comments and Decoder Comment line feeds have been changed to processor directives
***************
*** 277,292 ****
              NceConsistRosterEntry r = _list.get(i);
              String xmlComment = r.getComment();
!             String tempComment = new String();

              for (int k = 0; k < xmlComment.length(); k++) {
                  if (xmlComment.startsWith("<?p?>", k)) {
!                     tempComment = tempComment + "\n";
                      k = k + 4;
                  }
                  else {
!                     tempComment = tempComment + xmlComment.substring(k, k + 1);
                  }
              }
!             r.setComment(tempComment);

          }
--- 277,292 ----
              NceConsistRosterEntry r = _list.get(i);
              String xmlComment = r.getComment();
!             StringBuffer buf = new StringBuffer();

              for (int k = 0; k < xmlComment.length(); k++) {
                  if (xmlComment.startsWith("<?p?>", k)) {
!                     buf.append("\n");
                      k = k + 4;
                  }
                  else {
!                 	 buf.append(xmlComment.substring(k, k + 1));
                  }
              }
!             r.setComment(buf.toString());

          }

Index: NceConsistBackup.java
===================================================================
RCS file: /cvsroot/jmri/jmri/jmrix/nce/consist/NceConsistBackup.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** NceConsistBackup.java	5 Apr 2009 15:46:08 -0000	1.8
--- NceConsistBackup.java	7 Sep 2010 01:03:41 -0000	1.9
***************
*** 51,59 ****
  	private static final int CONSIST_LNTH = 16;		// 16 bytes per line
  	private static final int REPLY_16 = 16;			// reply length of 16 byte expected
! 	private static int replyLen = 0;				// expected byte length
! 	private static int waiting = 0;					// to catch responses not intended for this module
! 	private static boolean fileValid = false;		// used to flag backup status messages

! 	private static byte[] nceConsistData = new byte [CONSIST_LNTH];

  	JLabel textConsist = new JLabel();
--- 51,59 ----
  	private static final int CONSIST_LNTH = 16;		// 16 bytes per line
  	private static final int REPLY_16 = 16;			// reply length of 16 byte expected
! 	private int replyLen = 0;					// expected byte length
! 	private int waiting = 0;					// to catch responses not intended for this module
! 	private boolean fileValid = false;			// used to flag backup status messages

! 	private byte[] nceConsistData = new byte [CONSIST_LNTH];

  	JLabel textConsist = new JLabel();
***************
*** 71,77 ****
  		int retVal = fc.showSaveDialog(null);
  		if (retVal != JFileChooser.APPROVE_OPTION)
! 			return; // cancelled
  		if (fc.getSelectedFile() == null)
! 			return; // cancelled

  		File f = fc.getSelectedFile();
--- 71,77 ----
  		int retVal = fc.showSaveDialog(null);
  		if (retVal != JFileChooser.APPROVE_OPTION)
! 			return; // Canceled
  		if (fc.getSelectedFile() == null)
! 			return; // Canceled

  		File f = fc.getSelectedFile();
***************
*** 104,107 ****
--- 104,108 ----
  				"Backup can take over a minute, continue?", "NCE Consist Backup",
  				JOptionPane.YES_NO_OPTION) != JOptionPane.YES_OPTION) {
+ 			fileOut.close();
  			return;
  		}
***************
*** 126,130 ****
  		waiting = 0;			// reset in case there was a previous error
  		fileValid = true;		// assume we're going to succeed
! 		String line;			// output string to file

--- 127,131 ----
  		waiting = 0;			// reset in case there was a previous error
  		fileValid = true;		// assume we're going to succeed
! 	// output string to file

***************
*** 140,154 ****

  			if (fileValid) {
! 				line = ":" + Integer.toHexString(CS_CONSIST_MEM + (consistNum * CONSIST_LNTH));

  				for (int i = 0; i < CONSIST_LNTH; i++) {
! 					line += " " + StringUtil.twoHexFromInt(nceConsistData[i++]);
! 					line +=	StringUtil.twoHexFromInt(nceConsistData[i]);
  				}

  				if (log.isDebugEnabled()) 
! 					log.debug("consist " + line);

! 				fileOut.println(line);
  			}
  		}
--- 141,156 ----

  			if (fileValid) {
! 				StringBuffer buf = new StringBuffer();
! 				buf.append(":" + Integer.toHexString(CS_CONSIST_MEM + (consistNum * CONSIST_LNTH)));

  				for (int i = 0; i < CONSIST_LNTH; i++) {
! 					buf.append(" " + StringUtil.twoHexFromInt(nceConsistData[i++]));
! 					buf.append(StringUtil.twoHexFromInt(nceConsistData[i]));
  				}

  				if (log.isDebugEnabled()) 
! 					log.debug("consist " + buf.toString());

! 				fileOut.println(buf.toString());
  			}
  		}
***************
*** 156,160 ****
  		if (fileValid) {
  			// NCE file terminator
! 			line = ":0000";
  			fileOut.println(line);
  		}
--- 158,162 ----
  		if (fileValid) {
  			// NCE file terminator
! 			String line = ":0000";
  			fileOut.println(line);
  		}
***************
*** 219,223 ****
  	} // ignore replies

! 	// this reply always expects two consective reads
  	public void reply(NceReply r) {

--- 221,225 ----
  	} // ignore replies

! 	// this reply always expects two consecutive reads
  	public void reply(NceReply r) {

***************
*** 243,247 ****
  	}

! 	private class textFilter extends javax.swing.filechooser.FileFilter {

  		public boolean accept(File f){
--- 245,249 ----
  	}

! 	private static class textFilter extends javax.swing.filechooser.FileFilter {

  		public boolean accept(File f){

Index: NceConsistEditFrame.java
===================================================================
RCS file: /cvsroot/jmri/jmri/jmrix/nce/consist/NceConsistEditFrame.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** NceConsistEditFrame.java	3 Sep 2010 00:53:49 -0000	1.34
--- NceConsistEditFrame.java	7 Sep 2010 01:03:41 -0000	1.35
***************
*** 665,669 ****
  			JTextField locoTextField, JButton adrButton) {
  		String rosterEntryTitle = locoRosterBox.getSelectedItem().toString();
! 		if (rosterEntryTitle == EMPTY)
  			return;
  		RosterEntry entry = Roster.instance().entryFromTitle(rosterEntryTitle);
--- 665,669 ----
  			JTextField locoTextField, JButton adrButton) {
  		String rosterEntryTitle = locoRosterBox.getSelectedItem().toString();
! 		if (rosterEntryTitle.equals(EMPTY))
  			return;
  		RosterEntry entry = Roster.instance().entryFromTitle(rosterEntryTitle);

Index: NceConsistRestore.java
===================================================================
RCS file: /cvsroot/jmri/jmri/jmrix/nce/consist/NceConsistRestore.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** NceConsistRestore.java	7 Jun 2009 04:44:35 -0000	1.6
--- NceConsistRestore.java	7 Sep 2010 01:03:41 -0000	1.7
***************
*** 38,44 ****
  	private static final int CONSIST_LNTH = 16;		// 16 bytes per consist line
  	private static final int REPLY_1 = 1;			// reply length of 1 byte expected
! 	private static int replyLen = 0;				// expected byte length
! 	private static int waiting = 0;					// to catch responses not intended for this module
! 	private static boolean fileValid = false;		// used to flag status messages

  	javax.swing.JLabel textConsist = new javax.swing.JLabel();
--- 38,44 ----
  	private static final int CONSIST_LNTH = 16;		// 16 bytes per consist line
  	private static final int REPLY_1 = 1;			// reply length of 1 byte expected
! 	private int replyLen = 0;						// expected byte length
! 	private int waiting = 0;						// to catch responses not intended for this module
! 	private boolean fileValid = false;				// used to flag status messages

  	javax.swing.JLabel textConsist = new javax.swing.JLabel();
***************
*** 52,58 ****
  		int retVal = fc.showOpenDialog(null);
  		if (retVal != JFileChooser.APPROVE_OPTION)
! 			return; // cancelled
  		if (fc.getSelectedFile() == null)
! 			return; // cancelled
  		File f = fc.getSelectedFile();
  		BufferedReader in;
--- 52,58 ----
  		int retVal = fc.showOpenDialog(null);
  		if (retVal != JFileChooser.APPROVE_OPTION)
! 			return; // Canceled
  		if (fc.getSelectedFile() == null)
! 			return; // Canceled
  		File f = fc.getSelectedFile();
  		BufferedReader in;
***************
*** 182,186 ****

  	// writes 16 bytes of NCE consist memory
! 	private static NceMessage writeNceConsistMemory(int curConsist, byte[] b) {

  		replyLen = REPLY_1; // Expect 1 byte response
--- 182,186 ----

  	// writes 16 bytes of NCE consist memory
! 	private NceMessage writeNceConsistMemory(int curConsist, byte[] b) {

  		replyLen = REPLY_1; // Expect 1 byte response
***************
*** 228,232 ****
  	}

! 	private class textFilter extends javax.swing.filechooser.FileFilter {

  		public boolean accept(File f){
--- 228,232 ----
  	}

! 	private static class textFilter extends javax.swing.filechooser.FileFilter {

  		public boolean accept(File f){

[Jmri-commits] jmri/jmrix/nce/consist NceConsistEditFrame.java, 1.34, 1.35 NceConsistRoster.java, 1

Java applications to control a model railroad layout.

[Jmri-commits] jmri/jmrix/nce/consist NceConsistEditFrame.java, 1.34, 1.35 NceConsistRoster.java, 1.10, 1.11 NceConsistRestore.java, 1.6, 1.7 NceConsistBackup.java, 1.8, 1.9