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 210de9019fc92c1ebdd815c4ba166d24bfc400be..a4c531a2d3e0e9400686f9925fca2c17ff654ae4 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 97c6d17beb14c9f7167c35dd5b34655bfd699e48..f698bc5aec715192595fd7207ac833a6f6fc745c 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));