Arik Hadas has uploaded a new change for review. Change subject: webadmin: introduce NullableFrontendActionAsyncCallback ......................................................................
webadmin: introduce NullableFrontendActionAsyncCallback The methods Frontend#RunAction expect to receive an instance of IFrontendActionAsyncCallback. but there are multiple places where the result of the action isn't interesting. in those cases an instance of empty IFrontendActionAsyncCallback is created and passed to those methods. This patch introduce Frontend#NULLABLE_ASYNC_CALLBACK which is an instance of Frontend#NullableFrontendActionAsyncCallback that we can passe to Frontend#RunAction methods instead. Using NULLABLE_ASYNC_CALLBACK instead of creating new empty implementation each time is better because: 1. the code is more readable as each creation of empty implementation of the callback interface is composed on several lines in the code 2. the code is more efficient as we create less objects Change-Id: Ic0cf37a9f4ffb973a3791323596af6d97c7365cb Signed-off-by: Arik Hadas <[email protected]> --- M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/Frontend.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/VmItemBehavior.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmSnapshotListModel.java 7 files changed, 240 insertions(+), 257 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/34/11734/1 diff --git a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/Frontend.java b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/Frontend.java index 10720b7..0a8652a 100644 --- a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/Frontend.java +++ b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/Frontend.java @@ -98,6 +98,8 @@ private static Event frontendNotLoggedInEvent = new Event("NotLoggedIn", Frontend.class); //$NON-NLS-1$ + public final static NullableFrontendActionAsyncCallback NULLABLE_ASYNC_CALLBACK = new NullableFrontendActionAsyncCallback(); + public static Event getFrontendFailureEvent() { return frontendFailureEvent; } @@ -844,4 +846,12 @@ return false; } + /** + * Empty implementation of IFrontendActionAsyncCallback + */ + private final static class NullableFrontendActionAsyncCallback implements IFrontendActionAsyncCallback { + @Override + public void Executed(FrontendActionAsyncResult result) { + } + } } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java index 9cc6945..3a0bddc 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java @@ -17,17 +17,17 @@ import org.ovirt.engine.core.common.action.VdsGroupOperationParameters; import org.ovirt.engine.core.common.businessentities.ServerCpu; import org.ovirt.engine.core.common.businessentities.StorageDomainSharedStatus; +import org.ovirt.engine.core.common.businessentities.StorageDomainStatic; import org.ovirt.engine.core.common.businessentities.StorageDomainType; import org.ovirt.engine.core.common.businessentities.StorageFormatType; import org.ovirt.engine.core.common.businessentities.StoragePoolStatus; +import org.ovirt.engine.core.common.businessentities.StorageServerConnections; import org.ovirt.engine.core.common.businessentities.StorageType; import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.VDSGroup; import org.ovirt.engine.core.common.businessentities.VDSStatus; -import org.ovirt.engine.core.common.businessentities.StorageDomainStatic; import org.ovirt.engine.core.common.businessentities.storage_domains; import org.ovirt.engine.core.common.businessentities.storage_pool; -import org.ovirt.engine.core.common.businessentities.StorageServerConnections; import org.ovirt.engine.core.common.interfaces.SearchType; import org.ovirt.engine.core.common.queries.SearchParameters; import org.ovirt.engine.core.common.queries.ValueObjectMap; @@ -871,12 +871,7 @@ { Frontend.RunAction(VdcActionType.DisconnectStorageServerConnection, new StorageServerConnectionParametersBase(connection, hostId), - new IFrontendActionAsyncCallback() { - @Override - public void Executed(FrontendActionAsyncResult result) { - - } - }, + Frontend.NULLABLE_ASYNC_CALLBACK, this); } @@ -1206,11 +1201,8 @@ { Frontend.RunAction(VdcActionType.AttachStorageDomainToPool, new StorageDomainPoolParametersBase(storageId, dataCenterId), - new IFrontendActionAsyncCallback() { - @Override - public void Executed(FrontendActionAsyncResult result) { - } - }, this); + Frontend.NULLABLE_ASYNC_CALLBACK, + this); } public void OnAttachStorage() @@ -1524,11 +1516,7 @@ Frontend.RunAction(VdcActionType.ApproveVds, new ApproveVdsParameters(selectedHost.getId()), - new IFrontendActionAsyncCallback() { - @Override - public void Executed(FrontendActionAsyncResult result) { - } - }, + Frontend.NULLABLE_ASYNC_CALLBACK, this); } } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java index 5506fb0..5e7491f 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java @@ -17,15 +17,15 @@ import org.ovirt.engine.core.common.businessentities.LUNs; import org.ovirt.engine.core.common.businessentities.NfsVersion; import org.ovirt.engine.core.common.businessentities.StorageDomainSharedStatus; +import org.ovirt.engine.core.common.businessentities.StorageDomainStatic; import org.ovirt.engine.core.common.businessentities.StorageDomainType; import org.ovirt.engine.core.common.businessentities.StorageFormatType; +import org.ovirt.engine.core.common.businessentities.StorageServerConnections; 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.common.businessentities.StorageDomainStatic; import org.ovirt.engine.core.common.businessentities.storage_domains; import org.ovirt.engine.core.common.businessentities.storage_pool; -import org.ovirt.engine.core.common.businessentities.StorageServerConnections; import org.ovirt.engine.core.common.interfaces.SearchType; import org.ovirt.engine.core.common.mode.ApplicationMode; import org.ovirt.engine.core.common.queries.SearchParameters; @@ -169,7 +169,8 @@ setDefaultSearchString("Storage:"); //$NON-NLS-1$ setSearchString(getDefaultSearchString()); - setSearchObjects(new String[] { SearchObjects.VDC_STORAGE_DOMAIN_OBJ_NAME, SearchObjects.VDC_STORAGE_DOMAIN_PLU_OBJ_NAME }); + setSearchObjects(new String[] { SearchObjects.VDC_STORAGE_DOMAIN_OBJ_NAME, + SearchObjects.VDC_STORAGE_DOMAIN_PLU_OBJ_NAME }); setAvailableInModes(ApplicationMode.VirtOnly); setNewDomainCommand(new UICommand("NewDomain", this)); //$NON-NLS-1$ @@ -321,7 +322,6 @@ model.Initialize(); - UICommand command; command = new UICommand("OnSave", this); //$NON-NLS-1$ command.setTitle(ConstantsManager.getInstance().getConstants().ok()); @@ -365,28 +365,28 @@ IStorageModel item = null; switch (storage.getstorage_type()) { - case NFS: - item = PrepareNfsStorageForEdit(storage); - break; + case NFS: + item = PrepareNfsStorageForEdit(storage); + break; - case FCP: - item = PrepareFcpStorageForEdit(storage); - break; + case FCP: + item = PrepareFcpStorageForEdit(storage); + break; - case ISCSI: - item = PrepareIscsiStorageForEdit(storage); - break; + case ISCSI: + item = PrepareIscsiStorageForEdit(storage); + break; - case LOCALFS: - item = PrepareLocalStorageForEdit(storage); - break; + case LOCALFS: + item = PrepareLocalStorageForEdit(storage); + break; - case POSIXFS: - item = PreparePosixStorageForEdit(storage); - break; + case POSIXFS: + item = PreparePosixStorageForEdit(storage); + break; } - model.setItems(new ArrayList<IStorageModel>(Arrays.asList(new IStorageModel[] {item}))); + model.setItems(new ArrayList<IStorageModel>(Arrays.asList(new IStorageModel[] { item }))); model.setSelectedItem(item); model.Initialize(); @@ -454,8 +454,8 @@ // If any settings were overridden, reflect this in the override checkbox model.getOverride().setEntity( connection.getNfsVersion() != null || - connection.getNfsRetrans() != null || - connection.getNfsTimeo() != null); + connection.getNfsRetrans() != null || + connection.getNfsTimeo() != null); } }), storage.getstorage(), true); @@ -591,7 +591,6 @@ model.Initialize(); - UICommand command; command = new UICommand("OnImport", this); //$NON-NLS-1$ command.setTitle(ConstantsManager.getInstance().getConstants().ok()); @@ -660,34 +659,35 @@ if (!isNameUnique && name1.compareToIgnoreCase(originalName) != 0) { storageModel.getName() - .getInvalidityReasons() - .add(ConstantsManager.getInstance().getConstants().nameMustBeUniqueInvalidReason()); + .getInvalidityReasons() + .add(ConstantsManager.getInstance().getConstants().nameMustBeUniqueInvalidReason()); storageModel.getName().setIsValid(false); storageListModel.PostStorageNameValidation(); } else { - AsyncDataProvider.GetStorageDomainMaxNameLength(new AsyncQuery(storageListModel, new INewAsyncCallback() { - @Override - public void OnSuccess(Object target1, Object returnValue1) { + AsyncDataProvider.GetStorageDomainMaxNameLength(new AsyncQuery(storageListModel, + new INewAsyncCallback() { + @Override + public void OnSuccess(Object target1, Object returnValue1) { - StorageListModel storageListModel1 = (StorageListModel) target1; - StorageModel storageModel1 = (StorageModel) storageListModel1.getWindow(); - int nameMaxLength = (Integer) returnValue1; - RegexValidation tempVar2 = new RegexValidation(); - tempVar2.setExpression("^[A-Za-z0-9_-]{1," + nameMaxLength + "}$"); //$NON-NLS-1$ //$NON-NLS-2$ - tempVar2.setMessage(ConstantsManager.getInstance().getMessages() - .nameCanContainOnlyMsg(nameMaxLength)); - storageModel1.getName().ValidateEntity(new IValidation[] { - new NotEmptyValidation(), tempVar2}); - storageListModel1.PostStorageNameValidation(); + StorageListModel storageListModel1 = (StorageListModel) target1; + StorageModel storageModel1 = (StorageModel) storageListModel1.getWindow(); + int nameMaxLength = (Integer) returnValue1; + RegexValidation tempVar2 = new RegexValidation(); + tempVar2.setExpression("^[A-Za-z0-9_-]{1," + nameMaxLength + "}$"); //$NON-NLS-1$ //$NON-NLS-2$ + tempVar2.setMessage(ConstantsManager.getInstance().getMessages() + .nameCanContainOnlyMsg(nameMaxLength)); + storageModel1.getName().ValidateEntity(new IValidation[] { + new NotEmptyValidation(), tempVar2 }); + storageListModel1.PostStorageNameValidation(); - } - })); + } + })); } } }), - name); + name); } public void PostStorageNameValidation() @@ -700,12 +700,10 @@ private void CleanConnection(StorageServerConnections connection, Guid hostId) { - Frontend.RunAction(VdcActionType.DisconnectStorageServerConnection, new StorageServerConnectionParametersBase(connection, hostId), new IFrontendActionAsyncCallback() { - @Override - public void Executed(FrontendActionAsyncResult result) { - - } - }, this); + Frontend.RunAction(VdcActionType.DisconnectStorageServerConnection, + new StorageServerConnectionParametersBase(connection, hostId), + Frontend.NULLABLE_ASYNC_CALLBACK, + this); } private void remove() @@ -722,7 +720,7 @@ model.setMessage(ConstantsManager.getInstance().getConstants().areYouSureYouWantToRemoveTheStorageDomainMsg()); model.getFormat().setIsAvailable(false); - AsyncDataProvider.GetHostListByStatus(new AsyncQuery(new Object[] {this, model}, new INewAsyncCallback() { + AsyncDataProvider.GetHostListByStatus(new AsyncQuery(new Object[] { this, model }, new INewAsyncCallback() { @Override public void OnSuccess(Object target, Object returnValue) { @@ -734,8 +732,8 @@ removeStorageModel.getHostList().setItems(hosts); removeStorageModel.getHostList().setSelectedItem(Linq.FirstOrDefault(hosts)); removeStorageModel.getFormat() - .setIsAvailable(storage.getstorage_domain_type() == StorageDomainType.ISO - || storage.getstorage_domain_type() == StorageDomainType.ImportExport); + .setIsAvailable(storage.getstorage_domain_type() == StorageDomainType.ISO + || storage.getstorage_domain_type() == StorageDomainType.ImportExport); if (hosts.isEmpty()) { @@ -779,15 +777,10 @@ RemoveStorageDomainParameters tempVar = new RemoveStorageDomainParameters(storage.getId()); tempVar.setVdsId(host.getId()); tempVar.setDoFormat((storage.getstorage_domain_type() == StorageDomainType.Data || storage.getstorage_domain_type() == StorageDomainType.Master) ? true - : (Boolean) model.getFormat().getEntity()); + : (Boolean) model.getFormat().getEntity()); Frontend.RunAction(VdcActionType.RemoveStorageDomain, tempVar, - new IFrontendActionAsyncCallback() { - @Override - public void Executed(FrontendActionAsyncResult result) { - - } - }, this); + Frontend.NULLABLE_ASYNC_CALLBACK, this); } Cancel(); @@ -805,7 +798,6 @@ model.getLatch().setIsAvailable(true); model.getLatch().setIsChangable(true); - UICommand command; command = new UICommand("OnDestroy", this); //$NON-NLS-1$ @@ -838,18 +830,18 @@ model.StartProgress(null); Frontend.RunMultipleAction(VdcActionType.ForceRemoveStorageDomain, - new ArrayList<VdcActionParametersBase>(Arrays.asList(new VdcActionParametersBase[] {new StorageDomainParametersBase(storageDomain.getId())})), - new IFrontendMultipleActionAsyncCallback() { - @Override - public void Executed(FrontendMultipleActionAsyncResult result) { + new ArrayList<VdcActionParametersBase>(Arrays.asList(new VdcActionParametersBase[] { new StorageDomainParametersBase(storageDomain.getId()) })), + new IFrontendMultipleActionAsyncCallback() { + @Override + public void Executed(FrontendMultipleActionAsyncResult result) { - ConfirmationModel localModel = (ConfirmationModel) result.getState(); - localModel.StopProgress(); - Cancel(); + ConfirmationModel localModel = (ConfirmationModel) result.getState(); + localModel.StopProgress(); + Cancel(); - } - }, - model); + } + }, + model); } private void OnSave() @@ -896,7 +888,7 @@ Task.Create(this, new ArrayList<Object>(Arrays.asList(new Object[] { "SaveLocal" }))).Run(); //$NON-NLS-1$ } - private void SaveNfsStorage() + private void SaveNfsStorage() { if (getWindow().getProgress() != null) { @@ -916,7 +908,7 @@ getWindow().StartProgress(null); - Task.Create(this, new ArrayList<Object>(Arrays.asList(new Object[] {"SavePosix"}))).Run(); //$NON-NLS-1$ + Task.Create(this, new ArrayList<Object>(Arrays.asList(new Object[] { "SavePosix" }))).Run(); //$NON-NLS-1$ } private void SaveSanStorage() @@ -1149,7 +1141,9 @@ PosixStorageModel posixModel = (PosixStorageModel) storageModel; path = (String) posixModel.getPath().getEntity(); - storageDomain = isNew ? new StorageDomainStatic() : (StorageDomainStatic) Cloner.clone(selectedItem.getStorageStaticData()); + storageDomain = + isNew ? new StorageDomainStatic() + : (StorageDomainStatic) Cloner.clone(selectedItem.getStorageStaticData()); storageDomain.setstorage_type(isNew ? storageModel.getType() : storageDomain.getstorage_type()); storageDomain.setstorage_domain_type(isNew ? storageModel.getRole() : storageDomain.getstorage_domain_type()); storageDomain.setstorage_name((String) model.getName().getEntity()); @@ -1167,25 +1161,32 @@ String storageName = storages.get(0).getstorage_name(); OnFinish(storageListModel.context, - false, - storageListModel.storageModel, - ConstantsManager.getInstance().getMessages().createFailedDomainAlreadyExistStorageMsg(storageName)); + false, + storageListModel.storageModel, + ConstantsManager.getInstance() + .getMessages() + .createFailedDomainAlreadyExistStorageMsg(storageName)); } else { storageListModel.SaveNewPosixStorage(); } } - }), null, path); + }), + null, + path); } else { - Frontend.RunAction(VdcActionType.UpdateStorageDomain, new StorageDomainManagementParameter(storageDomain), new IFrontendActionAsyncCallback() { - @Override - public void Executed(FrontendActionAsyncResult result) { + Frontend.RunAction(VdcActionType.UpdateStorageDomain, + new StorageDomainManagementParameter(storageDomain), + new IFrontendActionAsyncCallback() { + @Override + public void Executed(FrontendActionAsyncResult result) { - StorageListModel storageListModel = (StorageListModel) result.getState(); - storageListModel.OnFinish(storageListModel.context, true, storageListModel.storageModel); + StorageListModel storageListModel = (StorageListModel) result.getState(); + storageListModel.OnFinish(storageListModel.context, true, storageListModel.storageModel); - } - }, this); + } + }, + this); } } @@ -1255,11 +1256,11 @@ }; Frontend.RunMultipleActions(actionTypes, - parameters, - new ArrayList<IFrontendActionAsyncCallback>(Arrays.asList(new IFrontendActionAsyncCallback[] { + parameters, + new ArrayList<IFrontendActionAsyncCallback>(Arrays.asList(new IFrontendActionAsyncCallback[] { callback1, callback2 })), - failureCallback, - this); + failureCallback, + this); } private void SaveNfsStorage(TaskContext context) @@ -1297,27 +1298,31 @@ String storageName = storages.get(0).getstorage_name(); OnFinish(storageListModel.context, - false, - storageListModel.storageModel, - ConstantsManager.getInstance().getMessages().createFailedDomainAlreadyExistStorageMsg(storageName)); + false, + storageListModel.storageModel, + ConstantsManager.getInstance() + .getMessages() + .createFailedDomainAlreadyExistStorageMsg(storageName)); } else { storageListModel.SaveNewNfsStorage(); } } - }), null, path); + }), + null, + path); } else { Frontend.RunAction(VdcActionType.UpdateStorageDomain, new StorageDomainManagementParameter(storageDomain), - new IFrontendActionAsyncCallback() { - @Override - public void Executed(FrontendActionAsyncResult result) { + new IFrontendActionAsyncCallback() { + @Override + public void Executed(FrontendActionAsyncResult result) { - StorageListModel storageListModel = (StorageListModel) result.getState(); - storageListModel.OnFinish(storageListModel.context, true, storageListModel.storageModel); + StorageListModel storageListModel = (StorageListModel) result.getState(); + storageListModel.OnFinish(storageListModel.context, true, storageListModel.storageModel); - } - }, this); + } + }, this); } } @@ -1426,9 +1431,9 @@ params.setLunIds(lunIds); params.setForce(force); Frontend.RunAction(VdcActionType.AddSANStorageDomain, params, - new IFrontendActionAsyncCallback() { - @Override - public void Executed(FrontendActionAsyncResult result) { + new IFrontendActionAsyncCallback() { + @Override + public void Executed(FrontendActionAsyncResult result) { StorageListModel storageListModel = (StorageListModel) result.getState(); StorageModel storageModel = (StorageModel) storageListModel.getWindow(); storageListModel.storageModel = storageModel.getSelectedItem(); @@ -1444,9 +1449,9 @@ storageListModel.AttachStorageToDataCenter((Guid) storageId, dataCenter.getId()); } - storageListModel.OnFinish(storageListModel.context, true, storageListModel.storageModel); - } - }, this); + storageListModel.OnFinish(storageListModel.context, true, storageListModel.storageModel); + } + }, this); } private void SaveLocalStorage(TaskContext context) @@ -1483,27 +1488,34 @@ String storageName = storages.get(0).getstorage_name(); OnFinish(storageListModel.context, - false, - storageListModel.storageModel, - ConstantsManager.getInstance().getMessages().createFailedDomainAlreadyExistStorageMsg(storageName)); + false, + storageListModel.storageModel, + ConstantsManager.getInstance() + .getMessages() + .createFailedDomainAlreadyExistStorageMsg(storageName)); } else { storageListModel.SaveNewLocalStorage(); } } - }), host.getStoragePoolId(), path); + }), + host.getStoragePoolId(), + path); } else { - Frontend.RunAction(VdcActionType.UpdateStorageDomain, new StorageDomainManagementParameter(storageDomain), new IFrontendActionAsyncCallback() { - @Override - public void Executed(FrontendActionAsyncResult result) { + Frontend.RunAction(VdcActionType.UpdateStorageDomain, + new StorageDomainManagementParameter(storageDomain), + new IFrontendActionAsyncCallback() { + @Override + public void Executed(FrontendActionAsyncResult result) { - StorageListModel storageListModel = (StorageListModel) result.getState(); - storageListModel.OnFinish(storageListModel.context, true, storageListModel.storageModel); + StorageListModel storageListModel = (StorageListModel) result.getState(); + storageListModel.OnFinish(storageListModel.context, true, storageListModel.storageModel); - } - }, this); + } + }, + this); } } @@ -1621,48 +1633,42 @@ } else { - Frontend.RunAction(VdcActionType.UpdateStorageDomain, new StorageDomainManagementParameter(storageDomain), new IFrontendActionAsyncCallback() { - @Override - public void Executed(FrontendActionAsyncResult result) { + Frontend.RunAction(VdcActionType.UpdateStorageDomain, + new StorageDomainManagementParameter(storageDomain), + new IFrontendActionAsyncCallback() { + @Override + public void Executed(FrontendActionAsyncResult result) { - StorageListModel storageListModel = (StorageListModel) result.getState(); - StorageModel storageModel = (StorageModel) getWindow(); - SanStorageModel sanStorageModel = (SanStorageModel) storageModel.getSelectedItem(); - boolean force = sanStorageModel.isForce(); - storage_domains storageDomain1 = (storage_domains) storageListModel.getSelectedItem(); - ArrayList<String> lunIds = new ArrayList<String>(); + StorageListModel storageListModel = (StorageListModel) result.getState(); + StorageModel storageModel = (StorageModel) getWindow(); + SanStorageModel sanStorageModel = (SanStorageModel) storageModel.getSelectedItem(); + boolean force = sanStorageModel.isForce(); + storage_domains storageDomain1 = (storage_domains) storageListModel.getSelectedItem(); + ArrayList<String> lunIds = new ArrayList<String>(); - for (LunModel lun : sanStorageModel.getAddedLuns()) { - lunIds.add(lun.getLunId()); - } + for (LunModel lun : sanStorageModel.getAddedLuns()) { + lunIds.add(lun.getLunId()); + } - if (lunIds.size() > 0) { - Frontend.RunAction(VdcActionType.ExtendSANStorageDomain, - new ExtendSANStorageDomainParameters(storageDomain1.getId(), lunIds, force), - new IFrontendActionAsyncCallback() { - @Override - public void Executed(FrontendActionAsyncResult result1) { - - } - }, - this); - } - storageListModel.OnFinish(storageListModel.context, true, storageListModel.storageModel); - } - }, this); + if (lunIds.size() > 0) { + Frontend.RunAction(VdcActionType.ExtendSANStorageDomain, + new ExtendSANStorageDomainParameters(storageDomain1.getId(), lunIds, force), + Frontend.NULLABLE_ASYNC_CALLBACK, + this); + } + storageListModel.OnFinish(storageListModel.context, true, storageListModel.storageModel); + } + }, + this); } } private void AttachStorageToDataCenter(Guid storageId, Guid dataCenterId) { Frontend.RunAction(VdcActionType.AttachStorageDomainToPool, new StorageDomainPoolParametersBase(storageId, - dataCenterId), - new IFrontendActionAsyncCallback() { - @Override - public void Executed(FrontendActionAsyncResult result) { - - } - }, this); + dataCenterId), + Frontend.NULLABLE_ASYNC_CALLBACK, + this); } private void ImportNfsStorage(TaskContext context) @@ -1686,22 +1692,22 @@ { // Clean nfs connection Frontend.RunAction(VdcActionType.DisconnectStorageServerConnection, - new StorageServerConnectionParametersBase(nfsConnection, hostId), - new IFrontendActionAsyncCallback() { - @Override - public void Executed(FrontendActionAsyncResult result) { + new StorageServerConnectionParametersBase(nfsConnection, hostId), + new IFrontendActionAsyncCallback() { + @Override + public void Executed(FrontendActionAsyncResult result) { - StorageListModel storageListModel = (StorageListModel) result.getState(); - VdcReturnValueBase returnVal = result.getReturnValue(); - boolean success = returnVal != null && returnVal.getSucceeded(); - if (success) { - storageListModel.nfsConnection = null; + StorageListModel storageListModel = (StorageListModel) result.getState(); + VdcReturnValueBase returnVal = result.getReturnValue(); + boolean success = returnVal != null && returnVal.getSucceeded(); + if (success) { + storageListModel.nfsConnection = null; + } + storageListModel.ImportNfsStoragePostInit(); + } - storageListModel.ImportNfsStoragePostInit(); - - } - }, - this); + }, + this); } else { @@ -1723,9 +1729,11 @@ String storageName = storages.get(0).getstorage_name(); OnFinish(storageListModel.context, - false, - storageListModel.storageModel, - ConstantsManager.getInstance().getMessages().importFailedDomainAlreadyExistStorageMsg(storageName)); + false, + storageListModel.storageModel, + ConstantsManager.getInstance() + .getMessages() + .importFailedDomainAlreadyExistStorageMsg(storageName)); } else { StorageServerConnections tempVar = new StorageServerConnections(); storageModel = storageListModel.storageModel; @@ -1742,17 +1750,20 @@ storageListModel.ImportNfsStorageConnect(); } } - }), null, path); + }), + null, + path); } public void ImportNfsStorageConnect() { - Frontend.RunAction(VdcActionType.AddStorageServerConnection, new StorageServerConnectionParametersBase(nfsConnection, hostId), - new IFrontendActionAsyncCallback() { - @Override - public void Executed(FrontendActionAsyncResult result) { + Frontend.RunAction(VdcActionType.AddStorageServerConnection, + new StorageServerConnectionParametersBase(nfsConnection, hostId), + new IFrontendActionAsyncCallback() { + @Override + public void Executed(FrontendActionAsyncResult result) { - StorageListModel storageListModel = (StorageListModel) result.getState(); + StorageListModel storageListModel = (StorageListModel) result.getState(); VdcReturnValueBase returnVal = result.getReturnValue(); boolean success = returnVal != null && returnVal.getSucceeded(); if (success) @@ -1763,7 +1774,8 @@ public void OnSuccess(Object target, Object returnValue) { StorageListModel storageListModel1 = (StorageListModel) target; - ArrayList<storage_domains> domains = (ArrayList<storage_domains>) returnValue; + ArrayList<storage_domains> domains = + (ArrayList<storage_domains>) returnValue; if (domains != null) { if (domains.isEmpty()) @@ -1841,31 +1853,31 @@ PostImportNfsStorage(storageListModel.context, false, storageListModel.storageModel, ""); //$NON-NLS-1$ } } - }, new Object[] {this, sdToAdd}); + }, new Object[] { this, sdToAdd }); } public void PostImportNfsStorage(TaskContext context, boolean isSucceeded, IStorageModel model, String message) { Frontend.RunAction(VdcActionType.DisconnectStorageServerConnection, - new StorageServerConnectionParametersBase(nfsConnection, hostId), - new IFrontendActionAsyncCallback() { - @Override - public void Executed(FrontendActionAsyncResult result) { + new StorageServerConnectionParametersBase(nfsConnection, hostId), + new IFrontendActionAsyncCallback() { + @Override + public void Executed(FrontendActionAsyncResult result) { - VdcReturnValueBase returnValue = result.getReturnValue(); - boolean success = returnValue != null && returnValue.getSucceeded(); - if (success) { - nfsConnection = null; + VdcReturnValueBase returnValue = result.getReturnValue(); + boolean success = returnValue != null && returnValue.getSucceeded(); + if (success) { + nfsConnection = null; + } + Object[] array = (Object[]) result.getState(); + OnFinish((TaskContext) array[0], + (Boolean) array[1], + (IStorageModel) array[2], + (String) array[3]); + } - Object[] array = (Object[]) result.getState(); - OnFinish((TaskContext) array[0], - (Boolean) array[1], - (IStorageModel) array[2], - (String) array[3]); - - } - }, - new Object[] {context, isSucceeded, model, message}); + }, + new Object[] { context, isSucceeded, model, message }); } private void ImportSanStorage(TaskContext context) @@ -1889,7 +1901,8 @@ storage = (storage_domains) selectedItem.getEntity(); } - AddSANStorageDomainParameters params = new AddSANStorageDomainParameters(storage == null ? null : storage.getStorageStaticData()); + AddSANStorageDomainParameters params = + new AddSANStorageDomainParameters(storage == null ? null : storage.getStorageStaticData()); params.setVdsId(hostId); Frontend.RunAction(VdcActionType.AddExistingSANStorageDomain, params, new IFrontendActionAsyncCallback() { @@ -1914,7 +1927,7 @@ OnFinish(storageListModel.context, success, storageListModel.storageModel, null); } - }, new Object[] {this, storage}); + }, new Object[] { this, storage }); } @Override diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/VmItemBehavior.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/VmItemBehavior.java index 68a09bf..7982360 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/VmItemBehavior.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/VmItemBehavior.java @@ -27,8 +27,6 @@ import org.ovirt.engine.ui.uicommonweb.models.vms.ConsoleModel; import org.ovirt.engine.ui.uicommonweb.models.vms.RdpConsoleModel; import org.ovirt.engine.ui.uicommonweb.models.vms.SpiceConsoleModel; -import org.ovirt.engine.ui.uicompat.FrontendActionAsyncResult; -import org.ovirt.engine.ui.uicompat.IFrontendActionAsyncCallback; public class VmItemBehavior extends ItemBehavior { @@ -110,12 +108,7 @@ VM entity = (VM) getItem().getEntity(); Frontend.RunAction(VdcActionType.ShutdownVm, new ShutdownVmParameters(entity.getId(), false), - new IFrontendActionAsyncCallback() { - @Override - public void Executed(FrontendActionAsyncResult result) { - - } - }, null); + Frontend.NULLABLE_ASYNC_CALLBACK, null); } private void Shutdown() diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java index 3d372ee..a8ec264 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java @@ -180,7 +180,7 @@ new ArrayList<VdcActionParametersBase>(Arrays.asList(new VdcActionParametersBase[] { new ShutdownVmParameters(getEntity().getId(), true) }))); - } else if (StringHelper.stringsEqual(item.getCommandName(), CommandChangeCD)) { + } else if (StringHelper.stringsEqual(item.getCommandName(), CommandChangeCD)) { Frontend.RunMultipleAction(VdcActionType.ChangeDisk, new ArrayList<VdcActionParametersBase>(Arrays.asList(new VdcActionParametersBase[] { new ChangeDiskCommandParameters(getEntity().getId(), StringHelper.stringsEqual(item.getText(), EjectLabel) ? "" : item.getText()) }))); //$NON-NLS-1$ @@ -255,14 +255,18 @@ ArrayList<VdcQueryParametersBase> parametersList = new ArrayList<VdcQueryParametersBase>(); - parametersList.add(new GetConfigurationValueParameters(ConfigurationValues.SSLEnabled, AsyncDataProvider.getDefaultConfigurationVersion())); - parametersList.add(new GetConfigurationValueParameters(ConfigurationValues.CipherSuite, AsyncDataProvider.getDefaultConfigurationVersion())); + parametersList.add(new GetConfigurationValueParameters(ConfigurationValues.SSLEnabled, + AsyncDataProvider.getDefaultConfigurationVersion())); + parametersList.add(new GetConfigurationValueParameters(ConfigurationValues.CipherSuite, + AsyncDataProvider.getDefaultConfigurationVersion())); parametersList.add(new GetConfigurationValueParameters(ConfigurationValues.SpiceSecureChannels, thisVm.getVdsGroupCompatibilityVersion().toString())); - parametersList.add(new GetConfigurationValueParameters(ConfigurationValues.EnableSpiceRootCertificateValidation, AsyncDataProvider.getDefaultConfigurationVersion())); + parametersList.add(new GetConfigurationValueParameters(ConfigurationValues.EnableSpiceRootCertificateValidation, + AsyncDataProvider.getDefaultConfigurationVersion())); parametersList.add(new GetVmByVmIdParameters(thisVm.getId())); parametersList.add(new VdcQueryParametersBase()); - parametersList.add(new GetConfigurationValueParameters(ConfigurationValues.SpiceToggleFullScreenKeys, AsyncDataProvider.getDefaultConfigurationVersion())); + parametersList.add(new GetConfigurationValueParameters(ConfigurationValues.SpiceToggleFullScreenKeys, + AsyncDataProvider.getDefaultConfigurationVersion())); parametersList.add(new GetConfigurationValueParameters(ConfigurationValues.SpiceReleaseCursorKeys, AsyncDataProvider.getDefaultConfigurationVersion())); @@ -548,12 +552,14 @@ final SpiceConsoleModel spiceConsoleModel = (SpiceConsoleModel) result.getState(); final VdcReturnValueBase logonCommandReturnValue = result.getReturnValue(); - boolean isLogonSucceeded = logonCommandReturnValue != null && logonCommandReturnValue.getSucceeded(); + boolean isLogonSucceeded = + logonCommandReturnValue != null && logonCommandReturnValue.getSucceeded(); if (isLogonSucceeded) { spiceConsoleModel.ExecuteQuery(getEntity()); } else { - if (logonCommandReturnValue != null && logonCommandReturnValue.getFault().getError() == VdcBllErrors.nonresp) { + if (logonCommandReturnValue != null + && logonCommandReturnValue.getFault().getError() == VdcBllErrors.nonresp) { UICommand okCommand = new UICommand("SpiceWithoutAgentOK", new BaseCommandTarget() { //$NON-NLS-1$ @Override @@ -590,7 +596,7 @@ } } - private void createConnectWithoutAgentConfirmationPopup(UICommand okCommand, UICommand cancelCommand){ + private void createConnectWithoutAgentConfirmationPopup(UICommand okCommand, UICommand cancelCommand) { SpiceToGuestWithNonRespAgentModel spiceWithoutAgentModel = new SpiceToGuestWithNonRespAgentModel(); spiceWithoutAgentModel.setTitle(ConstantsManager.getInstance() .getConstants() diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java index 40312a8..5a9035b 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java @@ -1651,13 +1651,7 @@ param.setUseVnc((Boolean) model.getDisplayConsole_Vnc_IsSelected().getEntity()); } - Frontend.RunAction(VdcActionType.RunVmOnce, param, - new IFrontendActionAsyncCallback() { - @Override - public void Executed(FrontendActionAsyncResult result) { - - } - }, this); + Frontend.RunAction(VdcActionType.RunVmOnce, param, Frontend.NULLABLE_ASYNC_CALLBACK, this); Cancel(); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmSnapshotListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmSnapshotListModel.java index fe6be7d..6881a0a 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmSnapshotListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmSnapshotListModel.java @@ -384,13 +384,7 @@ if (vm != null) { Frontend.RunAction(VdcActionType.RemoveSnapshot, new RemoveSnapshotParameters(snapshot.getId(), - vm.getId()), - new IFrontendActionAsyncCallback() { - @Override - public void Executed(FrontendActionAsyncResult result) { - - } - }, null); + vm.getId()), Frontend.NULLABLE_ASYNC_CALLBACK, null); } getCanSelectSnapshot().setEntity(false); @@ -407,12 +401,7 @@ Frontend.RunAction(VdcActionType.RestoreAllSnapshots, new RestoreAllSnapshotsParameters(vm.getId(), snapshot.getId()), - new IFrontendActionAsyncCallback() { - @Override - public void Executed(FrontendActionAsyncResult result) { - - } - }, + Frontend.NULLABLE_ASYNC_CALLBACK, null); } } @@ -426,12 +415,7 @@ Frontend.RunAction(VdcActionType.RestoreAllSnapshots, new RestoreAllSnapshotsParameters(vm.getId(), snapshot.getId()), - new IFrontendActionAsyncCallback() { - @Override - public void Executed(FrontendActionAsyncResult result) { - - } - }, + Frontend.NULLABLE_ASYNC_CALLBACK, null); } } @@ -445,12 +429,7 @@ Frontend.RunAction(VdcActionType.TryBackToAllSnapshotsOfVm, new TryBackToAllSnapshotsOfVmParameters(vm.getId(), snapshot.getId()), - new IFrontendActionAsyncCallback() { - @Override - public void Executed(FrontendActionAsyncResult result) { - - } - }, + Frontend.NULLABLE_ASYNC_CALLBACK, null); } } -- To view, visit http://gerrit.ovirt.org/11734 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic0cf37a9f4ffb973a3791323596af6d97c7365cb Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Arik Hadas <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
