Daniel Erez has uploaded a new change for review. Change subject: webadmin: storage main-tab - use StorageSizeColumn ......................................................................
webadmin: storage main-tab - use StorageSizeColumn Storage main-tab: Use StorageSizeColumn instead of DiskSizeColumn since 'N/A' should be displayed when size is '0' (similar to StorageSizeLabel in General sub-tab). Change-Id: Ib18f6dd5f60e2421ed031e3baf79454ea7455924 Signed-off-by: Daniel Erez <[email protected]> --- A frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/StorageSizeColumn.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabStorageView.java 2 files changed, 20 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/18/17418/1 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 new file mode 100644 index 0000000..9812af8 --- /dev/null +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/StorageSizeColumn.java @@ -0,0 +1,17 @@ +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; + +public abstract class StorageSizeColumn<T> extends RenderedTextColumn<T, Long> { + + public StorageSizeColumn() { + super(new DiskSizeRenderer<Long>(DiskSizeUnit.GIGABYTE) { + @Override + protected boolean isUnavailable(Long size) { + return size == null || size.longValue() == 0; + } + }); + } + +} diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabStorageView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabStorageView.java index 2a1511a..c664c2a 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabStorageView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabStorageView.java @@ -10,9 +10,8 @@ import org.ovirt.engine.ui.common.uicommon.model.MainModelProvider; import org.ovirt.engine.ui.common.widget.action.ActionButtonDefinition; import org.ovirt.engine.ui.common.widget.action.CommandLocation; -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.StorageSizeColumn; import org.ovirt.engine.ui.common.widget.table.column.TextColumnWithTooltip; import org.ovirt.engine.ui.uicommonweb.ReportInit; import org.ovirt.engine.ui.uicommonweb.UICommand; @@ -95,7 +94,7 @@ }; getTable().addColumn(crossDataCenterStatusColumn, constants.crossDcStatusStorage(), "210px"); //$NON-NLS-1$ - DiskSizeColumn<StorageDomain> totalSpaceColumn = new DiskSizeColumn<StorageDomain>(DiskSizeUnit.GIGABYTE) { + StorageSizeColumn<StorageDomain> totalSpaceColumn = new StorageSizeColumn<StorageDomain>() { @Override public Long getRawValue(StorageDomain object) { long totalSpace = object.getTotalDiskSize() != null ? object.getTotalDiskSize() : 0; @@ -104,7 +103,7 @@ }; getTable().addColumn(totalSpaceColumn, constants.totalSpaceStorage(), "130px"); //$NON-NLS-1$ - DiskSizeColumn<StorageDomain> freeSpaceColumn = new DiskSizeColumn<StorageDomain>(DiskSizeUnit.GIGABYTE) { + StorageSizeColumn<StorageDomain> freeSpaceColumn = new StorageSizeColumn<StorageDomain>() { @Override public Long getRawValue(StorageDomain object) { long availableDiskSize = object.getAvailableDiskSize() != null ? object.getAvailableDiskSize() : 0; -- To view, visit http://gerrit.ovirt.org/17418 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib18f6dd5f60e2421ed031e3baf79454ea7455924 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Daniel Erez <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
