Alissa Bonas has uploaded a new change for review. Change subject: webadmin: reuse code in StorageListModel ......................................................................
webadmin: reuse code in StorageListModel Reuse handling of existing storage domains in StorageListModel by extracting the code to a separate method. Change-Id: I6f7d66790659150abd358a2cf00410c7fa3bd6a0 Signed-off-by: Alissa Bonas <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java 1 file changed, 13 insertions(+), 24 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/72/15672/1 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 668c780..6e6ca8c 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 @@ -1217,12 +1217,7 @@ ArrayList<StorageDomain> storages = (ArrayList<StorageDomain>) returnValue; if (storages != null && storages.size() > 0) { - String storageName = storages.get(0).getStorageName(); - - onFinish(storageListModel.context, - false, - storageListModel.storageModel, - ConstantsManager.getInstance().getMessages().createFailedDomainAlreadyExistStorageMsg(storageName)); + handleDomainAlreadyExists(storageListModel, storages); } else { storageListModel.saveNewPosixStorage(); } @@ -1350,12 +1345,7 @@ ArrayList<StorageDomain> storages = (ArrayList<StorageDomain>) returnValue; if (storages != null && storages.size() > 0) { - String storageName = storages.get(0).getStorageName(); - - onFinish(storageListModel.context, - false, - storageListModel.storageModel, - ConstantsManager.getInstance().getMessages().createFailedDomainAlreadyExistStorageMsg(storageName)); + handleDomainAlreadyExists(storageListModel, storages); } else { storageListModel.saveNewGlusterStorage(); } @@ -1473,12 +1463,7 @@ StorageListModel storageListModel = (StorageListModel) target; ArrayList<StorageDomain> storages = (ArrayList<StorageDomain>) returnValue; if (storages != null && storages.size() > 0) { - String storageName = storages.get(0).getStorageName(); - - onFinish(storageListModel.context, - false, - storageListModel.storageModel, - ConstantsManager.getInstance().getMessages().createFailedDomainAlreadyExistStorageMsg(storageName)); + handleDomainAlreadyExists(storageListModel, storages); } else { storageListModel.saveNewNfsStorage(); } @@ -1715,12 +1700,7 @@ StorageListModel storageListModel = (StorageListModel) target; ArrayList<StorageDomain> storages = (ArrayList<StorageDomain>) returnValue; if (storages != null && storages.size() > 0) { - String storageName = storages.get(0).getStorageName(); - - onFinish(storageListModel.context, - false, - storageListModel.storageModel, - ConstantsManager.getInstance().getMessages().createFailedDomainAlreadyExistStorageMsg(storageName)); + handleDomainAlreadyExists(storageListModel, storages); } else { storageListModel.saveNewLocalStorage(); } @@ -1740,6 +1720,15 @@ } } + private void handleDomainAlreadyExists(StorageListModel storageListModel, ArrayList<StorageDomain> storages) { + String storageName = storages.get(0).getStorageName(); + + onFinish(storageListModel.context, + false, + storageListModel.storageModel, + ConstantsManager.getInstance().getMessages().createFailedDomainAlreadyExistStorageMsg(storageName)); + } + public void saveNewLocalStorage() { StorageModel model = (StorageModel) getWindow(); -- To view, visit http://gerrit.ovirt.org/15672 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6f7d66790659150abd358a2cf00410c7fa3bd6a0 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alissa Bonas <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
