anmolbabu has uploaded a new change for review. Change subject: webadmin : rebalance file size bug fixed ......................................................................
webadmin : rebalance file size bug fixed Rebalance file size in rebalance status was getting rounded down to nearest integeral value now it is modified to show a floating value. Change-Id: I04862c25ee0549eb7faa84170a11ae71fb12cf45 Signed-off-by: Anmol Babu <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SizeConverter.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationMessages.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/renderer/RebalanceFileSizeRenderer.java 3 files changed, 9 insertions(+), 9 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/45/20045/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SizeConverter.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SizeConverter.java index 5115d28..4082f33 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SizeConverter.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SizeConverter.java @@ -28,6 +28,6 @@ public static Number convert(long size, SizeUnit fromUnit, SizeUnit toUnit) { long fromType = fromUnit.getUnitWeight(); long toType = toUnit.getUnitWeight(); - return (size) * ((Math.pow(CONVERT_FACTOR, fromType)) / (Math.pow(CONVERT_FACTOR, toType))); + return (size) * (((Math.pow(CONVERT_FACTOR, fromType) * 1.0)) / ((Math.pow(CONVERT_FACTOR, toType) * 1.0)) * 1.0); } } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationMessages.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationMessages.java index 8eca4ab..138e50e 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationMessages.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationMessages.java @@ -93,14 +93,14 @@ @DefaultMessage("{0} Bytes") - String rebalanceFileSizeBytes(long size); + String rebalanceFileSizeBytes(double size); @DefaultMessage("{0} Kb") - String rebalanceFileSizeKb(long size); + String rebalanceFileSizeKb(double size); @DefaultMessage("{0} Mb") - String rebalanceFileSizeMb(long size); + String rebalanceFileSizeMb(double size); @DefaultMessage("{0} Gb") - String rebalanceFileSizeGb(long size); + String rebalanceFileSizeGb(double size); } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/renderer/RebalanceFileSizeRenderer.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/renderer/RebalanceFileSizeRenderer.java index d732fb1..47a0a8d 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/renderer/RebalanceFileSizeRenderer.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/renderer/RebalanceFileSizeRenderer.java @@ -13,13 +13,13 @@ @Override public String render(T size) { if(size.longValue() > SizeConverter.BYTES_IN_GB) { - return messages.rebalanceFileSizeGb(SizeConverter.convert(size.longValue(), SizeUnit.BYTES, SizeUnit.GB).longValue()); + return messages.rebalanceFileSizeGb(SizeConverter.convert(size.longValue(), SizeUnit.BYTES, SizeUnit.GB).doubleValue()); } else if(size.longValue() > SizeConverter.BYTES_IN_MB) { - return messages.rebalanceFileSizeMb(SizeConverter.convert(size.longValue(), SizeUnit.BYTES, SizeUnit.MB).longValue()); + return messages.rebalanceFileSizeMb(SizeConverter.convert(size.longValue(), SizeUnit.BYTES, SizeUnit.MB).doubleValue()); } else if(size.longValue() > SizeConverter.BYTES_IN_KB) { - return messages.rebalanceFileSizeKb(SizeConverter.convert(size.longValue(), SizeUnit.BYTES, SizeUnit.KB).longValue()); + return messages.rebalanceFileSizeKb(SizeConverter.convert(size.longValue(), SizeUnit.BYTES, SizeUnit.KB).doubleValue()); } else { - return messages.rebalanceFileSizeBytes(size.longValue()); + return messages.rebalanceFileSizeBytes(size.doubleValue()); } } -- To view, visit http://gerrit.ovirt.org/20045 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I04862c25ee0549eb7faa84170a11ae71fb12cf45 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: anmolbabu <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
