anmolbabu has uploaded a new change for review.
Change subject: webadmin : Fix SizeUnit refactor build failures
......................................................................
webadmin : Fix SizeUnit refactor build failures
This patch fixes the build failures introduced by the
recently merged refactoring patch the refactors
SizeConverter.SizeUnit units.
Change-Id: I2fc159fafa66683c8e6b385e6b283c229c7cc592
Signed-off-by: Anmol Babu <anb...@redhat.com>
---
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/VolumeRebalanceStatusPopupView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/quota/QuotaPopupView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabQuotaView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/datacenter/SubTabDataCenterStorageView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/disk/SubTabDiskStorageView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostGlusterStorageDevicesView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/quota/SubTabQuotaStorageView.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/storage/VMsTree.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/BrickCapacityCell.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/RebalanceFileSizeColumn.java
11 files changed, 18 insertions(+), 18 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/66/42166/1
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/VolumeRebalanceStatusPopupView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/VolumeRebalanceStatusPopupView.java
index 25b7aff..a1d918f 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/VolumeRebalanceStatusPopupView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/VolumeRebalanceStatusPopupView.java
@@ -150,7 +150,7 @@
}
}, getColumnHeaderForFilesMoved());
- rebalanceHostsTable.addEntityModelColumn(new
RebalanceFileSizeColumn<EntityModel>(messages) {
+ rebalanceHostsTable.addEntityModelColumn(new
RebalanceFileSizeColumn<EntityModel>() {
@Override
protected Long getRawValue(EntityModel object) {
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/quota/QuotaPopupView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/quota/QuotaPopupView.java
index 5d4c088..7cdc1d0 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/quota/QuotaPopupView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/quota/QuotaPopupView.java
@@ -63,7 +63,7 @@
private static final String MIN_COLOR = "#AFBF27"; //$NON-NLS-1$
private static final DiskSizeRenderer<Number> diskSizeRenderer =
- new DiskSizeRenderer<Number>(SizeConverter.SizeUnit.GB);
+ new DiskSizeRenderer<Number>(SizeConverter.SizeUnit.GiB);
@UiField
WidgetStyle style;
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabQuotaView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabQuotaView.java
index b68a5c5..4a44dbc 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabQuotaView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabQuotaView.java
@@ -27,7 +27,7 @@
private static final NumberFormat decimalFormat =
NumberFormat.getDecimalFormat();
private static final DiskSizeRenderer<Number> diskSizeRenderer =
- new DiskSizeRenderer<Number>(SizeConverter.SizeUnit.GB);
+ new DiskSizeRenderer<Number>(SizeConverter.SizeUnit.GiB);
interface ViewIdHandler extends ElementIdHandler<MainTabQuotaView> {
ViewIdHandler idHandler = GWT.create(ViewIdHandler.class);
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/datacenter/SubTabDataCenterStorageView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/datacenter/SubTabDataCenterStorageView.java
index ccc0bc9..4b67151 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/datacenter/SubTabDataCenterStorageView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/datacenter/SubTabDataCenterStorageView.java
@@ -70,7 +70,7 @@
statusColumn.makeSortable();
getTable().addColumn(statusColumn, constants.statusStorage(),
"160px"); //$NON-NLS-1$
- DiskSizeColumn<StorageDomain> freeColumn = new
DiskSizeColumn<StorageDomain>(SizeConverter.SizeUnit.GB) {
+ DiskSizeColumn<StorageDomain> freeColumn = new
DiskSizeColumn<StorageDomain>(SizeConverter.SizeUnit.GiB) {
@Override
public Long getRawValue(StorageDomain object) {
long availableDiskSize = object.getAvailableDiskSize() != null
? object.getAvailableDiskSize() : 0;
@@ -80,7 +80,7 @@
freeColumn.makeSortable();
getTable().addColumn(freeColumn, constants.freeSpaceStorage(),
"160px"); //$NON-NLS-1$
- DiskSizeColumn<StorageDomain> usedColumn = new
DiskSizeColumn<StorageDomain>(SizeConverter.SizeUnit.GB) {
+ DiskSizeColumn<StorageDomain> usedColumn = new
DiskSizeColumn<StorageDomain>(SizeConverter.SizeUnit.GiB) {
@Override
public Long getRawValue(StorageDomain object) {
long usedDiskSize = object.getUsedDiskSize() != null ?
object.getUsedDiskSize() : 0;
@@ -90,7 +90,7 @@
usedColumn.makeSortable();
getTable().addColumn(usedColumn, constants.usedSpaceStorage(),
"160px"); //$NON-NLS-1$
- DiskSizeColumn<StorageDomain> totalColumn = new
DiskSizeColumn<StorageDomain>(SizeConverter.SizeUnit.GB) {
+ DiskSizeColumn<StorageDomain> totalColumn = new
DiskSizeColumn<StorageDomain>(SizeConverter.SizeUnit.GiB) {
@Override
public Long getRawValue(StorageDomain object) {
long totalDiskSize = object.getTotalDiskSize() != null ?
object.getTotalDiskSize() : 0;
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/disk/SubTabDiskStorageView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/disk/SubTabDiskStorageView.java
index 1310cf5..558a326 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/disk/SubTabDiskStorageView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/disk/SubTabDiskStorageView.java
@@ -69,7 +69,7 @@
statusColumn.makeSortable();
getTable().addColumn(statusColumn, constants.statusStorage(),
"160px"); //$NON-NLS-1$
- DiskSizeColumn<StorageDomain> freeColumn = new
DiskSizeColumn<StorageDomain>(SizeConverter.SizeUnit.GB) {
+ DiskSizeColumn<StorageDomain> freeColumn = new
DiskSizeColumn<StorageDomain>(SizeConverter.SizeUnit.GiB) {
@Override
public Long getRawValue(StorageDomain object) {
long availableDiskSize = object.getAvailableDiskSize() != null
? object.getAvailableDiskSize() : 0;
@@ -79,7 +79,7 @@
freeColumn.makeSortable();
getTable().addColumn(freeColumn, constants.freeSpaceStorage(),
"160px"); //$NON-NLS-1$
- DiskSizeColumn<StorageDomain> usedColumn = new
DiskSizeColumn<StorageDomain>(SizeConverter.SizeUnit.GB) {
+ DiskSizeColumn<StorageDomain> usedColumn = new
DiskSizeColumn<StorageDomain>(SizeConverter.SizeUnit.GiB) {
@Override
public Long getRawValue(StorageDomain object) {
long usedDiskSize = object.getUsedDiskSize() != null ?
object.getUsedDiskSize() : 0;
@@ -89,7 +89,7 @@
usedColumn.makeSortable();
getTable().addColumn(usedColumn, constants.usedSpaceStorage(),
"160px"); //$NON-NLS-1$
- DiskSizeColumn<StorageDomain> totalColumn = new
DiskSizeColumn<StorageDomain>(SizeConverter.SizeUnit.GB) {
+ DiskSizeColumn<StorageDomain> totalColumn = new
DiskSizeColumn<StorageDomain>(SizeConverter.SizeUnit.GiB) {
@Override
public Long getRawValue(StorageDomain object) {
long totalDiskSize = object.getTotalDiskSize() != null ?
object.getTotalDiskSize() : 0;
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostGlusterStorageDevicesView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostGlusterStorageDevicesView.java
index 353925b..923f217 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostGlusterStorageDevicesView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostGlusterStorageDevicesView.java
@@ -69,7 +69,7 @@
new TextColumnWithTooltip<StorageDevice>() {
@Override
public String getValue(StorageDevice object) {
- Pair<SizeUnit, Double> convertedSize =
SizeConverter.autoConvert(object.getSize(), SizeUnit.MB);
+ Pair<SizeUnit, Double> convertedSize =
SizeConverter.autoConvert(object.getSize(), SizeUnit.MiB);
return formatSize(convertedSize.getSecond()) + " " +
convertedSize.getFirst().toString(); //$NON-NLS-1$
}
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/quota/SubTabQuotaStorageView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/quota/SubTabQuotaStorageView.java
index 7c4e765..f02d647 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/quota/SubTabQuotaStorageView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/quota/SubTabQuotaStorageView.java
@@ -26,7 +26,7 @@
implements SubTabQuotaStoragePresenter.ViewDef {
private static final DiskSizeRenderer<Number> diskSizeRenderer =
- new DiskSizeRenderer<Number>(SizeConverter.SizeUnit.GB);
+ new DiskSizeRenderer<Number>(SizeConverter.SizeUnit.GiB);
interface ViewIdHandler extends ElementIdHandler<SubTabQuotaStorageView> {
ViewIdHandler idHandler = GWT.create(ViewIdHandler.class);
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 c83ef39..00fb642 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
@@ -32,4 +32,5 @@
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/storage/VMsTree.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/storage/VMsTree.java
index a7ba45a..079c14f 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/storage/VMsTree.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/storage/VMsTree.java
@@ -119,7 +119,7 @@
addTextBoxToPanel(panel, new TextBoxLabel(), "", "80px");
//$NON-NLS-1$ //$NON-NLS-2$
addTextBoxToPanel(panel, new TextBoxLabel(), "", "160px");
//$NON-NLS-1$ //$NON-NLS-2$
addValueLabelToPanel(panel, new DiskSizeLabel<Long>(),
disk.getSizeInGigabytes(), "110px"); //$NON-NLS-1$
- addValueLabelToPanel(panel, new
DiskSizeLabel<Double>(SizeConverter.SizeUnit.GB), disk.getActualSize(),
"110px"); //$NON-NLS-1$
+ addValueLabelToPanel(panel, new
DiskSizeLabel<Double>(SizeConverter.SizeUnit.GiB), disk.getActualSize(),
"110px"); //$NON-NLS-1$
addValueLabelToPanel(panel, new FullDateTimeLabel(),
disk.getCreationDate(), "140px"); //$NON-NLS-1$
panel.setSpacing(1);
@@ -160,7 +160,7 @@
(long) (((LunDisk) disk).getLun().getDeviceSize() *
Math.pow(1024, 3));
addValueLabelToPanel(panel, new
DiskSizeLabel<Long>(SizeConverter.SizeUnit.BYTES), virtualSize, "110px");
//$NON-NLS-1$
- addValueLabelToPanel(panel, new
DiskSizeLabel<Double>(SizeConverter.SizeUnit.GB), actualSize, "110px");
//$NON-NLS-1$
+ addValueLabelToPanel(panel, new
DiskSizeLabel<Double>(SizeConverter.SizeUnit.GiB), actualSize, "110px");
//$NON-NLS-1$
addValueLabelToPanel(panel, new FullDateTimeLabel(),
disk.getDiskStorageType() == DiskStorageType.IMAGE ?
((DiskImage) disk).getCreationDate() : null, "140px");
//$NON-NLS-1$
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/BrickCapacityCell.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/BrickCapacityCell.java
index 64c2a48..81bf227 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/BrickCapacityCell.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/BrickCapacityCell.java
@@ -13,7 +13,7 @@
setFreeSize(value.getFreeSize());
setTotalSize(value.getTotalSize());
setUsedSize(value.getTotalSize() - value.getFreeSize());
- setInUnit(SizeUnit.MB);
+ setInUnit(SizeUnit.MiB);
}
super.render(context, value == null ? null : value, sb);
}
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/RebalanceFileSizeColumn.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/RebalanceFileSizeColumn.java
index 6260b3c60..d4c64b5 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/RebalanceFileSizeColumn.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/RebalanceFileSizeColumn.java
@@ -1,11 +1,10 @@
package org.ovirt.engine.ui.webadmin.widget.table.column;
import org.ovirt.engine.ui.common.widget.table.column.RenderedTextColumn;
-import org.ovirt.engine.ui.webadmin.ApplicationMessages;
import org.ovirt.engine.ui.webadmin.widget.renderer.RebalanceFileSizeRenderer;
public abstract class RebalanceFileSizeColumn<T> extends RenderedTextColumn<T,
Long> {
- public RebalanceFileSizeColumn(ApplicationMessages messages) {
- super(new RebalanceFileSizeRenderer<Long>(messages));
+ public RebalanceFileSizeColumn() {
+ super(new RebalanceFileSizeRenderer<Long>());
}
}
--
To view, visit https://gerrit.ovirt.org/42166
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2fc159fafa66683c8e6b385e6b283c229c7cc592
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
