[Tinyos-beta-commits] CVS: tinyos-1.x/beta/Deluge/delugetools Deluge.java, 1.9, 1.10 Pinger.java, 1.5, 1.6

[Jonathan Hui]

Update of /cvsroot/tinyos/tinyos-1.x/beta/Deluge/delugetools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21259

Modified Files:
	Deluge.java Pinger.java 
Log Message:
- Put an explicit System.exit() in main so that the app exits
properly.
- Properly display number of pages in GoldenImage.



Index: Deluge.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/delugetools/Deluge.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Deluge.java	5 May 2005 02:18:47 -0000	1.9
--- Deluge.java	17 May 2005 20:57:16 -0000	1.10
***************
*** 180,194 ****
  	TOSBootImage image = pinger.getImage(i);
  
! 	if (pinger.getPingReply(i).get_imgDesc_numPgsComplete() != 0) {
  	  System.out.println(image);
- 	  if (i != 0) {
  	  System.out.println("    Num Pages:   " +
  			     pinger.getPingReply(i).get_imgDesc_numPgsComplete() +
  			     "/" +
  			     pinger.getPingReply(i).get_imgDesc_numPgs());
! 	  }
! 	  else {
! 	    System.out.println("    Num Pages:   N/A");
! 	  }
  	}
  	else {
--- 180,202 ----
  	TOSBootImage image = pinger.getImage(i);
  
! 	if (pinger.getPingReply(i).get_imgDesc_numPgsComplete() > 0
! 	    && ( pinger.getPingReply(i).get_imgDesc_vNum() != DelugeConsts.DELUGE_INVALID_VNUM) ) {
  	  System.out.println(image);
  	  System.out.println("    Num Pages:   " +
  			     pinger.getPingReply(i).get_imgDesc_numPgsComplete() +
  			     "/" +
  			     pinger.getPingReply(i).get_imgDesc_numPgs());
! 	}
! 	else if (pinger.getPingReply(i).get_imgDesc_numPgsComplete() == 0
! 		 && pinger.getPingReply(i).get_imgDesc_numPgs() > 0) {
! 	  System.out.println("    Prog Name:   <unavailable>");
! 	  System.out.println("    Compiled On: <unavailable>");
! 	  System.out.println("    User ID:     <unavailable>");
! 	  System.out.println("    Hostname:    <unavailable>");
! 	  System.out.println("    User Hash:   <unavailable>");
! 	  System.out.println("    Num Pages:   " +
! 			     pinger.getPingReply(i).get_imgDesc_numPgsComplete() +
! 			     "/" +
! 			     pinger.getPingReply(i).get_imgDesc_numPgs());
  	}
  	else {
***************
*** 278,281 ****
--- 286,290 ----
        }
      }
+     System.exit(0);
    }
  }

Index: Pinger.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/delugetools/Pinger.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Pinger.java	15 Mar 2005 21:50:16 -0000	1.5
--- Pinger.java	17 May 2005 20:57:16 -0000	1.6
***************
*** 233,237 ****
  
        if (numImages == -1)
! 	numImages = pingReply.get_imgDesc_numImages();
  
        if (pingReplies.get(new Integer(imgNum)) == null) {
--- 233,237 ----
  
        if (numImages == -1)
! 	numImages = pingReply.get_numImages();
  
        if (pingReplies.get(new Integer(imgNum)) == null) {