[junk-cvs-sync] junk/WEB-INF/classes/junk/util SizeCalculator.java,1.1.1.1,1.2

[<ty...@us...>]

Update of /cvsroot/junk/junk/WEB-INF/classes/junk/util
In directory sc8-pr-cvs1:/tmp/cvs-serv20685

Modified Files:
	SizeCalculator.java 
Log Message:




Index: SizeCalculator.java
===================================================================
RCS file: /cvsroot/junk/junk/WEB-INF/classes/junk/util/SizeCalculator.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** SizeCalculator.java	17 Nov 2003 19:39:59 -0000	1.1.1.1
--- SizeCalculator.java	9 Dec 2003 15:57:00 -0000	1.2
***************
*** 25,51 ****
  import java.math.*;
  
- public class SizeCalculator{
  
      public static final long KB = 1024;
      public static final long MB = 1048576;
      public static final long GB = 1073741824;
-     
-     public static String getNiceSize(long byteSize){
-        String niceSize;  
-        BigDecimal resultDecimal;
-        resultDecimal = new BigDecimal(byteSize);                   
  
!        if ( byteSize > MB )
!            niceSize = "" + resultDecimal.divide(new BigDecimal(MB),2,
!                                                 BigDecimal.ROUND_UP).
!                                                 doubleValue() + " MB";       
!        else if (byteSize > KB) niceSize = "" + 
!                 resultDecimal.divide(new BigDecimal(KB),2,
!                 BigDecimal.ROUND_UP).doubleValue() + " KB";
!        
!        else niceSize = "" + byteSize + " B";
!        
!        return niceSize;
!     }
  
! }
--- 25,55 ----
  import java.math.*;
  
  
+ public class SizeCalculator {
      public static final long KB = 1024;
      public static final long MB = 1048576;
      public static final long GB = 1073741824;
  
!     public static String getNiceSize(long byteSize) {
!         String niceSize;
!         BigDecimal resultDecimal;
!         resultDecimal = new BigDecimal(byteSize);
  
!         if (byteSize > MB) {
!             niceSize = ""
!                        + resultDecimal.divide(new BigDecimal(MB), 2, 
!                                               BigDecimal.ROUND_UP)
!                                       .doubleValue() + " MB";
!         } else if (byteSize > KB) {
!             niceSize = ""
!                        + resultDecimal.divide(new BigDecimal(KB), 2, 
!                                               BigDecimal.ROUND_UP)
!                                       .doubleValue() + " KB";
!         }
!         else {
!             niceSize = "" + byteSize + " B";
!         }
! 
!         return niceSize;
!     }
! }
\ No newline at end of file