Changeset 4216

Timestamp:

Apr 10, 2008, 2:23:25 PM (15 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #985: File sizes are not correctly rounded

Also fixed so that the number of decimals follow the preferences from File -> Preferences

Location:

branches/2.6-stable

Files:

• src/core/net/sf/basedb/util/Values.java (modified) (3 diffs)
• www/filemanager/files/list_files.jsp (modified) (3 diffs)

branches/2.6-stable/src/core/net/sf/basedb/util/Values.java

@@ -659 +659 @@
     {
       long lNumber = (long)fNumber;
+      long remain = Math.round(fNumber*exp-lNumber*exp);
+      if (remain >= exp) 
+      {
+        remain -= exp;
+        lNumber++;
+      }
+      String theDecimals = Long.toString(remain); 
       result.append(lNumber).append(".");
-      String theDecimals = Long.toString(Math.round(fNumber*exp-lNumber*exp)); 
+      result.append(theDecimals);
       if (theDecimals.length() < decimals) 
       {
@@ -668 +675 @@
         }
       }
-      result.append(theDecimals);
     }
     if (unit != null) result.append(unit);
@@ -687 +693 @@
   public static final String formatBytes(Long bytes)
   {
+    return formatBytes(bytes, 1);
+  }
+  
+  /**
+    Formats a value using units of bytes, kilobytes, megabytes or gigabytes.
+    @param bytes The value to format
+    @param decimals The number of decimals to display in KB, MB, and GB values
+    @since 2.6.2
+  */
+  public static final String formatBytes(Long bytes, int decimals)
+  {
     if (bytes == null) return "";
     if (bytes >= GB)
     {
       float gb = (float)bytes / GB;
-      return formatNumber(gb, 1)+" GB";
+      return formatNumber(gb, decimals)+" GB";
     }
     else if (bytes >= MB)
     {
       float mb = (float)bytes / MB;
-      return formatNumber(mb, 1)+" MB";
+      return formatNumber(mb, decimals)+" MB";
     }
     else if (bytes >= kB)
     {
       float kb = (float)bytes / kB;
-      return formatNumber(kb, 1)+" kB";
+      return formatNumber(kb, decimals)+" kB";
     }
     else

branches/2.6-stable/www/filemanager/files/list_files.jsp

@@ -59 +59 @@
   import="net.sf.basedb.clients.web.util.HTML"
   import="net.sf.basedb.clients.web.formatter.FormatterFactory"
+  import="net.sf.basedb.clients.web.formatter.FormatterSettings"
   import="net.sf.basedb.util.Values"
   import="net.sf.basedb.util.formatter.Formatter"
@@ -150 +151 @@
   int numListed = 0;
   Formatter<Date> dateTimeFormatter = FormatterFactory.getDateTimeFormatter(sc);
+  int numDecimals = FormatterSettings.getNumDecimals(sc);
   %>
   <base:page title="<%=title==null ? "Files" : title%>" type="popup">
@@ -817 +819 @@
                   onclick="fileOnClick(<%=writePermission ? "event" : null%>, <%=itemId%>)"
                   title="<%=tooltip%>"><%=name%></div></tbl:cell>
-                <tbl:cell column="size"><%=Values.formatBytes(item.getSize())%></tbl:cell>
-                <tbl:cell column="compressedSize"><%=Values.formatBytes(item.getCompressedSize())%></tbl:cell>
+                <tbl:cell column="size"><%=Values.formatBytes(item.getSize(), numDecimals)%></tbl:cell>
+                <tbl:cell column="compressedSize"><%=Values.formatBytes(item.getCompressedSize(), numDecimals)%></tbl:cell>
                 <tbl:cell column="compressed"><%=item.isCompressed() ? "yes" : "no"%></tbl:cell>
                 <tbl:cell column="writeProtected"><%=item.isWriteProtected() ? "yes" : "no"%></tbl:cell>