Lior Vernia has uploaded a new change for review. Change subject: webadmin: Remove manual progress operations from NetworkModel ......................................................................
webadmin: Remove manual progress operations from NetworkModel With the addition of the automatic infrastructure that takes care of this, the manual code can be removed. Change-Id: I56c28548f9d58295c69f678b8dc51483d97d1c6a Signed-off-by: Lior Vernia <lver...@redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkListModel.java 2 files changed, 5 insertions(+), 14 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/65/35965/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java index 8ad3646..205c58e 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java @@ -224,18 +224,14 @@ } private void initExternalProviderList() { - startProgress(null); - AsyncQuery getProvidersQuery = new AsyncQuery(); - getProvidersQuery.asyncCallback = new INewAsyncCallback() { + AsyncQuery getProvidersQuery = new AsyncQuery(this, new INewAsyncCallback() { @Override - public void onSuccess(Object model, Object result) - { + public void onSuccess(Object model, Object result) { List<Provider> providers = (List<Provider>) result; getExternalProviders().setItems(providers); selectExternalProvider(); - stopProgress(); } - }; + }); AsyncDataProvider.getInstance().getAllNetworkProviders(getProvidersQuery); } @@ -768,16 +764,14 @@ } private void updateDcLabels() { - startProgress(null); AsyncDataProvider.getInstance().getNetworkLabelsByDataCenterId(getSelectedDc().getId(), - new AsyncQuery(new INewAsyncCallback() { + new AsyncQuery(this, new INewAsyncCallback() { @Override public void onSuccess(Object model, Object returnValue) { String label = getNetworkLabel().getSelectedItem(); getNetworkLabel().setItems((Collection<String>) returnValue); getNetworkLabel().setSelectedItem(label); - stopProgress(); onExportChanged(); } })); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkListModel.java index 37dc9c0..b7a0fde 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkListModel.java @@ -159,8 +159,6 @@ } private void initDcList(final NetworkModel networkModel) { - networkModel.startProgress(null); - SystemTreeItemModel treeSelectedDc = SystemTreeItemModel.findAncestor(SystemTreeItemType.DataCenter, getSystemTreeSelectedItem()); if (treeSelectedDc != null) { StoragePool dc = (StoragePool) treeSelectedDc.getEntity(); @@ -172,7 +170,7 @@ } // Get all data centers - AsyncDataProvider.getInstance().getDataCenterList(new AsyncQuery(NetworkListModel.this, new INewAsyncCallback() { + AsyncDataProvider.getInstance().getDataCenterList(new AsyncQuery(networkModel, new INewAsyncCallback() { @Override public void onSuccess(Object model, Object returnValue) { @@ -187,7 +185,6 @@ } else { networkModel.getDataCenters().setSelectedItem(Linq.firstOrDefault(dataCenters)); } - networkModel.stopProgress(); } })); } -- To view, visit http://gerrit.ovirt.org/35965 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I56c28548f9d58295c69f678b8dc51483d97d1c6a Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Lior Vernia <lver...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches