[Tinyos-beta-commits] CVS: tinyos-1.x/beta/Deluge/delugetools Eraser.java, 1.3, 1.4

[Jonathan Hui]

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

Modified Files:
	Eraser.java 
Log Message:
- Fixed a bug where the java app would mistakenly think an incomplete
image is already erased.



Index: Eraser.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/delugetools/Eraser.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Eraser.java	10 Mar 2005 15:46:45 -0000	1.3
--- Eraser.java	25 Apr 2005 19:14:42 -0000	1.4
***************
*** 79,83 ****
      }
  
!     if (pingReply.get_imgDesc_numPgsComplete() == 0) {
        System.out.println("ERROR: Image already erased.");
        return;
--- 79,83 ----
      }
  
!     if (pingReply.get_imgDesc_numPgs() == 0) {
        System.out.println("ERROR: Image already erased.");
        return;
***************
*** 86,90 ****
        System.out.println("Erase image:");
        System.out.println("  Image: " + pingReply.get_imgDesc_imgNum());
!       System.out.println(oldTOSBootImage);
        newVersion = (short)((short)pingReply.get_imgDesc_vNum() + (short)1);
        if (newVersion == DelugeConsts.DELUGE_INVALID_VNUM)
--- 86,95 ----
        System.out.println("Erase image:");
        System.out.println("  Image: " + pingReply.get_imgDesc_imgNum());
!       if (oldTOSBootImage != null) {
! 	System.out.println(oldTOSBootImage);
!       }
!       else {
! 	System.out.println("    No metadata associated with this image.");
!       }
        newVersion = (short)((short)pingReply.get_imgDesc_vNum() + (short)1);
        if (newVersion == DelugeConsts.DELUGE_INVALID_VNUM)