Gilad Chaplik has uploaded a new change for review. Change subject: userportal: pull-up syncSearch in basic and advanced view ......................................................................
userportal: pull-up syncSearch in basic and advanced view Search method was pulled-up to avoid duplicate code. Made changes according to code review in http://gerrit.ovirt.org/#/c/10475/ Change-Id: I9c5469264a6f71c50aa9c1d7c9851c3174851929 Signed-off-by: Gilad Chaplik <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/IUserPortalListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalBasicListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java 3 files changed, 59 insertions(+), 121 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/75/10675/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/IUserPortalListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/IUserPortalListModel.java index e17c381..ac716ba 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/IUserPortalListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/IUserPortalListModel.java @@ -12,10 +12,15 @@ import org.ovirt.engine.core.common.businessentities.VMStatus; import org.ovirt.engine.core.common.businessentities.VmOsType; import org.ovirt.engine.core.common.businessentities.vm_pools; +import org.ovirt.engine.core.common.queries.VdcQueryParametersBase; +import org.ovirt.engine.core.common.queries.VdcQueryReturnValue; +import org.ovirt.engine.core.common.queries.VdcQueryType; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.compat.PropertyChangedEventArgs; import org.ovirt.engine.core.compat.StringHelper; +import org.ovirt.engine.ui.frontend.AsyncQuery; import org.ovirt.engine.ui.frontend.Frontend; +import org.ovirt.engine.ui.frontend.INewAsyncCallback; import org.ovirt.engine.ui.uicommonweb.UICommand; import org.ovirt.engine.ui.uicommonweb.dataprovider.AsyncDataProvider; import org.ovirt.engine.ui.uicommonweb.models.ListWithDetailsModel; @@ -73,6 +78,10 @@ public abstract void OnVmAndPoolLoad(); protected HashMap<Guid, vm_pools> poolMap; + + private List<VM> privatevms; + + private List<vm_pools> privatepools; public vm_pools ResolveVmPoolById(Guid id) { @@ -306,6 +315,40 @@ return null; } + @Override + protected void SyncSearch() + { + super.SyncSearch(); + Frontend.RunQuery(VdcQueryType.GetAllVmsAndVmPools, + new VdcQueryParametersBase(), + new AsyncQuery(null, new INewAsyncCallback() { + + @Override + public void OnSuccess(Object model, Object returnValue) { + List<VM> vms = new ArrayList<VM>(); + List<vm_pools> pools = new ArrayList<vm_pools>(); + + VdcQueryReturnValue retValue = (VdcQueryReturnValue) returnValue; + if (retValue != null && retValue.getSucceeded()) { + List<Object> list = (ArrayList<Object>) retValue.getReturnValue(); + if (list != null) { + for (Object object : list) { + if (object instanceof VM) { + vms.add((VM) object); + } else if (object instanceof vm_pools) { + pools.add((vm_pools) object); + } + } + } + } + + setvms(vms); + setpools(pools); + OnVmAndPoolLoad(); + } + })); + } + public List<UserPortalItemModel> refreshItems(List<UserPortalItemModel> items, List<UserPortalItemModel> currentItems, List<UserPortalItemModel> removeItems) { List<UserPortalItemModel> refreshItems = new ArrayList<UserPortalItemModel>(); Map<Guid, UserPortalItemModel> itemsMap = toMap(items); @@ -349,6 +392,14 @@ return false; } + public List<VM> getvms() { + return privatevms; + } + + public void setvms(List<VM> value) { + privatevms = value; + } + protected Map<Guid, UserPortalItemModel> toMap(List<UserPortalItemModel> items) { Map<Guid, UserPortalItemModel> map = new HashMap<Guid, UserPortalItemModel>(); if (items != null) { @@ -358,4 +409,12 @@ } return map; } + + public List<vm_pools> getpools() { + return privatepools; + } + + public void setpools(List<vm_pools> value) { + privatepools = value; + } } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalBasicListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalBasicListModel.java index fb4ae30..7a5b284 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalBasicListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalBasicListModel.java @@ -7,7 +7,6 @@ import org.ovirt.engine.core.common.businessentities.VM; import org.ovirt.engine.core.common.businessentities.vm_pools; import org.ovirt.engine.core.common.queries.GetVmdataByPoolIdParameters; -import org.ovirt.engine.core.common.queries.VdcQueryParametersBase; import org.ovirt.engine.core.common.queries.VdcQueryReturnValue; import org.ovirt.engine.core.common.queries.VdcQueryType; import org.ovirt.engine.core.compat.Event; @@ -55,30 +54,6 @@ privatevmBasicDiskListModel = value; } - private ArrayList<VM> privatevms; - - public ArrayList<VM> getvms() - { - return privatevms; - } - - public void setvms(ArrayList<VM> value) - { - privatevms = value; - } - - private ArrayList<vm_pools> privatepools; - - public ArrayList<vm_pools> getpools() - { - return privatepools; - } - - public void setpools(ArrayList<vm_pools> value) - { - privatepools = value; - } - private EntityModel privateSelectedItemDefinedMemory; public EntityModel getSelectedItemDefinedMemory() @@ -118,41 +93,6 @@ setSelectedItemNumOfCpuCores(new EntityModel()); cachedConsoleModels = new HashMap<Guid, ArrayList<ConsoleModel>>(); - } - - @Override - protected void SyncSearch() - { - super.SyncSearch(); - Frontend.RunQuery(VdcQueryType.GetAllVmsAndVmPools, - new VdcQueryParametersBase(), - new AsyncQuery(this, new INewAsyncCallback() { - - @Override - public void OnSuccess(Object model, Object returnValue) { - UserPortalBasicListModel userPortalBasicListModel = (UserPortalBasicListModel) model; - ArrayList<VM> vms = new ArrayList<VM>(); - ArrayList<vm_pools> pools = new ArrayList<vm_pools>(); - - VdcQueryReturnValue retValue = (VdcQueryReturnValue) returnValue; - if (retValue != null && retValue.getSucceeded()) { - List<Object> list = (ArrayList<Object>) retValue.getReturnValue(); - if (list != null) { - for (Object object : list) { - if (object instanceof VM) { - vms.add((VM) object); - } else if (object instanceof vm_pools) { - pools.add((vm_pools) object); - } - } - } - } - - userPortalBasicListModel.setvms(vms); - userPortalBasicListModel.setpools(pools); - userPortalBasicListModel.OnVmAndPoolLoad(); - } - })); } @Override diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java index 23b54e0..066bc02 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java @@ -35,7 +35,6 @@ import org.ovirt.engine.core.common.businessentities.vm_pools; import org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface; import org.ovirt.engine.core.common.queries.GetVmByVmIdParameters; -import org.ovirt.engine.core.common.queries.VdcQueryParametersBase; import org.ovirt.engine.core.common.queries.VdcQueryReturnValue; import org.ovirt.engine.core.common.queries.VdcQueryType; import org.ovirt.engine.core.compat.Event; @@ -212,30 +211,6 @@ private EntityModel poolGeneralModel; private ListModel poolDiskListModel; private ListModel poolInterfaceListModel; - private ArrayList<VM> privatevms; - - public ArrayList<VM> getvms() - { - return privatevms; - } - - public void setvms(ArrayList<VM> value) - { - privatevms = value; - } - - private ArrayList<vm_pools> privatepools; - - public ArrayList<vm_pools> getpools() - { - return privatepools; - } - - public void setpools(ArrayList<vm_pools> value) - { - privatepools = value; - } - private VM privatetempVm; public VM gettempVm() @@ -341,42 +316,6 @@ } OnSelectedItemChanged(); } - } - - @Override - protected void SyncSearch() - { - super.SyncSearch(); - - Frontend.RunQuery(VdcQueryType.GetAllVmsAndVmPools, - new VdcQueryParametersBase(), - new AsyncQuery(this, new INewAsyncCallback() { - - @Override - public void OnSuccess(Object model, Object returnValue) { - UserPortalListModel userPortalListModel = (UserPortalListModel) model; - ArrayList<VM> vms = new ArrayList<VM>(); - ArrayList<vm_pools> pools = new ArrayList<vm_pools>(); - - VdcQueryReturnValue retValue = (VdcQueryReturnValue) returnValue; - if (retValue != null && retValue.getSucceeded()) { - List<Object> list = (ArrayList<Object>) retValue.getReturnValue(); - if (list != null) { - for (Object object : list) { - if (object instanceof VM) { - vms.add((VM) object); - } else if (object instanceof vm_pools) { - pools.add((vm_pools) object); - } - } - } - } - - userPortalListModel.setvms(vms); - userPortalListModel.setpools(pools); - userPortalListModel.OnVmAndPoolLoad(); - } - })); } @Override -- To view, visit http://gerrit.ovirt.org/10675 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9c5469264a6f71c50aa9c1d7c9851c3174851929 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Gilad Chaplik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
