Sergey Gotliv has uploaded a new change for review. Change subject: webadmin: DiskSizeRenderer properly handles input size unit ......................................................................
webadmin: DiskSizeRenderer properly handles input size unit Make DiskSizeRenderer correctly handle input in other units than bytes. Change-Id: Ief6751c9fb457e6b43166f39b7f46d30cfb938f2 Signed-off-by: Sergey Gotliv <[email protected]> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/renderer/DiskSizeRenderer.java 1 file changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/49/20049/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/renderer/DiskSizeRenderer.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/renderer/DiskSizeRenderer.java index 9446e03..38b4190 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/renderer/DiskSizeRenderer.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/renderer/DiskSizeRenderer.java @@ -54,12 +54,14 @@ } } - private String renderGigabyteSize(long sizeInBytes) { - long sizeInGB = SizeConverter.convert(sizeInBytes, SizeConverter.SizeUnit.BYTES, SizeUnit.GB).longValue(); + private String renderGigabyteSize(long size) { + long sizeInGB = (unit == SizeUnit.GB) ? + size : SizeConverter.convert(size, unit, SizeUnit.GB).longValue(); return sizeInGB >= 1 ? sizeInGB + " GB" : "< 1 GB"; //$NON-NLS-1$ //$NON-NLS-2$ } - private String renderHumanReadableSize(long sizeInBytes) { + private String renderHumanReadableSize(long size) { + long sizeInBytes = SizeConverter.convert(size, unit, SizeUnit.BYTES).longValue(); if(sizeInBytes > SizeConverter.BYTES_IN_GB) { return SizeConverter.convert(sizeInBytes, SizeConverter.SizeUnit.BYTES, SizeUnit.GB).longValue() + " GB"; //$NON-NLS-1$ } else if(sizeInBytes > SizeConverter.BYTES_IN_MB) { -- To view, visit http://gerrit.ovirt.org/20049 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ief6751c9fb457e6b43166f39b7f46d30cfb938f2 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Sergey Gotliv <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
