[Tinyos-beta-commits] CVS: tinyos-1.x/beta/Deluge/delugetools Deluge.java, 1.1, 1.2

[Jonathan Hui]

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

Modified Files:
	Deluge.java 
Log Message:
- Output of ping for multiple images looks nice and readable now.



Index: Deluge.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/delugetools/Deluge.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Deluge.java	22 Nov 2004 05:30:58 -0000	1.1
--- Deluge.java	23 Nov 2004 02:56:15 -0000	1.2
***************
*** 502,507 ****
        if (isEmptyImage(i))
  	System.out.print("\tN/A");
!       else
  	System.out.print("\t" + metadata[i].getName());
      }
      System.out.println();
--- 502,513 ----
        if (isEmptyImage(i))
  	System.out.print("\tN/A");
!       else {
  	System.out.print("\t" + metadata[i].getName());
+ 	int strlen = metadata[i].getName().indexOf('\0');
+ 	if (strlen > 0) {
+ 	  for ( int j = 0; j < 10-strlen; j++)
+ 	    System.out.print(" ");
+ 	}
+       }
      }
      System.out.println();
***************
*** 512,516 ****
  	System.out.print("\tN/A");
        else
! 	System.out.print("\t0x" + Integer.toHexString(metadata[i].getUnixTime()));
      }
      System.out.println();
--- 518,522 ----
  	System.out.print("\tN/A");
        else
! 	System.out.print("\t0x" + Long.toHexString(metadata[i].getUnixTime()));
      }
      System.out.println();
***************
*** 521,525 ****
  	System.out.print("\tN/A");
        else
! 	System.out.print("\t0x" + Integer.toHexString(metadata[i].getUserHash()));
      }
      System.out.println();
--- 527,531 ----
  	System.out.print("\tN/A");
        else
! 	System.out.print("\t0x" + Long.toHexString(metadata[i].getUserHash()));
      }
      System.out.println();
***************
*** 529,534 ****
        if (isEmptyImage(i))
  	System.out.print("\tN/A");
!       else
! 	System.out.print("\t" + imageInfo[i].getNumPgsComplete() + "/" + imageInfo[i].getNumPgs() + "     ");
      }
      System.out.println();
--- 535,542 ----
        if (isEmptyImage(i))
  	System.out.print("\tN/A");
!       else {
! 	System.out.print("\t" + imageInfo[i].getNumPgsComplete() + "/" + 
! 			 imageInfo[i].getNumPgs() + "     ");
!       }
      }
      System.out.println();
***************
*** 839,844 ****
      private String name;     // 9
      private int    size;     // 4
!     private int    unixTime; // 4
!     private int    userHash; // 4
  
      public ProgramMetadata() {
--- 847,852 ----
      private String name;     // 9
      private int    size;     // 4
!     private long   unixTime; // 4
!     private long   userHash; // 4
  
      public ProgramMetadata() {
***************
*** 860,868 ****
        unixTime = 0;
        for ( int i = 0; i < UNIX_TIME_SIZE; i++ )
! 	unixTime |= (bytes[curOffset++] & 0xff) << (i*8);
  
        userHash = 0;
        for ( int i = 0; i < USER_HASH_SIZE; i++ )
! 	userHash |= (bytes[curOffset++] & 0xff) << (i*8);
  
      }
--- 868,876 ----
        unixTime = 0;
        for ( int i = 0; i < UNIX_TIME_SIZE; i++ )
! 	unixTime |= (long)(bytes[curOffset++] & 0xff) << (i*8);
  
        userHash = 0;
        for ( int i = 0; i < USER_HASH_SIZE; i++ )
! 	userHash |= (long)(bytes[curOffset++] & 0xff) << (i*8);
  
      }
***************
*** 891,899 ****
  	    else if (tmp.equals("-DIDENT_UNIX_TIME")) {
  	      String timeStr = st.nextToken();
! 	      unixTime = Integer.parseInt(timeStr.substring(2,timeStr.length()-1),16);
  	    }
  	    else if (tmp.equals("-DIDENT_USER_HASH")) {
  	      String hashStr = st.nextToken();
! 	      userHash = Integer.parseInt(hashStr.substring(2,hashStr.length()-1),16);
  	    }
  	  }
--- 899,907 ----
  	    else if (tmp.equals("-DIDENT_UNIX_TIME")) {
  	      String timeStr = st.nextToken();
! 	      unixTime = Long.parseLong(timeStr.substring(2,timeStr.length()-1),16);
  	    }
  	    else if (tmp.equals("-DIDENT_USER_HASH")) {
  	      String hashStr = st.nextToken();
! 	      userHash = Long.parseLong(hashStr.substring(2,hashStr.length()-1),16);
  	    }
  	  }
***************
*** 911,916 ****
      public String getName() { return name; }
      public int getSize() { return size; }
!     public int getUnixTime() { return unixTime; }
!     public int getUserHash() { return userHash; }
  
      public int length() { return METADATA_SIZE; }
--- 919,924 ----
      public String getName() { return name; }
      public int getSize() { return size; }
!     public long getUnixTime() { return unixTime; }
!     public long getUserHash() { return userHash; }
  
      public int length() { return METADATA_SIZE; }