Sergey Gotliv has uploaded a new change for review. Change subject: webadmin: Using SizeConverter.SizeUnit by DiskSizeRenderer ......................................................................
webadmin: Using SizeConverter.SizeUnit by DiskSizeRenderer 1.Removes DiskSizeRender.DiskSizeUnit enum and start using SizeConverter.SizeUnit instead. Both enums are representing disk size units but SizeUnit is used by SizeConverter utility when converting the size from one unit to another. 2.Signature of SizeConverter convert function is changed to return general Number and not only long as it was before. It allows to return numbers with floating point. Change-Id: I1d1820aaa246577f8d39a6826c04b31771c1ac06 Signed-off-by: Sergey Gotliv <[email protected]> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/label/DiskSizeLabel.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/label/StorageSizeLabel.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/renderer/DiskSizeRenderer.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/DiskSizeColumn.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/StorageSizeColumn.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/disks/DisksViewColumns.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmDiskPopupWidget.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/DisksAllocationItemView.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/template/TemplateDiskListModelTable.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SizeConverter.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/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/quota/SubTabQuotaStorageView.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/storage/TemplatesTree.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/template/DisksTree.java 21 files changed, 53 insertions(+), 64 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/45/19745/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/label/DiskSizeLabel.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/label/DiskSizeLabel.java index cf4f94a..1d53943 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/label/DiskSizeLabel.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/label/DiskSizeLabel.java @@ -1,18 +1,17 @@ package org.ovirt.engine.ui.common.widget.label; import org.ovirt.engine.ui.common.widget.renderer.DiskSizeRenderer; -import org.ovirt.engine.ui.common.widget.renderer.DiskSizeRenderer.DiskSizeUnit; import com.google.gwt.user.client.ui.ValueLabel; +import org.ovirt.engine.ui.uicommonweb.models.SizeConverter; public class DiskSizeLabel<T extends Number> extends ValueLabel<T> { public DiskSizeLabel() { - super(new DiskSizeRenderer<T>(DiskSizeUnit.GIGABYTE)); + super(new DiskSizeRenderer<T>(SizeConverter.SizeUnit.GB)); } - public DiskSizeLabel(DiskSizeUnit diskSizeUnit) { + public DiskSizeLabel(SizeConverter.SizeUnit diskSizeUnit) { super(new DiskSizeRenderer<T>(diskSizeUnit)); } - } diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/label/StorageSizeLabel.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/label/StorageSizeLabel.java index 0ee43a2..2957def 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/label/StorageSizeLabel.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/label/StorageSizeLabel.java @@ -2,12 +2,12 @@ import com.google.gwt.user.client.ui.ValueLabel; import org.ovirt.engine.ui.common.widget.renderer.DiskSizeRenderer; -import org.ovirt.engine.ui.common.widget.renderer.DiskSizeRenderer.DiskSizeUnit; +import org.ovirt.engine.ui.uicommonweb.models.SizeConverter; public class StorageSizeLabel<T extends Number> extends ValueLabel<T> { public StorageSizeLabel() { - super(new DiskSizeRenderer<T>(DiskSizeUnit.GIGABYTE) { + super(new DiskSizeRenderer<T>(SizeConverter.SizeUnit.GB) { @Override protected boolean isUnavailable(T size) { return size == null || size.longValue() == 0; 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 57cc623..abbc009 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 @@ -3,19 +3,15 @@ import com.google.gwt.core.client.GWT; import com.google.gwt.text.shared.AbstractRenderer; import org.ovirt.engine.ui.common.CommonApplicationConstants; +import org.ovirt.engine.ui.uicommonweb.models.SizeConverter; public class DiskSizeRenderer<T extends Number> extends AbstractRenderer<T> { - public enum DiskSizeUnit { - BYTE, - GIGABYTE; - } - - private final DiskSizeUnit unit; + private final SizeConverter.SizeUnit unit; private static final CommonApplicationConstants CONSTANTS = GWT.create(CommonApplicationConstants.class); - public DiskSizeRenderer(DiskSizeUnit unit) { + public DiskSizeRenderer(SizeConverter.SizeUnit unit) { if (unit == null) { throw new IllegalArgumentException("The unit can not be null!"); //$NON-NLS-1$ } @@ -33,18 +29,7 @@ return CONSTANTS.unAvailablePropertyLabel(); } - long sizeInGB = -1; - - switch (unit) { - case BYTE: - sizeInGB = (long) (size.longValue() / Math.pow(1024, 3)); - break; - case GIGABYTE: - sizeInGB = size.longValue(); - break; - } - + long sizeInGB = SizeConverter.convert(size.longValue(), unit, SizeConverter.SizeUnit.GB).longValue(); return sizeInGB >= 1 ? sizeInGB + " GB" : "< 1 GB"; //$NON-NLS-1$ //$NON-NLS-2$ } - } diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/DiskSizeColumn.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/DiskSizeColumn.java index 34ab25c..4a3804b 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/DiskSizeColumn.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/DiskSizeColumn.java @@ -1,15 +1,15 @@ package org.ovirt.engine.ui.common.widget.table.column; import org.ovirt.engine.ui.common.widget.renderer.DiskSizeRenderer; -import org.ovirt.engine.ui.common.widget.renderer.DiskSizeRenderer.DiskSizeUnit; +import org.ovirt.engine.ui.uicommonweb.models.SizeConverter; public abstract class DiskSizeColumn<T> extends RenderedTextColumn<T, Long> { public DiskSizeColumn() { - super(new DiskSizeRenderer<Long>(DiskSizeUnit.BYTE)); + super(new DiskSizeRenderer<Long>(SizeConverter.SizeUnit.BYTES)); } - public DiskSizeColumn(DiskSizeUnit diskSizeUnit) { + public DiskSizeColumn(SizeConverter.SizeUnit diskSizeUnit) { super(new DiskSizeRenderer<Long>(diskSizeUnit)); } 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 9812af8..1babefc 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 @@ -1,12 +1,12 @@ package org.ovirt.engine.ui.common.widget.table.column; import org.ovirt.engine.ui.common.widget.renderer.DiskSizeRenderer; -import org.ovirt.engine.ui.common.widget.renderer.DiskSizeRenderer.DiskSizeUnit; +import org.ovirt.engine.ui.uicommonweb.models.SizeConverter; public abstract class StorageSizeColumn<T> extends RenderedTextColumn<T, Long> { public StorageSizeColumn() { - super(new DiskSizeRenderer<Long>(DiskSizeUnit.GIGABYTE) { + super(new DiskSizeRenderer<Long>(SizeConverter.SizeUnit.GB) { @Override protected boolean isUnavailable(Long size) { return size == null || size.longValue() == 0; diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/disks/DisksViewColumns.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/disks/DisksViewColumns.java index 55543c3..9aa34f3 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/disks/DisksViewColumns.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/disks/DisksViewColumns.java @@ -15,7 +15,6 @@ import org.ovirt.engine.ui.common.CommonApplicationConstants; import org.ovirt.engine.ui.common.CommonApplicationMessages; import org.ovirt.engine.ui.common.CommonApplicationResources; -import org.ovirt.engine.ui.common.widget.renderer.DiskSizeRenderer.DiskSizeUnit; import org.ovirt.engine.ui.common.widget.table.column.DiskContainersColumn; import org.ovirt.engine.ui.common.widget.table.column.DiskSizeColumn; import org.ovirt.engine.ui.common.widget.table.column.DiskStatusColumn; @@ -28,6 +27,7 @@ import com.google.gwt.core.client.GWT; import com.google.gwt.resources.client.ImageResource; +import org.ovirt.engine.ui.uicommonweb.models.SizeConverter; public class DisksViewColumns { private static final CommonApplicationResources resources = GWT.create(CommonApplicationResources.class); @@ -141,7 +141,7 @@ } }; - public static final DiskSizeColumn<Disk> actualSizeColumn = new DiskSizeColumn<Disk>(DiskSizeUnit.GIGABYTE) { + public static final DiskSizeColumn<Disk> actualSizeColumn = new DiskSizeColumn<Disk>(SizeConverter.SizeUnit.GB) { @Override protected Long getRawValue(Disk object) { return object.getDiskStorageType() == DiskStorageType.IMAGE ? diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmDiskPopupWidget.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmDiskPopupWidget.java index 341f320..3226184 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmDiskPopupWidget.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmDiskPopupWidget.java @@ -33,7 +33,6 @@ import org.ovirt.engine.ui.common.widget.editor.EntityModelCheckBoxEditor; import org.ovirt.engine.ui.common.widget.editor.EntityModelTextBoxEditor; import org.ovirt.engine.ui.common.widget.editor.ListModelListBoxEditor; -import org.ovirt.engine.ui.common.widget.renderer.DiskSizeRenderer.DiskSizeUnit; import org.ovirt.engine.ui.common.widget.renderer.EnumRenderer; import org.ovirt.engine.ui.common.widget.renderer.NullSafeRenderer; import org.ovirt.engine.ui.common.widget.renderer.StorageDomainFreeSpaceRenderer; @@ -47,6 +46,7 @@ import org.ovirt.engine.ui.common.widget.uicommon.storage.IscsiStorageView; import org.ovirt.engine.ui.uicommonweb.models.EntityModel; import org.ovirt.engine.ui.uicommonweb.models.ListModel; +import org.ovirt.engine.ui.uicommonweb.models.SizeConverter; import org.ovirt.engine.ui.uicommonweb.models.storage.FcpStorageModel; import org.ovirt.engine.ui.uicommonweb.models.storage.IStorageModel; import org.ovirt.engine.ui.uicommonweb.models.storage.IscsiStorageModel; @@ -432,7 +432,7 @@ }; externalDiskTable.addColumn(idColumn, constants.idVmDiskTable(), "60px"); //$NON-NLS-1$ - DiskSizeColumn<EntityModel> sizeColumn = new DiskSizeColumn<EntityModel>(DiskSizeUnit.GIGABYTE) { + DiskSizeColumn<EntityModel> sizeColumn = new DiskSizeColumn<EntityModel>(SizeConverter.SizeUnit.GB) { @Override protected Long getRawValue(EntityModel object) { LunDisk disk = (LunDisk) (((DiskModel) (object.getEntity())).getDisk()); diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/DisksAllocationItemView.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/DisksAllocationItemView.java index 8b01897..7c07635 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/DisksAllocationItemView.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/DisksAllocationItemView.java @@ -12,10 +12,10 @@ import org.ovirt.engine.ui.common.widget.editor.EntityModelTextBoxEditor; import org.ovirt.engine.ui.common.widget.editor.ListModelListBoxEditor; import org.ovirt.engine.ui.common.widget.renderer.DiskSizeRenderer; -import org.ovirt.engine.ui.common.widget.renderer.DiskSizeRenderer.DiskSizeUnit; import org.ovirt.engine.ui.common.widget.renderer.EnumRenderer; import org.ovirt.engine.ui.common.widget.renderer.NullSafeRenderer; import org.ovirt.engine.ui.common.widget.renderer.StorageDomainFreeSpaceRenderer; +import org.ovirt.engine.ui.uicommonweb.models.SizeConverter; import org.ovirt.engine.ui.uicommonweb.models.vms.DiskModel; import com.google.gwt.core.client.GWT; @@ -143,7 +143,7 @@ driver.edit(object); diskAliasLabel.asValueBox().setValue(object.getAlias().getEntity()); - diskSizeLabel.asValueBox().setValue((new DiskSizeRenderer<Long>(DiskSizeUnit.GIGABYTE).render( + diskSizeLabel.asValueBox().setValue((new DiskSizeRenderer<Long>(SizeConverter.SizeUnit.GB).render( (Long) object.getSize().getEntity()))); object.getVolumeType().setSelectedItem(((DiskImage) object.getDisk()).getVolumeType()); diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/template/TemplateDiskListModelTable.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/template/TemplateDiskListModelTable.java index 089c99e..83956f1 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/template/TemplateDiskListModelTable.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/template/TemplateDiskListModelTable.java @@ -9,12 +9,12 @@ import org.ovirt.engine.ui.common.CommonApplicationConstants; import org.ovirt.engine.ui.common.system.ClientStorage; import org.ovirt.engine.ui.common.uicommon.model.SearchableTableModelProvider; -import org.ovirt.engine.ui.common.widget.renderer.DiskSizeRenderer.DiskSizeUnit; import org.ovirt.engine.ui.common.widget.table.column.DiskSizeColumn; import org.ovirt.engine.ui.common.widget.table.column.EnumColumn; import org.ovirt.engine.ui.common.widget.table.column.FullDateTimeColumn; import org.ovirt.engine.ui.common.widget.table.column.TextColumnWithTooltip; import org.ovirt.engine.ui.common.widget.uicommon.AbstractModelBoundTableWidget; +import org.ovirt.engine.ui.uicommonweb.models.SizeConverter; import org.ovirt.engine.ui.uicommonweb.models.templates.TemplateDiskListModel; import com.google.gwt.event.shared.EventBus; @@ -47,7 +47,7 @@ }; getTable().addColumn(provisionedSizeColumn, constants.provisionedSizeDisk(), "150px"); //$NON-NLS-1$ - DiskSizeColumn<DiskImage> actualSizeColumn = new DiskSizeColumn<DiskImage>(DiskSizeUnit.GIGABYTE) { + DiskSizeColumn<DiskImage> actualSizeColumn = new DiskSizeColumn<DiskImage>(SizeConverter.SizeUnit.GB) { @Override protected Long getRawValue(DiskImage object) { return Math.round((object.getActualDiskWithSnapshotsSize())); 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 d81f359..5115d28 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 @@ -25,9 +25,9 @@ } }; - public static long convert(long size, SizeUnit fromUnit, SizeUnit toUnit) { + public static Number convert(long size, SizeUnit fromUnit, SizeUnit toUnit) { long fromType = fromUnit.getUnitWeight(); long toType = toUnit.getUnitWeight(); - return (long) ((size) * ((Math.pow(CONVERT_FACTOR, fromType)) / (Math.pow(CONVERT_FACTOR, toType)))); + return (size) * ((Math.pow(CONVERT_FACTOR, fromType)) / (Math.pow(CONVERT_FACTOR, toType))); } } 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 d0ab92c..d178a8f 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 @@ -4,13 +4,14 @@ import org.ovirt.engine.ui.common.widget.renderer.DiskSizeRenderer; import com.google.gwt.safehtml.shared.SafeHtml; +import org.ovirt.engine.ui.uicommonweb.models.SizeConverter; public class QuotaMemoryProgressBar extends QuotaProgressBar { 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>(DiskSizeRenderer.DiskSizeUnit.GIGABYTE); + new DiskSizeRenderer<Number>(SizeConverter.SizeUnit.GB); 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 0f5ee54..4d54301 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 @@ -4,6 +4,7 @@ import org.ovirt.engine.ui.common.widget.renderer.DiskSizeRenderer; import com.google.gwt.safehtml.shared.SafeHtml; +import org.ovirt.engine.ui.uicommonweb.models.SizeConverter; public class QuotaStorageProgressBar extends QuotaProgressBar { @@ -16,7 +17,7 @@ } private static final DiskSizeRenderer<Number> diskSizeRenderer = - new DiskSizeRenderer<Number>(DiskSizeRenderer.DiskSizeUnit.GIGABYTE); + new DiskSizeRenderer<Number>(SizeConverter.SizeUnit.GB); @Override protected void setValuesByType(QuotaUsagePerUser quotaUsagePerUser) { 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 8808555..9d3ed1e 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 @@ -20,6 +20,7 @@ import org.ovirt.engine.ui.common.widget.renderer.NullSafeRenderer; 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.SizeConverter; import org.ovirt.engine.ui.uicommonweb.models.quota.QuotaModel; import org.ovirt.engine.ui.uicompat.Event; import org.ovirt.engine.ui.uicompat.EventArgs; @@ -60,7 +61,7 @@ private static final String MIN_COLOR = "#AFBF27"; //$NON-NLS-1$ private static final DiskSizeRenderer<Number> diskSizeRenderer = - new DiskSizeRenderer<Number>(DiskSizeRenderer.DiskSizeUnit.GIGABYTE); + new DiskSizeRenderer<Number>(SizeConverter.SizeUnit.GB); @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 a3417c2..e69ae0c 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 @@ -8,6 +8,7 @@ import org.ovirt.engine.ui.common.widget.renderer.DiskSizeRenderer; import org.ovirt.engine.ui.common.widget.table.column.TextColumnWithTooltip; import org.ovirt.engine.ui.uicommonweb.UICommand; +import org.ovirt.engine.ui.uicommonweb.models.SizeConverter; import org.ovirt.engine.ui.uicommonweb.models.quota.QuotaListModel; import org.ovirt.engine.ui.webadmin.ApplicationConstants; import org.ovirt.engine.ui.webadmin.section.main.presenter.tab.MainTabQuotaPresenter; @@ -25,7 +26,7 @@ private static final NumberFormat decimalFormat = NumberFormat.getDecimalFormat(); private static final DiskSizeRenderer<Number> diskSizeRenderer = - new DiskSizeRenderer<Number>(DiskSizeRenderer.DiskSizeUnit.GIGABYTE); + new DiskSizeRenderer<Number>(SizeConverter.SizeUnit.GB); 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 ffc71ce..d6d9f08 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 @@ -8,11 +8,11 @@ import org.ovirt.engine.core.common.businessentities.StoragePool; import org.ovirt.engine.ui.common.idhandler.ElementIdHandler; import org.ovirt.engine.ui.common.uicommon.model.SearchableDetailModelProvider; -import org.ovirt.engine.ui.common.widget.renderer.DiskSizeRenderer.DiskSizeUnit; import org.ovirt.engine.ui.common.widget.table.column.DiskSizeColumn; import org.ovirt.engine.ui.common.widget.table.column.EnumColumn; import org.ovirt.engine.ui.common.widget.table.column.TextColumnWithTooltip; import org.ovirt.engine.ui.uicommonweb.UICommand; +import org.ovirt.engine.ui.uicommonweb.models.SizeConverter; import org.ovirt.engine.ui.uicommonweb.models.datacenters.DataCenterListModel; import org.ovirt.engine.ui.uicommonweb.models.datacenters.DataCenterStorageListModel; import org.ovirt.engine.ui.webadmin.ApplicationConstants; @@ -67,7 +67,7 @@ }; getTable().addColumn(statusColumn, constants.statusStorage(), "160px"); //$NON-NLS-1$ - DiskSizeColumn<StorageDomain> freeColumn = new DiskSizeColumn<StorageDomain>(DiskSizeUnit.GIGABYTE) { + DiskSizeColumn<StorageDomain> freeColumn = new DiskSizeColumn<StorageDomain>(SizeConverter.SizeUnit.GB) { @Override public Long getRawValue(StorageDomain object) { long availableDiskSize = object.getAvailableDiskSize() != null ? object.getAvailableDiskSize() : 0; @@ -76,7 +76,7 @@ }; getTable().addColumn(freeColumn, constants.freeSpaceStorage(), "160px"); //$NON-NLS-1$ - DiskSizeColumn<StorageDomain> usedColumn = new DiskSizeColumn<StorageDomain>(DiskSizeUnit.GIGABYTE) { + DiskSizeColumn<StorageDomain> usedColumn = new DiskSizeColumn<StorageDomain>(SizeConverter.SizeUnit.GB) { @Override public Long getRawValue(StorageDomain object) { long usedDiskSize = object.getUsedDiskSize() != null ? object.getUsedDiskSize() : 0; @@ -85,7 +85,7 @@ }; getTable().addColumn(usedColumn, constants.usedSpaceStorage(), "160px"); //$NON-NLS-1$ - DiskSizeColumn<StorageDomain> totalColumn = new DiskSizeColumn<StorageDomain>(DiskSizeUnit.GIGABYTE) { + DiskSizeColumn<StorageDomain> totalColumn = new DiskSizeColumn<StorageDomain>(SizeConverter.SizeUnit.GB) { @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 b40cef4..306847b 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 @@ -8,10 +8,10 @@ import org.ovirt.engine.core.common.businessentities.StorageDomainType; import org.ovirt.engine.ui.common.idhandler.ElementIdHandler; import org.ovirt.engine.ui.common.uicommon.model.SearchableDetailModelProvider; -import org.ovirt.engine.ui.common.widget.renderer.DiskSizeRenderer.DiskSizeUnit; import org.ovirt.engine.ui.common.widget.table.column.DiskSizeColumn; import org.ovirt.engine.ui.common.widget.table.column.EnumColumn; import org.ovirt.engine.ui.common.widget.table.column.TextColumnWithTooltip; +import org.ovirt.engine.ui.uicommonweb.models.SizeConverter; import org.ovirt.engine.ui.uicommonweb.models.disks.DiskListModel; import org.ovirt.engine.ui.uicommonweb.models.disks.DiskStorageListModel; import org.ovirt.engine.ui.webadmin.ApplicationConstants; @@ -66,7 +66,7 @@ }; getTable().addColumn(statusColumn, constants.statusStorage(), "160px"); //$NON-NLS-1$ - DiskSizeColumn<StorageDomain> freeColumn = new DiskSizeColumn<StorageDomain>(DiskSizeUnit.GIGABYTE) { + DiskSizeColumn<StorageDomain> freeColumn = new DiskSizeColumn<StorageDomain>(SizeConverter.SizeUnit.GB) { @Override public Long getRawValue(StorageDomain object) { long availableDiskSize = object.getAvailableDiskSize() != null ? object.getAvailableDiskSize() : 0; @@ -75,7 +75,7 @@ }; getTable().addColumn(freeColumn, constants.freeSpaceStorage(), "160px"); //$NON-NLS-1$ - DiskSizeColumn<StorageDomain> usedColumn = new DiskSizeColumn<StorageDomain>(DiskSizeUnit.GIGABYTE) { + DiskSizeColumn<StorageDomain> usedColumn = new DiskSizeColumn<StorageDomain>(SizeConverter.SizeUnit.GB) { @Override public Long getRawValue(StorageDomain object) { long usedDiskSize = object.getUsedDiskSize() != null ? object.getUsedDiskSize() : 0; @@ -84,7 +84,7 @@ }; getTable().addColumn(usedColumn, constants.usedSpaceStorage(), "160px"); //$NON-NLS-1$ - DiskSizeColumn<StorageDomain> totalColumn = new DiskSizeColumn<StorageDomain>(DiskSizeUnit.GIGABYTE) { + DiskSizeColumn<StorageDomain> totalColumn = new DiskSizeColumn<StorageDomain>(SizeConverter.SizeUnit.GB) { @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/quota/SubTabQuotaStorageView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/quota/SubTabQuotaStorageView.java index 3a15dc7..f874865 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 @@ -10,6 +10,7 @@ import org.ovirt.engine.ui.common.widget.table.column.TextCellWithEditableTooltip; import org.ovirt.engine.ui.common.widget.table.column.TextColumnWithEditableTooltip; import org.ovirt.engine.ui.common.widget.table.column.TextColumnWithTooltip; +import org.ovirt.engine.ui.uicommonweb.models.SizeConverter; import org.ovirt.engine.ui.uicommonweb.models.quota.QuotaListModel; import org.ovirt.engine.ui.uicommonweb.models.quota.QuotaStorageListModel; import org.ovirt.engine.ui.webadmin.ApplicationConstants; @@ -23,7 +24,7 @@ implements SubTabQuotaStoragePresenter.ViewDef { private static final DiskSizeRenderer<Number> diskSizeRenderer = - new DiskSizeRenderer<Number>(DiskSizeRenderer.DiskSizeUnit.GIGABYTE); + new DiskSizeRenderer<Number>(SizeConverter.SizeUnit.GB); 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/RebalanceFileSizeRenderer.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/renderer/RebalanceFileSizeRenderer.java index 1a719e3..d732fb1 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,11 +13,11 @@ @Override public String render(T size) { if(size.longValue() > SizeConverter.BYTES_IN_GB) { - return messages.rebalanceFileSizeGb(SizeConverter.convert(size.longValue(), SizeUnit.BYTES, SizeUnit.GB)); + return messages.rebalanceFileSizeGb(SizeConverter.convert(size.longValue(), SizeUnit.BYTES, SizeUnit.GB).longValue()); } else if(size.longValue() > SizeConverter.BYTES_IN_MB) { - return messages.rebalanceFileSizeMb(SizeConverter.convert(size.longValue(), SizeUnit.BYTES, SizeUnit.MB)); + return messages.rebalanceFileSizeMb(SizeConverter.convert(size.longValue(), SizeUnit.BYTES, SizeUnit.MB).longValue()); } else if(size.longValue() > SizeConverter.BYTES_IN_KB) { - return messages.rebalanceFileSizeKb(SizeConverter.convert(size.longValue(), SizeUnit.BYTES, SizeUnit.KB)); + return messages.rebalanceFileSizeKb(SizeConverter.convert(size.longValue(), SizeUnit.BYTES, SizeUnit.KB).longValue()); } else { return messages.rebalanceFileSizeBytes(size.longValue()); } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/storage/TemplatesTree.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/storage/TemplatesTree.java index a5e9933..b6eca5be 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/storage/TemplatesTree.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/storage/TemplatesTree.java @@ -11,9 +11,9 @@ import org.ovirt.engine.ui.common.CommonApplicationResources; import org.ovirt.engine.ui.common.widget.label.DiskSizeLabel; import org.ovirt.engine.ui.common.widget.label.TextBoxLabel; -import org.ovirt.engine.ui.common.widget.renderer.DiskSizeRenderer.DiskSizeUnit; import org.ovirt.engine.ui.common.widget.tree.AbstractSubTabTree; import org.ovirt.engine.ui.uicommonweb.models.SearchableListModel; +import org.ovirt.engine.ui.uicommonweb.models.SizeConverter; import org.ovirt.engine.ui.webadmin.ApplicationResources; import org.ovirt.engine.ui.webadmin.ApplicationTemplates; import org.ovirt.engine.ui.webadmin.widget.label.FullDateTimeLabel; @@ -59,7 +59,7 @@ addItemToPanel(panel, new Image(resources.diskImage()), "25px"); //$NON-NLS-1$ addTextBoxToPanel(panel, new TextBoxLabel(), disk.getDiskAlias(), ""); //$NON-NLS-1$ addTextBoxToPanel(panel, new TextBoxLabel(), "", "110px"); //$NON-NLS-1$ //$NON-NLS-2$ - addValueLabelToPanel(panel, new DiskSizeLabel<Long>(DiskSizeUnit.BYTE), disk.getSize(), "110px"); //$NON-NLS-1$ + addValueLabelToPanel(panel, new DiskSizeLabel<Long>(SizeConverter.SizeUnit.BYTES), disk.getSize(), "110px"); //$NON-NLS-1$ addValueLabelToPanel(panel, new DiskSizeLabel<Double>(), disk.getActualSize(), "110px"); //$NON-NLS-1$ addValueLabelToPanel(panel, new FullDateTimeLabel(), disk.getCreationDate(), "140px"); //$NON-NLS-1$ 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 b180d6d..21d6cb5 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 @@ -14,9 +14,9 @@ import org.ovirt.engine.ui.common.CommonApplicationResources; import org.ovirt.engine.ui.common.widget.label.DiskSizeLabel; import org.ovirt.engine.ui.common.widget.label.TextBoxLabel; -import org.ovirt.engine.ui.common.widget.renderer.DiskSizeRenderer.DiskSizeUnit; import org.ovirt.engine.ui.common.widget.tree.AbstractSubTabTree; import org.ovirt.engine.ui.uicommonweb.models.SearchableListModel; +import org.ovirt.engine.ui.uicommonweb.models.SizeConverter; import org.ovirt.engine.ui.webadmin.ApplicationConstants; import org.ovirt.engine.ui.webadmin.ApplicationResources; import org.ovirt.engine.ui.webadmin.ApplicationTemplates; @@ -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>(DiskSizeUnit.GIGABYTE), disk.getActualSize(), "110px"); //$NON-NLS-1$ + addValueLabelToPanel(panel, new DiskSizeLabel<Double>(SizeConverter.SizeUnit.GB), disk.getActualSize(), "110px"); //$NON-NLS-1$ addValueLabelToPanel(panel, new FullDateTimeLabel(), disk.getCreationDate(), "140px"); //$NON-NLS-1$ panel.setSpacing(1); @@ -159,8 +159,8 @@ Long virtualSize = isDiskImage ? ((DiskImage) disk).getSize() : (long) (((LunDisk) disk).getLun().getDeviceSize() * Math.pow(1024, 3)); - addValueLabelToPanel(panel, new DiskSizeLabel<Long>(DiskSizeUnit.BYTE), virtualSize, "110px"); //$NON-NLS-1$ - addValueLabelToPanel(panel, new DiskSizeLabel<Double>(DiskSizeUnit.GIGABYTE), actualSize, "110px"); //$NON-NLS-1$ + 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 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/template/DisksTree.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/template/DisksTree.java index 467e9f6..eb366e3 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/template/DisksTree.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/template/DisksTree.java @@ -13,11 +13,11 @@ import org.ovirt.engine.ui.common.widget.label.DiskSizeLabel; import org.ovirt.engine.ui.common.widget.label.EnumLabel; import org.ovirt.engine.ui.common.widget.label.TextBoxLabel; -import org.ovirt.engine.ui.common.widget.renderer.DiskSizeRenderer.DiskSizeUnit; import org.ovirt.engine.ui.common.widget.table.column.EmptyColumn; import org.ovirt.engine.ui.common.widget.tree.AbstractSubTabTree; import org.ovirt.engine.ui.uicommonweb.Linq; import org.ovirt.engine.ui.uicommonweb.models.ListModel; +import org.ovirt.engine.ui.uicommonweb.models.SizeConverter; import org.ovirt.engine.ui.uicommonweb.models.templates.TemplateDiskListModel; import org.ovirt.engine.ui.webadmin.ApplicationConstants; import org.ovirt.engine.ui.webadmin.ApplicationResources; @@ -51,7 +51,7 @@ addItemToPanel(panel, new Image(resources.diskImage()), "25px"); //$NON-NLS-1$ addTextBoxToPanel(panel, new TextBoxLabel(), disk.getDiskAlias(), ""); //$NON-NLS-1$ addValueLabelToPanel(panel, new DiskSizeLabel<Long>(), disk.getSizeInGigabytes(), "120px"); //$NON-NLS-1$ - addValueLabelToPanel(panel, new DiskSizeLabel<Long>(DiskSizeUnit.BYTE), disk.getActualSizeInBytes(), "120px"); //$NON-NLS-1$ + addValueLabelToPanel(panel, new DiskSizeLabel<Long>(SizeConverter.SizeUnit.BYTES), disk.getActualSizeInBytes(), "120px"); //$NON-NLS-1$ addValueLabelToPanel(panel, new EnumLabel<ImageStatus>(), disk.getImageStatus(), "120px"); //$NON-NLS-1$ addValueLabelToPanel(panel, new EnumLabel<VolumeType>(), disk.getVolumeType(), "120px"); //$NON-NLS-1$ addValueLabelToPanel(panel, new EnumLabel<DiskInterface>(), disk.getDiskInterface(), "120px"); //$NON-NLS-1$ -- To view, visit http://gerrit.ovirt.org/19745 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1d1820aaa246577f8d39a6826c04b31771c1ac06 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
