anmolbabu has uploaded a new change for review.
Change subject: webadmin,engine : Refactored SizeUnit as per IEC binary prefixes
......................................................................
webadmin,engine : Refactored SizeUnit as per IEC binary prefixes
This patch does the following:
[1] Adds a AlternateMessage to dynamically form size string(size+unit)
which in most places previously, used to do a normal string concat
using '+' operator.
[2] Added string equivalents to SizeUnit enum members and overrided
toString of SizeUnit to return this string. The reason is, this
toString can be later used to localize the string equivalents of
SizeUnit units.
[3] Removed some unused messges which turned unused after [1] above.
[4] Modified some places to use SizeConverter#autoConvert to avoid
replication of autoConvert logic.
Change-Id: Ieacb29c0df8d5355a754a3db15f976a986d771fd
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1214137
Signed-off-by: Anmol Babu <anb...@redhat.com>
---
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/SizeConverter.java
M
backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/SizeConverterTest.java
M
backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/StorageDomainMapper.java
M
backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/StorageLogicalUnitMapper.java
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/StorageSizeColumn.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/CreateBrickModel.java
M
frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIMessages.java
M
frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/QuotaMemoryProgressBar.java
M
frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/QuotaStorageProgressBar.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/section/main/view/popup/gluster/CreateBrickPopupView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/renderer/RebalanceFileSizeRenderer.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/renderer/VolumeCapacityRenderer.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/GlusterCapacityCell.java
14 files changed, 70 insertions(+), 64 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/22/41622/1
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/SizeConverter.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/SizeConverter.java
index e11e9f8..97a35af 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/SizeConverter.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/SizeConverter.java
@@ -19,18 +19,20 @@
}
public static enum SizeUnit {
- BYTES(1),
- KB(2),
- MB(3),
- GB(4),
- TB(5);
+ BYTES(1, "B"),
+ KiB(2, "KiB"),
+ MiB(3, "MiB"),
+ GiB(4, "GiB"),
+ TiB(5, "TiB");
private long unitWeight;
+ private String unitInString;
private static List<Pair<Long, SizeUnit>> weightToUnit = new
ArrayList<Pair<Long, SizeUnit>>();
- private SizeUnit(long unitWeight) {
+ private SizeUnit(long unitWeight, String unitString) {
this.unitWeight = unitWeight;
+ this.unitInString = unitString;
}
static {
@@ -61,6 +63,11 @@
public static SizeUnit getMinHandledUnit() {
return weightToUnit.get(weightToUnit.size() - 1).getSecond();
}
+
+ @Override
+ public String toString() {
+ return unitInString;
+ }
};
public static Number convert(long size, SizeUnit fromUnit, SizeUnit
toUnit) {
diff --git
a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/SizeConverterTest.java
b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/SizeConverterTest.java
index 6f040c8..b60e596 100644
---
a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/SizeConverterTest.java
+++
b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/SizeConverterTest.java
@@ -28,7 +28,7 @@
@Test
public void testConvertMBToBytes() {
long megabytes = 3L;
- long bytes = SizeConverter.convert(megabytes,
SizeConverter.SizeUnit.MB,
+ long bytes = SizeConverter.convert(megabytes,
SizeConverter.SizeUnit.MiB,
SizeConverter.SizeUnit.BYTES).longValue();
assertEquals(bytes, 3145728);
}
@@ -36,7 +36,7 @@
@Test
public void testCobvertGBToBytes() {
long gigabytes = 3L;
- long bytes = SizeConverter.convert(gigabytes,
SizeConverter.SizeUnit.GB,
+ long bytes = SizeConverter.convert(gigabytes,
SizeConverter.SizeUnit.GiB,
SizeConverter.SizeUnit.BYTES).longValue();
assertEquals(bytes, 3221225472L);
}
@@ -45,7 +45,7 @@
public void testConvertBytestoGB() {
long bytes = 3221228000L;
int gigabytes = SizeConverter.convert(bytes,
SizeConverter.SizeUnit.BYTES,
- SizeConverter.SizeUnit.GB).intValue();
+ SizeConverter.SizeUnit.GiB).intValue();
assertEquals(gigabytes, 3);
}
@@ -53,14 +53,14 @@
public void testConvertBytestoMB() {
long bytes = 3160000L;
int megabytes = SizeConverter.convert(bytes,
SizeConverter.SizeUnit.BYTES,
- SizeConverter.SizeUnit.MB).intValue();
+ SizeConverter.SizeUnit.MiB).intValue();
assertEquals(megabytes, 3);
}
@Test
public void testConvertMegaBytesToTB() {
long mb = 5 * 1024 * 1024;
- int tbs = SizeConverter.convert(mb, SizeUnit.MB,
SizeUnit.TB).intValue();
+ int tbs = SizeConverter.convert(mb, SizeUnit.MiB,
SizeUnit.TiB).intValue();
assertEquals(tbs, 5);
}
@@ -70,17 +70,17 @@
private static final long serialVersionUID = 1L;
{
- add(new Pair<SizeUnit, Double>(SizeUnit.KB, 1D));
- add(new Pair<SizeUnit, Double>(SizeUnit.KB, 1D));
- add(new Pair<SizeUnit, Double>(SizeUnit.KB, 1024D));
- add(new Pair<SizeUnit, Double>(SizeUnit.KB, 1024D * 1024D));
+ add(new Pair<SizeUnit, Double>(SizeUnit.KiB, 1D));
+ add(new Pair<SizeUnit, Double>(SizeUnit.KiB, 1D));
+ add(new Pair<SizeUnit, Double>(SizeUnit.KiB, 1024D));
+ add(new Pair<SizeUnit, Double>(SizeUnit.KiB, 1024D * 1024D));
}
};
List<Pair<SizeUnit, Double>> actual =
SizeConverter.getMathOperationSafeOperands(
new Pair<SizeUnit, Double>(SizeUnit.BYTES, 1024D),
- new Pair<SizeUnit, Double>(SizeUnit.KB, 1D),
- new Pair<SizeUnit, Double>(SizeUnit.MB, 1D),
- new Pair<SizeUnit, Double>(SizeUnit.GB, 1D)
+ new Pair<SizeUnit, Double>(SizeUnit.KiB, 1D),
+ new Pair<SizeUnit, Double>(SizeUnit.MiB, 1D),
+ new Pair<SizeUnit, Double>(SizeUnit.GiB, 1D)
);
assertEquals(expected, actual);
}
diff --git
a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/StorageDomainMapper.java
b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/StorageDomainMapper.java
index f535ae3..bfaceff 100644
---
a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/StorageDomainMapper.java
+++
b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/StorageDomainMapper.java
@@ -139,14 +139,14 @@
}
if (entity.getAvailableDiskSize()!= null) {
model.setAvailable(SizeConverter.convert(entity.getAvailableDiskSize().longValue(),
- SizeConverter.SizeUnit.GB,
SizeConverter.SizeUnit.BYTES).longValue());
+ SizeConverter.SizeUnit.GiB,
SizeConverter.SizeUnit.BYTES).longValue());
}
if (entity.getUsedDiskSize()!= null) {
model.setUsed(SizeConverter.convert(entity.getUsedDiskSize().longValue(),
- SizeConverter.SizeUnit.GB,
SizeConverter.SizeUnit.BYTES).longValue());
+ SizeConverter.SizeUnit.GiB,
SizeConverter.SizeUnit.BYTES).longValue());
}
model.setCommitted(SizeConverter.convert(entity.getCommittedDiskSize(),
- SizeConverter.SizeUnit.GB,
SizeConverter.SizeUnit.BYTES).longValue());
+ SizeConverter.SizeUnit.GiB,
SizeConverter.SizeUnit.BYTES).longValue());
if (entity.getStorageFormat()!= null) {
String storageFormat =
StorageFormatMapper.map(entity.getStorageFormat(), null).value();
if (storageFormat != null) {
diff --git
a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/StorageLogicalUnitMapper.java
b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/StorageLogicalUnitMapper.java
index 8302637..bfd25f5 100644
---
a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/StorageLogicalUnitMapper.java
+++
b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/StorageLogicalUnitMapper.java
@@ -41,7 +41,7 @@
model.setStatus(map(entity.getStatus(), null).value());
}
model.setSize(SizeConverter.convert((long)entity.getDeviceSize(),
- SizeConverter.SizeUnit.GB,
SizeConverter.SizeUnit.BYTES).longValue());
+ SizeConverter.SizeUnit.GiB,
SizeConverter.SizeUnit.BYTES).longValue());
model.setPaths(entity.getPathCount());
return model;
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/StorageSizeColumn.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/StorageSizeColumn.java
index 478e7b6..218e4f9 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/StorageSizeColumn.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/StorageSizeColumn.java
@@ -6,7 +6,7 @@
public abstract class StorageSizeColumn<T> extends AbstractSizeColumn<T> {
public StorageSizeColumn() {
- super(new DiskSizeRenderer<Long>(SizeConverter.SizeUnit.GB) {
+ super(new DiskSizeRenderer<Long>(SizeConverter.SizeUnit.GiB) {
@Override
protected boolean isUnavailable(Long size) {
return size == null || size.longValue() == 0;
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/CreateBrickModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/CreateBrickModel.java
index 95aed4f..2d56079 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/CreateBrickModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/CreateBrickModel.java
@@ -96,7 +96,7 @@
}
}
- Pair<SizeUnit, Double> convertedSize =
SizeConverter.autoConvert(totalSize, SizeUnit.MB);
+ Pair<SizeUnit, Double> convertedSize =
SizeConverter.autoConvert(totalSize, SizeUnit.MiB);
setBrickSize(convertedSize);
}
diff --git
a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIMessages.java
b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIMessages.java
index 8a94a09..5248c78 100644
---
a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIMessages.java
+++
b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIMessages.java
@@ -4,6 +4,7 @@
import
org.ovirt.engine.core.common.businessentities.gluster.GlusterGeoRepNonEligibilityReason;
import
org.ovirt.engine.core.common.businessentities.gluster.GlusterVolumeSnapshotScheduleRecurrence;
+import org.ovirt.engine.core.common.utils.SizeConverter.SizeUnit;
public interface UIMessages extends com.google.gwt.i18n.client.Messages {
@@ -454,6 +455,16 @@
})
String recurrenceType(@Select GlusterVolumeSnapshotScheduleRecurrence
recurrence);
+ @DefaultMessage("{0} TiB")
+ @AlternateMessage({
+ "BYTES", "{0} B",
+ "KiB", "{0} KiB",
+ "MiB", "{0} MiB",
+ "GiB", "{0} GiB",
+ "TiB", "{0} TiB"
+ })
+ String sizeUnitString(String size, @Select SizeUnit sizeUnit);
+
@DefaultMessage("Session DB Id:{0}, User:{1}")
String userSessionRow(long sessionId, String UserName);
diff --git
a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/QuotaMemoryProgressBar.java
b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/QuotaMemoryProgressBar.java
index 7cde26d..bb3fcb0 100644
---
a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/QuotaMemoryProgressBar.java
+++
b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/QuotaMemoryProgressBar.java
@@ -11,7 +11,7 @@
private static final double GIGA = 1024;
private static final double MB_GB_THRESHOLD = 4; // over this threshold
number would be presented in GB not MB
private static final DiskSizeRenderer<Number> diskSizeRenderer =
- new DiskSizeRenderer<Number>(SizeConverter.SizeUnit.GB);
+ new DiskSizeRenderer<Number>(SizeConverter.SizeUnit.GiB);
public QuotaMemoryProgressBar(QuotaUsagePerUser quotaUsagePerUser) {
super(quotaUsagePerUser);
diff --git
a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/QuotaStorageProgressBar.java
b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/QuotaStorageProgressBar.java
index c8b9fbe..12f1a29 100644
---
a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/QuotaStorageProgressBar.java
+++
b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/QuotaStorageProgressBar.java
@@ -17,7 +17,7 @@
}
private static final DiskSizeRenderer<Number> diskSizeRenderer =
- new DiskSizeRenderer<Number>(SizeConverter.SizeUnit.GB);
+ new DiskSizeRenderer<Number>(SizeConverter.SizeUnit.GiB);
@Override
protected void setValuesByType(QuotaUsagePerUser quotaUsagePerUser) {
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 864db7c..2d9f924 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
@@ -92,18 +92,6 @@
@DefaultMessage("Rebalance {0}")
String rebalanceStatusMessage(JobExecutionStatus jobStatus);
- @DefaultMessage("{0} Bytes")
- String rebalanceFileSizeBytes(String size);
-
- @DefaultMessage("{0} KB")
- String rebalanceFileSizeKb(String size);
-
- @DefaultMessage("{0} MB")
- String rebalanceFileSizeMb(String size);
-
- @DefaultMessage("{0} GB")
- String rebalanceFileSizeGb(String size);
-
@DefaultMessage("{0}. Moving the display network will drop VM console
connectivity until they are restarted.")
String moveDisplayNetworkWarning(String networkOperationMessage);
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/CreateBrickPopupView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/CreateBrickPopupView.java
index baa7e17..e8fef3a 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/CreateBrickPopupView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/CreateBrickPopupView.java
@@ -18,6 +18,8 @@
import org.ovirt.engine.ui.common.widget.table.column.TextColumnWithTooltip;
import org.ovirt.engine.ui.uicommonweb.models.ListModel;
import org.ovirt.engine.ui.uicommonweb.models.gluster.CreateBrickModel;
+import org.ovirt.engine.ui.uicompat.ConstantsManager;
+import org.ovirt.engine.ui.uicompat.UIMessages;
import org.ovirt.engine.ui.webadmin.ApplicationConstants;
import org.ovirt.engine.ui.webadmin.ApplicationResources;
import
org.ovirt.engine.ui.webadmin.section.main.presenter.popup.gluster.CreateBrickPopupPresenterWidget;
@@ -102,6 +104,7 @@
private final Driver driver = GWT.create(Driver.class);
private final ApplicationConstants constants;
+ private final static UIMessages messages =
ConstantsManager.getInstance().getMessages();
@Inject
public CreateBrickPopupView(EventBus eventBus, ApplicationResources
resources, ApplicationConstants constants) {
@@ -139,8 +142,8 @@
deviceTable.addColumnAndSetWidth(new
TextColumnWithTooltip<StorageDevice>() {
@Override
public String getValue(StorageDevice entity) {
- Pair<SizeUnit, Double> convertedSize =
SizeConverter.autoConvert(entity.getSize(), SizeUnit.MB);
- return formatSize(convertedSize.getSecond()) + " " +
convertedSize.getFirst().toString(); //$NON-NLS-1$
+ Pair<SizeUnit, Double> convertedSize =
SizeConverter.autoConvert(entity.getSize(), SizeUnit.MiB);
+ return
messages.sizeUnitString(formatSize(convertedSize.getSecond()),
convertedSize.getFirst()); //$NON-NLS-1$
}
}, constants.size(), "100px"); //$NON-NLS-1$
}
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 20a7a6e..8c92e3b 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
@@ -1,31 +1,22 @@
package org.ovirt.engine.ui.webadmin.widget.renderer;
+import org.ovirt.engine.core.common.utils.Pair;
import org.ovirt.engine.core.common.utils.SizeConverter;
import org.ovirt.engine.core.common.utils.SizeConverter.SizeUnit;
-import org.ovirt.engine.ui.webadmin.ApplicationMessages;
+import org.ovirt.engine.ui.uicompat.ConstantsManager;
+import org.ovirt.engine.ui.uicompat.UIMessages;
import com.google.gwt.i18n.client.NumberFormat;
import com.google.gwt.text.shared.AbstractRenderer;
public class RebalanceFileSizeRenderer<T extends Number> extends
AbstractRenderer<T> {
- private ApplicationMessages messages;
+ private final static UIMessages messages =
ConstantsManager.getInstance().getMessages();
@Override
public String render(T size) {
- if(size.longValue() > SizeConverter.BYTES_IN_GB) {
- return
messages.rebalanceFileSizeGb(formatSize(SizeConverter.convert(size.longValue(),
SizeUnit.BYTES, SizeUnit.GB).doubleValue()));
- } else if(size.longValue() > SizeConverter.BYTES_IN_MB) {
- return
messages.rebalanceFileSizeMb(formatSize(SizeConverter.convert(size.longValue(),
SizeUnit.BYTES, SizeUnit.MB).doubleValue()));
- } else if(size.longValue() > SizeConverter.BYTES_IN_KB) {
- return
messages.rebalanceFileSizeKb(formatSize(SizeConverter.convert(size.longValue(),
SizeUnit.BYTES, SizeUnit.KB).doubleValue()));
- } else {
- return
messages.rebalanceFileSizeBytes(formatSize(size.doubleValue()));
- }
- }
-
- public RebalanceFileSizeRenderer(ApplicationMessages messages) {
- this.messages = messages;
+ Pair<SizeUnit, Double> sizePair =
SizeConverter.autoConvert(size.longValue(), SizeUnit.BYTES);
+ return messages.sizeUnitString(formatSize(sizePair.getSecond()),
sizePair.getFirst());
}
public String formatSize(double size) {
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/renderer/VolumeCapacityRenderer.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/renderer/VolumeCapacityRenderer.java
index 18c7550..c83ef39 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/renderer/VolumeCapacityRenderer.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/renderer/VolumeCapacityRenderer.java
@@ -4,12 +4,15 @@
import org.ovirt.engine.core.common.utils.SizeConverter;
import org.ovirt.engine.core.common.utils.SizeConverter.SizeUnit;
import org.ovirt.engine.ui.common.CommonApplicationConstants;
+import org.ovirt.engine.ui.uicompat.ConstantsManager;
+import org.ovirt.engine.ui.uicompat.UIMessages;
import com.google.gwt.i18n.client.NumberFormat;
import com.google.gwt.text.shared.AbstractRenderer;
public class VolumeCapacityRenderer<T extends Number> extends
AbstractRenderer<T> {
+ private final static UIMessages messages =
ConstantsManager.getInstance().getMessages();
private final CommonApplicationConstants constants;
public VolumeCapacityRenderer(CommonApplicationConstants constants) {
@@ -20,7 +23,7 @@
public String render(T size) {
if (size != null) {
Pair<SizeUnit, Double> sizeWithUnits =
SizeConverter.autoConvert(size.longValue(), SizeUnit.BYTES);
- return formatSize(sizeWithUnits.getSecond()) + " " +
sizeWithUnits.getFirst();//$NON-NLS-1$
+ return
messages.sizeUnitString(formatSize(sizeWithUnits.getSecond()),
sizeWithUnits.getFirst());//$NON-NLS-1$
} else {
return constants.notAvailableLabel();
}
@@ -29,4 +32,4 @@
public String formatSize(double size) {
return NumberFormat.getFormat("#.##").format(size);//$NON-NLS-1$
}
-}
+}
\ No newline at end of file
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/GlusterCapacityCell.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/GlusterCapacityCell.java
index fa6f321..5538111 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/GlusterCapacityCell.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/GlusterCapacityCell.java
@@ -1,23 +1,26 @@
package org.ovirt.engine.ui.webadmin.widget.table.column;
+import java.io.Serializable;
+
import org.ovirt.engine.core.common.utils.Pair;
import org.ovirt.engine.core.common.utils.SizeConverter;
import org.ovirt.engine.core.common.utils.SizeConverter.SizeUnit;
+import org.ovirt.engine.ui.uicompat.ConstantsManager;
import org.ovirt.engine.ui.webadmin.ApplicationConstants;
import org.ovirt.engine.ui.webadmin.ApplicationMessages;
import org.ovirt.engine.ui.webadmin.ApplicationTemplates;
+import org.ovirt.engine.ui.webadmin.gin.AssetProvider;
import com.google.gwt.cell.client.AbstractCell;
-import com.google.gwt.core.client.GWT;
import com.google.gwt.i18n.client.NumberFormat;
import com.google.gwt.safehtml.shared.SafeHtml;
import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
-public abstract class GlusterCapacityCell<P> extends AbstractCell<P>{
+public abstract class GlusterCapacityCell<P extends Serializable> extends
AbstractCell<P>{
- protected static final ApplicationConstants constants =
GWT.create(ApplicationConstants.class);
- protected static final ApplicationTemplates templates =
GWT.create(ApplicationTemplates.class);
- protected static final ApplicationMessages messages =
GWT.create(ApplicationMessages.class);
+ protected ApplicationTemplates templates = AssetProvider.getTemplates();
+ protected ApplicationMessages messages = AssetProvider.getMessages();
+ protected ApplicationConstants constants = AssetProvider.getConstants();
private Double freeSize;
private Double totalSize;
@@ -29,7 +32,7 @@
return constants.notAvailableLabel();
} else {
Pair<SizeUnit, Double> sizeWithUnits =
SizeConverter.autoConvert(size.longValue(), inUnit);
- return formatSize(sizeWithUnits.getSecond()) + " " +
sizeWithUnits.getFirst().toString();//$NON-NLS-1$
+ return
ConstantsManager.getInstance().getMessages().sizeUnitString(formatSize(sizeWithUnits.getSecond()),
sizeWithUnits.getFirst());//$NON-NLS-1$
}
}
@@ -80,7 +83,7 @@
}
@Override
- public void render(Context context, P value, SafeHtmlBuilder sb) {
+ public void render(Context context, Serializable value, SafeHtmlBuilder
sb) {
if(value == null) {
clearAll();
}
--
To view, visit https://gerrit.ovirt.org/41622
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieacb29c0df8d5355a754a3db15f976a986d771fd
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.5-gluster
Gerrit-Owner: anmolbabu <anb...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
