Tomas Jelinek has uploaded a new change for review. Change subject: frontend: introduced generics for the DataCenterModel ......................................................................
frontend: introduced generics for the DataCenterModel Only the implementation - no infrastructure. Change-Id: Ia5c36d1a8471c399342d3e7034aa97428b75041d Signed-off-by: Tomas Jelinek <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/AddDataCenterRM.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/ConfigureLocalStorageModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmModelBehavior.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/datacenter/DataCenterPopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/datacenter/DataCenterPopupView.ui.xml 7 files changed, 63 insertions(+), 64 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/05/17605/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterListModel.java index cd50e1a..a8f2656 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterListModel.java @@ -26,7 +26,6 @@ import org.ovirt.engine.core.common.queries.VdcQueryType; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.compat.StringHelper; -import org.ovirt.engine.core.compat.Version; import org.ovirt.engine.core.searchbackend.SearchObjects; import org.ovirt.engine.ui.frontend.AsyncQuery; import org.ovirt.engine.ui.frontend.Frontend; @@ -604,7 +603,7 @@ } else if (!model.getIsNew() && getSelectedItem() != null - && !((Version) model.getVersion().getSelectedItem()).equals(((StoragePool) getSelectedItem()).getcompatibility_version())) { + && !(model.getVersion().getSelectedItem()).equals(((StoragePool) getSelectedItem()).getcompatibility_version())) { ConfirmationModel confirmModel = new ConfirmationModel(); setConfirmWindow(confirmModel); confirmModel.setTitle(ConstantsManager.getInstance() @@ -692,12 +691,12 @@ cancelConfirmation(); // Save changes. - dataCenter.setName((String) model.getName().getEntity()); - dataCenter.setdescription((String) model.getDescription().getEntity()); - dataCenter.setComment((String) model.getComment().getEntity()); - dataCenter.setStorageType((StorageType) model.getStorageTypeList().getSelectedItem()); - dataCenter.setcompatibility_version((Version) model.getVersion().getSelectedItem()); - dataCenter.setQuotaEnforcementType((QuotaEnforcementTypeEnum) model.getQuotaEnforceTypeListModel() + dataCenter.setName(model.getName().getEntity()); + dataCenter.setdescription(model.getDescription().getEntity()); + dataCenter.setComment(model.getComment().getEntity()); + dataCenter.setStorageType(model.getStorageTypeList().getSelectedItem()); + dataCenter.setcompatibility_version(model.getVersion().getSelectedItem()); + dataCenter.setQuotaEnforcementType(model.getQuotaEnforceTypeListModel() .getSelectedItem()); model.startProgress(null); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterModel.java index f8ae5f9..d71776b 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterModel.java @@ -2,6 +2,7 @@ import java.util.ArrayList; +import java.util.List; import org.ovirt.engine.core.common.businessentities.QuotaEnforcementTypeEnum; import org.ovirt.engine.core.common.businessentities.StoragePool; import org.ovirt.engine.core.common.businessentities.StorageType; @@ -75,62 +76,62 @@ privateOriginalName = value; } - private EntityModel privateName; + private EntityModel<String> privateName; - public EntityModel getName() + public EntityModel<String> getName() { return privateName; } - public void setName(EntityModel value) + public void setName(EntityModel<String> value) { privateName = value; } - private EntityModel privateDescription; + private EntityModel<String> privateDescription; - public EntityModel getDescription() + public EntityModel<String> getDescription() { return privateDescription; } - public void setDescription(EntityModel value) + public void setDescription(EntityModel<String> value) { privateDescription = value; } - private EntityModel privateComment; + private EntityModel<String> privateComment; - public EntityModel getComment() + public EntityModel<String> getComment() { return privateComment; } - public void setComment(EntityModel value) + public void setComment(EntityModel<String> value) { privateComment = value; } - private ListModel privateStorageTypeList; + private ListModel<StorageType> privateStorageTypeList; - public ListModel getStorageTypeList() + public ListModel<StorageType> getStorageTypeList() { return privateStorageTypeList; } - public void setStorageTypeList(ListModel value) + public void setStorageTypeList(ListModel<StorageType> value) { privateStorageTypeList = value; } - private ListModel privateVersion; + private ListModel<Version> privateVersion; - public ListModel getVersion() + public ListModel<Version> getVersion() { return privateVersion; } - public void setVersion(ListModel value) + public void setVersion(ListModel<Version> value) { privateVersion = value; } @@ -147,29 +148,29 @@ privateMaxNameLength = value; } - ListModel quotaEnforceTypeListModel; + ListModel<QuotaEnforcementTypeEnum> quotaEnforceTypeListModel; - public ListModel getQuotaEnforceTypeListModel() { + public ListModel<QuotaEnforcementTypeEnum> getQuotaEnforceTypeListModel() { return quotaEnforceTypeListModel; } - public void setQuotaEnforceTypeListModel(ListModel quotaEnforceTypeListModel) { + public void setQuotaEnforceTypeListModel(ListModel<QuotaEnforcementTypeEnum> quotaEnforceTypeListModel) { this.quotaEnforceTypeListModel = quotaEnforceTypeListModel; } public DataCenterModel() { - setName(new EntityModel()); - setDescription(new EntityModel()); - setComment(new EntityModel()); - setVersion(new ListModel()); + setName(new EntityModel<String>()); + setDescription(new EntityModel<String>()); + setComment(new EntityModel<String>()); + setVersion(new ListModel<Version>()); - setStorageTypeList(new ListModel()); + setStorageTypeList(new ListModel<StorageType>()); getStorageTypeList().getSelectedItemChangedEvent().addListener(this); getStorageTypeList().setItems(AsyncDataProvider.getStoragePoolTypeList()); - setQuotaEnforceTypeListModel(new ListModel()); - ArrayList<QuotaEnforcementTypeEnum> list = AsyncDataProvider.getQuotaEnforcmentTypes(); + setQuotaEnforceTypeListModel(new ListModel<QuotaEnforcementTypeEnum>()); + List<QuotaEnforcementTypeEnum> list = AsyncDataProvider.getQuotaEnforcmentTypes(); getQuotaEnforceTypeListModel().setItems(list); getQuotaEnforceTypeListModel().setSelectedItem(list.get(0)); @@ -212,7 +213,7 @@ // Rebuild version items. ArrayList<Version> list = new ArrayList<Version>(); - StorageType type = (StorageType) dataCenterModel.getStorageTypeList().getSelectedItem(); + StorageType type = dataCenterModel.getStorageTypeList().getSelectedItem(); for (Version item : versions) { @@ -239,7 +240,7 @@ Version selectedVersion = null; if (dataCenterModel.getVersion().getSelectedItem() != null) { - selectedVersion = (Version) dataCenterModel.getVersion().getSelectedItem(); + selectedVersion = dataCenterModel.getVersion().getSelectedItem(); boolean hasSelectedVersion = false; for (Version version : list) { @@ -283,9 +284,8 @@ if (!isVersionInit) { isVersionInit = true; - for (Object a : getVersion().getItems()) + for (Version item : getVersion().getItems()) { - Version item = (Version) a; if (Version.OpEquality(item, getEntity().getcompatibility_version())) { getVersion().setSelectedItem(item); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/AddDataCenterRM.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/AddDataCenterRM.java index b32ea69..12f21e0 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/AddDataCenterRM.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/AddDataCenterRM.java @@ -8,12 +8,10 @@ import org.ovirt.engine.core.common.action.VdsGroupParametersBase; import org.ovirt.engine.core.common.businessentities.StoragePool; import org.ovirt.engine.core.common.businessentities.StoragePoolStatus; -import org.ovirt.engine.core.common.businessentities.StorageType; import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.VDSStatus; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.compat.StringHelper; -import org.ovirt.engine.core.compat.Version; import org.ovirt.engine.ui.frontend.AsyncQuery; import org.ovirt.engine.ui.frontend.Frontend; import org.ovirt.engine.ui.frontend.INewAsyncCallback; @@ -49,7 +47,7 @@ ConfigureLocalStorageModel configureModel = (ConfigureLocalStorageModel) model.getWindow(); DataCenterModel dataCenterModel = configureModel.getDataCenter(); - String dataCenterName = (String) dataCenterModel.getName().getEntity(); + String dataCenterName = dataCenterModel.getName().getEntity(); if (!StringHelper.isNullOrEmpty(dataCenterName)) { @@ -77,7 +75,7 @@ StoragePool candidate = configureModel.getCandidateDataCenter(); DataCenterModel dataCenterModel = configureModel.getDataCenter(); - String dataCenterName = (String) dataCenterModel.getName().getEntity(); + String dataCenterName = dataCenterModel.getName().getEntity(); if (candidate == null || !StringHelper.stringsEqual(candidate.getName(), dataCenterName)) { @@ -94,10 +92,10 @@ dataCenter = new StoragePool(); dataCenter.setName(dataCenterName); - dataCenter.setdescription((String) dataCenterModel.getDescription().getEntity()); - dataCenter.setComment((String) dataCenterModel.getComment().getEntity()); - dataCenter.setStorageType((StorageType) dataCenterModel.getStorageTypeList().getSelectedItem()); - dataCenter.setcompatibility_version((Version) dataCenterModel.getVersion().getSelectedItem()); + dataCenter.setdescription(dataCenterModel.getDescription().getEntity()); + dataCenter.setComment(dataCenterModel.getComment().getEntity()); + dataCenter.setStorageType(dataCenterModel.getStorageTypeList().getSelectedItem()); + dataCenter.setcompatibility_version(dataCenterModel.getVersion().getSelectedItem()); StoragePoolManagementParameter parameters = new StoragePoolManagementParameter(dataCenter); parameters.setCorrelationId(getCorrelationId()); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/ConfigureLocalStorageModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/ConfigureLocalStorageModel.java index b47800a..739a5ff 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/ConfigureLocalStorageModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/ConfigureLocalStorageModel.java @@ -149,11 +149,9 @@ }); // Set the storage type to be Local. - ListModel storageTypeListModel = getDataCenter().getStorageTypeList(); - - for (StorageType item : (ArrayList<StorageType>) storageTypeListModel.getItems()) { + for (StorageType item : getDataCenter().getStorageTypeList().getItems()) { if (item == StorageType.LOCALFS) { - storageTypeListModel.setSelectedItem(item); + getDataCenter().getStorageTypeList().setSelectedItem(item); break; } } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmModelBehavior.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmModelBehavior.java index 39555b9..3a2e744 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmModelBehavior.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmModelBehavior.java @@ -315,9 +315,10 @@ getModel().getTemplate().setItems(templates); - getModel().getTemplate().setSelectedItem(Linq.firstOrDefault(templates, + VmTemplate list = Linq.firstOrDefault(templates, oldTemplate != null ? new Linq.TemplatePredicate(oldTemplate.getId()) - : new Linq.TemplatePredicate(Guid.Empty))); + : new Linq.TemplatePredicate(Guid.Empty)); + getModel().getTemplate().setSelectedItem(list); updateIsDisksAvailable(); } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/datacenter/DataCenterPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/datacenter/DataCenterPopupView.java index 5af886c..7fcb0fc 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/datacenter/DataCenterPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/datacenter/DataCenterPopupView.java @@ -1,11 +1,13 @@ package org.ovirt.engine.ui.webadmin.section.main.view.popup.datacenter; +import org.ovirt.engine.core.common.businessentities.QuotaEnforcementTypeEnum; +import org.ovirt.engine.core.common.businessentities.StorageType; import org.ovirt.engine.core.compat.Version; import org.ovirt.engine.ui.common.idhandler.ElementIdHandler; import org.ovirt.engine.ui.common.idhandler.WithElementId; import org.ovirt.engine.ui.common.view.popup.AbstractModelBoundPopupView; import org.ovirt.engine.ui.common.widget.dialog.SimpleDialogPanel; -import org.ovirt.engine.ui.common.widget.editor.EntityModelTextBoxEditor; +import org.ovirt.engine.ui.common.widget.editor.generic.EntityModelTextBoxEditor; 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; @@ -53,17 +55,17 @@ @UiField(provided = true) @Path(value = "storageTypeList.selectedItem") @WithElementId - ListModelListBoxEditor<Object> storageTypeListEditor; + ListModelListBoxEditor<StorageType> storageTypeListEditor; @UiField(provided = true) @Path(value = "version.selectedItem") @WithElementId - ListModelListBoxEditor<Object> versionEditor; + ListModelListBoxEditor<Version> versionEditor; @UiField(provided = true) @Path(value = "quotaEnforceTypeListModel.selectedItem") @WithElementId - ListModelListBoxEditor<Object> quotaEnforceTypeEditor; + ListModelListBoxEditor<QuotaEnforcementTypeEnum> quotaEnforceTypeEditor; @UiField Style style; @@ -83,16 +85,16 @@ @SuppressWarnings({ "unchecked", "rawtypes" }) void initListBoxEditors() { - storageTypeListEditor = new ListModelListBoxEditor<Object>(new EnumRenderer()); + storageTypeListEditor = new ListModelListBoxEditor<StorageType>(new EnumRenderer()); - versionEditor = new ListModelListBoxEditor<Object>(new NullSafeRenderer<Object>() { + versionEditor = new ListModelListBoxEditor<Version>(new NullSafeRenderer<Version>() { @Override - public String renderNullSafe(Object object) { - return ((Version) object).getValue(); + public String renderNullSafe(Version object) { + return object.getValue(); } }); - quotaEnforceTypeEditor = new ListModelListBoxEditor<Object>(new EnumRenderer()); + quotaEnforceTypeEditor = new ListModelListBoxEditor<QuotaEnforcementTypeEnum>(new EnumRenderer()); } void localize(ApplicationConstants constants) { diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/datacenter/DataCenterPopupView.ui.xml b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/datacenter/DataCenterPopupView.ui.xml index ec07fc1..c6b454f 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/datacenter/DataCenterPopupView.ui.xml +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/datacenter/DataCenterPopupView.ui.xml @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent";> <ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder" xmlns:g="urn:import:com.google.gwt.user.client.ui" - xmlns:d="urn:import:org.ovirt.engine.ui.common.widget.dialog" xmlns:e="urn:import:org.ovirt.engine.ui.common.widget.editor"> + xmlns:d="urn:import:org.ovirt.engine.ui.common.widget.dialog" xmlns:e="urn:import:org.ovirt.engine.ui.common.widget.editor" + xmlns:ge="urn:import:org.ovirt.engine.ui.common.widget.editor.generic"> <ui:style type="org.ovirt.engine.ui.webadmin.section.main.view.popup.datacenter.DataCenterPopupView.Style"> .contentStyle { @@ -11,12 +12,12 @@ <d:SimpleDialogPanel width="450px" height="320px"> <d:content> <g:FlowPanel> - <e:EntityModelTextBoxEditor ui:field="nameEditor" /> - <e:EntityModelTextBoxEditor ui:field="descriptionEditor" /> + <ge:EntityModelTextBoxEditor ui:field="nameEditor" /> + <ge:EntityModelTextBoxEditor ui:field="descriptionEditor" /> <e:ListModelListBoxEditor ui:field="storageTypeListEditor" /> <e:ListModelListBoxEditor ui:field="versionEditor" /> <e:ListModelListBoxEditor ui:field="quotaEnforceTypeEditor" /> - <e:EntityModelTextBoxEditor ui:field="commentEditor" /> + <ge:EntityModelTextBoxEditor ui:field="commentEditor" /> </g:FlowPanel> </d:content> </d:SimpleDialogPanel> -- To view, visit http://gerrit.ovirt.org/17605 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia5c36d1a8471c399342d3e7034aa97428b75041d Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tomas Jelinek <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
