From 2cbdbd254c2a43340f4c7ccdb1780e0d18a102bf Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Mon, 16 Feb 2009 13:27:39 +0000
Subject: [PATCH] CFX-117 improve byteCountToDisplaySize
SVN: 9844
---
.../ch/systemsx/cisd/common/filesystem/FileUtilities.java | 5 ++++-
.../systemsx/cisd/common/filesystem/FileUtilitiesTest.java | 5 +++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/common/source/java/ch/systemsx/cisd/common/filesystem/FileUtilities.java b/common/source/java/ch/systemsx/cisd/common/filesystem/FileUtilities.java
index 210de9019fc..a4c531a2d3e 100644
--- a/common/source/java/ch/systemsx/cisd/common/filesystem/FileUtilities.java
+++ b/common/source/java/ch/systemsx/cisd/common/filesystem/FileUtilities.java
@@ -1589,9 +1589,12 @@ public final class FileUtilities
} else if (size / FileUtils.ONE_KB > 0)
{
displaySize = SIZE_FORMAT.format(size / (float) FileUtils.ONE_KB) + " KB";
+ } else if (size != 1)
+ {
+ displaySize = size + " bytes";
} else
{
- displaySize = SIZE_FORMAT.format(size) + " bytes";
+ displaySize = "1 byte";
}
return displaySize;
}
diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/filesystem/FileUtilitiesTest.java b/common/sourceTest/java/ch/systemsx/cisd/common/filesystem/FileUtilitiesTest.java
index 97c6d17beb1..f698bc5aec7 100644
--- a/common/sourceTest/java/ch/systemsx/cisd/common/filesystem/FileUtilitiesTest.java
+++ b/common/sourceTest/java/ch/systemsx/cisd/common/filesystem/FileUtilitiesTest.java
@@ -521,8 +521,9 @@ public final class FileUtilitiesTest extends AbstractFileSystemTestCase
@Test
public final void testByteCountToDisplaySize()
{
- assertEquals("0.00 bytes", FileUtilities.byteCountToDisplaySize(0));
- assertEquals("1.00 bytes", FileUtilities.byteCountToDisplaySize(1));
+ assertEquals("0 bytes", FileUtilities.byteCountToDisplaySize(0));
+ assertEquals("1 byte", FileUtilities.byteCountToDisplaySize(1));
+ assertEquals("2 bytes", FileUtilities.byteCountToDisplaySize(2));
assertEquals("1.00 KB", FileUtilities.byteCountToDisplaySize(1024));
assertEquals("1.01 KB", FileUtilities.byteCountToDisplaySize(1034));
assertEquals("1.00 MB", FileUtilities.byteCountToDisplaySize(1024 * 1024));
--
GitLab