Daniel Erez has uploaded a new change for review. Change subject: webadmin: free space indication for storage domains ......................................................................
webadmin: free space indication for storage domains Added free space indication in storage domains in select-boxes. Affected dialogs: * New disk * Copy/Move Disk * New VM -> Resource Allocation tab * Make template * Import VM Change-Id: I64cf597289534bb12019b09d1d84ad9e64f5b34e Bug-Url: https://bugzilla.redhat.com/760666 Signed-off-by: Daniel Erez <[email protected]> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationMessages.java A frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/renderer/StorageDomainFreeSpaceRenderer.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/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportVmPopupView.java 5 files changed, 34 insertions(+), 28 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/25/11925/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationMessages.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationMessages.java index b5020a1..d9fe36b 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationMessages.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationMessages.java @@ -78,4 +78,6 @@ @DefaultMessage("No {0} to display") String noItemsToDisplay(String items); + @DefaultMessage("{0} ({1} GB free of {2} GB)") + String storageDomainFreeSpace(String name, int free, int total); } diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/renderer/StorageDomainFreeSpaceRenderer.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/renderer/StorageDomainFreeSpaceRenderer.java new file mode 100644 index 0000000..493089b --- /dev/null +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/renderer/StorageDomainFreeSpaceRenderer.java @@ -0,0 +1,22 @@ +package org.ovirt.engine.ui.common.widget.renderer; + +import org.ovirt.engine.core.common.businessentities.storage_domains; +import org.ovirt.engine.ui.common.CommonApplicationMessages; + +import com.google.gwt.core.client.GWT; +import com.google.gwt.text.shared.AbstractRenderer; + +public class StorageDomainFreeSpaceRenderer<T extends storage_domains> extends AbstractRenderer<T> { + private static final CommonApplicationMessages MESSAGES = GWT.create(CommonApplicationMessages.class); + + @Override + public String render(T storageDomain) { + if (storageDomain == null) { + return ""; //$NON-NLS-1$ + } + + return MESSAGES.storageDomainFreeSpace(storageDomain.getstorage_name(), + storageDomain.getavailable_disk_size(), + storageDomain.getTotalDiskSize()); + } +} 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 d93ebc9..1ce2243 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 @@ -10,7 +10,6 @@ import org.ovirt.engine.core.common.businessentities.Quota; import org.ovirt.engine.core.common.businessentities.StorageType; import org.ovirt.engine.core.common.businessentities.VDS; -import org.ovirt.engine.core.common.businessentities.storage_domains; import org.ovirt.engine.core.common.businessentities.storage_pool; import org.ovirt.engine.core.compat.Event; import org.ovirt.engine.core.compat.EventArgs; @@ -30,6 +29,7 @@ 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.common.widget.table.column.DiskSizeColumn; import org.ovirt.engine.ui.common.widget.table.column.EnumColumn; import org.ovirt.engine.ui.common.widget.table.column.ImageResourceColumn; @@ -246,12 +246,7 @@ @SuppressWarnings({ "unchecked", "rawtypes" }) private void initManualWidgets() { - storageDomainEditor = new ListModelListBoxEditor<Object>(new NullSafeRenderer<Object>() { - @Override - public String renderNullSafe(Object object) { - return ((storage_domains) object).getstorage_name(); - } - }); + storageDomainEditor = new ListModelListBoxEditor<Object>(new StorageDomainFreeSpaceRenderer()); hostListEditor = new ListModelListBoxEditor<Object>(new AbstractRenderer<Object>() { @Override 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 26674ea..5982497 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 @@ -2,7 +2,6 @@ import org.ovirt.engine.core.common.businessentities.DiskImage; import org.ovirt.engine.core.common.businessentities.Quota; -import org.ovirt.engine.core.common.businessentities.storage_domains; import org.ovirt.engine.ui.common.CommonApplicationConstants; import org.ovirt.engine.ui.common.idhandler.HasElementId; import org.ovirt.engine.ui.common.utils.ElementIdUtils; @@ -16,6 +15,7 @@ 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.vms.DiskModel; import com.google.gwt.core.client.GWT; @@ -100,19 +100,9 @@ void initEditors() { volumeTypeListEditor = new ListModelListBoxEditor<Object>(new EnumRenderer()); - storageListEditor = new ListModelListBoxEditor<Object>(new NullSafeRenderer<Object>() { - @Override - public String renderNullSafe(Object object) { - return ((storage_domains) object).getstorage_name(); - } - }); + storageListEditor = new ListModelListBoxEditor<Object>(new StorageDomainFreeSpaceRenderer()); - sourceStorageListEditor = new ListModelListBoxEditor<Object>(new NullSafeRenderer<Object>() { - @Override - public String renderNullSafe(Object object) { - return ((storage_domains) object).getstorage_name(); - } - }); + sourceStorageListEditor = new ListModelListBoxEditor<Object>(new StorageDomainFreeSpaceRenderer()); quotaListEditor = new ListModelListBoxEditor<Object>(new NullSafeRenderer<Object>() { @Override diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportVmPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportVmPopupView.java index 9075f50..c89851b 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportVmPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportVmPopupView.java @@ -25,6 +25,7 @@ import org.ovirt.engine.ui.common.widget.editor.ListModelListBoxEditor; 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.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; @@ -441,7 +442,8 @@ storage_domains selectedStorageDomain = null; if (importData != null && importData.getStorageDomains() != null) { for (storage_domains storageDomain : importData.getStorageDomains()) { - storageDomainsNameList.add(storageDomain.getstorage_name()); + storageDomainsNameList.add( + new StorageDomainFreeSpaceRenderer<storage_domains>().render(storageDomain)); if (importData.getSelectedStorageDomain() != null) { if (storageDomain.getId().equals(importData.getSelectedStorageDomain().getId())) { selectedStorageDomain = storageDomain; @@ -452,7 +454,7 @@ ((CustomSelectionCell) getCell()).setOptions(storageDomainsNameList); if (!storageDomainsNameList.isEmpty()) { if (selectedStorageDomain != null) { - return selectedStorageDomain.getstorage_name(); + return new StorageDomainFreeSpaceRenderer<storage_domains>().render(selectedStorageDomain); } else { return storageDomainsNameList.get(0); } @@ -536,12 +538,7 @@ return ((Quota) object).getQuotaName(); } }); - destStorageEditor = new ListModelListBoxEditor<Object>(new NullSafeRenderer<Object>() { - @Override - public String renderNullSafe(Object object) { - return ((storage_domains) object).getstorage_name(); - } - }); + destStorageEditor = new ListModelListBoxEditor<Object>(new StorageDomainFreeSpaceRenderer()); } private void initCheckboxes() { -- To view, visit http://gerrit.ovirt.org/11925 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I64cf597289534bb12019b09d1d84ad9e64f5b34e 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
