Daniel Erez has uploaded a new change for review. Change subject: webadmin: storage-general sub-tab use StorageSizeLabel ......................................................................
webadmin: storage-general sub-tab use StorageSizeLabel Storage main-tab -> General sub-tab: Use StorageSizeLabel instead of DiskSizeLabel since 'N/A' should be displayed when size is '0' (only in general sub-tab). Change-Id: I1c1722a1a745d3a91bb87fc5c28dd8a6fb1106ab Signed-off-by: Daniel Erez <[email protected]> --- A 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/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageGeneralView.java 3 files changed, 28 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/34/17234/1 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 new file mode 100644 index 0000000..0ee43a2 --- /dev/null +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/label/StorageSizeLabel.java @@ -0,0 +1,18 @@ +package org.ovirt.engine.ui.common.widget.label; + +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; + +public class StorageSizeLabel<T extends Number> extends ValueLabel<T> { + + public StorageSizeLabel() { + super(new DiskSizeRenderer<T>(DiskSizeUnit.GIGABYTE) { + @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 86b5c85..57cc623 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 @@ -23,9 +23,13 @@ this.unit = unit; } + protected boolean isUnavailable(T size) { + return size == null; + } + @Override public String render(T size) { - if (size == null || size.longValue() == 0) { + if (isUnavailable(size)) { return CONSTANTS.unAvailablePropertyLabel(); } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageGeneralView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageGeneralView.java index 2ba8f8c..6cc0ade 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageGeneralView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageGeneralView.java @@ -7,7 +7,7 @@ import org.ovirt.engine.ui.common.widget.form.FormBuilder; import org.ovirt.engine.ui.common.widget.form.FormItem; import org.ovirt.engine.ui.common.widget.form.GeneralFormPanel; -import org.ovirt.engine.ui.common.widget.label.DiskSizeLabel; +import org.ovirt.engine.ui.common.widget.label.StorageSizeLabel; import org.ovirt.engine.ui.common.widget.label.TextBoxLabel; import org.ovirt.engine.ui.uicommonweb.models.storage.StorageGeneralModel; import org.ovirt.engine.ui.uicommonweb.models.storage.StorageListModel; @@ -33,16 +33,16 @@ } @Ignore - DiskSizeLabel<Integer> totalSize = new DiskSizeLabel<Integer>(); + StorageSizeLabel<Integer> totalSize = new StorageSizeLabel<Integer>(); @Ignore - DiskSizeLabel<Integer> availableSize = new DiskSizeLabel<Integer>(); + StorageSizeLabel<Integer> availableSize = new StorageSizeLabel<Integer>(); @Ignore - DiskSizeLabel<Integer> usedSize = new DiskSizeLabel<Integer>(); + StorageSizeLabel<Integer> usedSize = new StorageSizeLabel<Integer>(); @Ignore - DiskSizeLabel<Integer> allocatedSize = new DiskSizeLabel<Integer>(); + StorageSizeLabel<Integer> allocatedSize = new StorageSizeLabel<Integer>(); @Ignore PercentLabel<Integer> overAllocationRatio = new PercentLabel<Integer>(); -- To view, visit http://gerrit.ovirt.org/17234 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1c1722a1a745d3a91bb87fc5c28dd8a6fb1106ab 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
