[Tinyos-commits] CVS: tinyos-1.x/tools/java/net/tinyos/packet PhoenixSource.java, 1.13, 1.14 SerialByteSource.java, 1.4, 1.5

[David Gay]

Update of /cvsroot/tinyos/tinyos-1.x/tools/java/net/tinyos/packet
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv19622

Modified Files:
	PhoenixSource.java SerialByteSource.java 
Log Message:
remove annoying stack traces (looks like debug code got checked in)


Index: PhoenixSource.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tools/java/net/tinyos/packet/PhoenixSource.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** PhoenixSource.java	31 May 2004 10:30:28 -0000	1.13
--- PhoenixSource.java	13 Jun 2006 16:21:55 -0000	1.14
***************
*** 170,174 ****
  	    }
  	    catch (IOException e) {
- 		e.printStackTrace();
  		stopped();
  		if (phoenixLike)
--- 170,173 ----
***************
*** 202,206 ****
  		public void error(IOException e) {
  		    message(source.getName() + " died - restarting");
- 		    e.printStackTrace();
  		    try {
  			sleep(2000);
--- 201,204 ----
***************
*** 214,218 ****
      public void error(IOException e) {
  	String msg = source.getName() + " died - exiting (" + e + ")";
- 	e.printStackTrace();
  	if (messages != null) {
  	    message(msg);
--- 212,215 ----

Index: SerialByteSource.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tools/java/net/tinyos/packet/SerialByteSource.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SerialByteSource.java	7 Oct 2003 21:46:01 -0000	1.4
--- SerialByteSource.java	13 Jun 2006 16:21:55 -0000	1.5
***************
*** 90,94 ****
  	    Runtime.getRuntime().exec("tinyos-serial-configure " + portName);
  	}
! 	catch (IOException e) { }
  
  	is = serialPort.getInputStream();
--- 90,97 ----
  	    Runtime.getRuntime().exec("tinyos-serial-configure " + portName);
  	}
! 	catch (IOException e) {
! 	    // If it fails, try the 2.x version
! 	    Runtime.getRuntime().exec("tos-serial-configure " + portName);
! 	}
  
  	is = serialPort.getInputStream();