[Tinyos-commits] CVS: tinyos-1.x/tools/java/net/tinyos/tools Deluge.java, 1.11, 1.12

[Jonathan Hui]

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

Modified Files:
	Deluge.java 
Log Message:
- Allow operations to occur even if some nodes are not running Deluge.



Index: Deluge.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tools/java/net/tinyos/tools/Deluge.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Deluge.java	22 Jul 2005 17:52:38 -0000	1.11
--- Deluge.java	23 Aug 2005 01:52:46 -0000	1.12
***************
*** 185,192 ****
      case S_PING:
  
!       if (pinger.existsError()) {
! 	throw new IllegalArgumentException( 
! 	  "Deluge is not running on one or more nodes" );
!       }
  
        System.out.println("  Currently Executing:");
--- 185,190 ----
      case S_PING:
  
!       if (pinger.existsError())
! 	System.out.println( "Warning: Deluge is not running on one or more nodes." );
  
        System.out.println("  Currently Executing:");
***************
*** 237,244 ****
      case S_DUMP:
  
!       if (pinger.existsError()) {
! 	throw new IllegalArgumentException( 
! 	  "Deluge is not running on one or more nodes" );
!       }
  
        Downloader downloader = new Downloader(pinger, imageNum, moteif, verbose, outfile);
--- 235,240 ----
      case S_DUMP:
  
!       if (pinger.existsError())
! 	System.out.println( "Warning: Deluge is not running on one or more nodes." );
  
        Downloader downloader = new Downloader(pinger, imageNum, moteif, verbose, outfile);
***************
*** 250,257 ****
      case S_INJECT:
  
!       if (pinger.existsError()) {
! 	throw new IllegalArgumentException( 
! 	  "Deluge is not running on one or more nodes" );
!       }
  
        TOSBootImage newImage = new TOSBootImage(infile);
--- 246,251 ----
      case S_INJECT:
  
!       if (pinger.existsError())
! 	System.out.println( "Warning: Deluge is not running on one or more nodes." );
  
        TOSBootImage newImage = new TOSBootImage(infile);
***************
*** 268,275 ****
      case S_ERASE:
  
!       if (pinger.existsError()) {
! 	throw new IllegalArgumentException( 
! 	  "Deluge is not running on one or more nodes" );
!       }
  
        Eraser eraser = new Eraser(pinger, imageNum, moteif, verbose, force);
--- 262,267 ----
      case S_ERASE:
  
!       if (pinger.existsError())
! 	System.out.println( "Warning: Deluge is not running on one or more nodes." );
  
        Eraser eraser = new Eraser(pinger, imageNum, moteif, verbose, force);
***************
*** 281,288 ****
      case S_RESET:
  
!       if (pinger.existsError()) {
! 	throw new IllegalArgumentException( 
! 	  "Deluge is not running on one or more nodes" );
!       }
  
        Eraser resetter = new Eraser(pinger, imageNum, moteif, verbose, force);
--- 273,278 ----
      case S_RESET:
  
!       if (pinger.existsError())
! 	System.out.println( "Warning: Deluge is not running on one or more nodes." );
  
        Eraser resetter = new Eraser(pinger, imageNum, moteif, verbose, force);