Tal Nisan has uploaded a new change for review. Change subject: findbugs: Fix fingbugs error in StorageListModel class ......................................................................
findbugs: Fix fingbugs error in StorageListModel class Change-Id: Idb17363d996bfbddd9ffefcfa06de055da00a42b Signed-off-by: Tal Nisan <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java 1 file changed, 99 insertions(+), 98 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/49/14449/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 5576620..c3cd066 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 @@ -22,11 +22,11 @@ import org.ovirt.engine.core.common.businessentities.StorageDomainStatus; import org.ovirt.engine.core.common.businessentities.StorageDomainType; import org.ovirt.engine.core.common.businessentities.StorageFormatType; +import org.ovirt.engine.core.common.businessentities.StoragePool; 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.StoragePool; import org.ovirt.engine.core.common.interfaces.SearchType; import org.ovirt.engine.core.common.mode.ApplicationMode; import org.ovirt.engine.core.common.queries.SearchParameters; @@ -265,7 +265,7 @@ setItems(getAsyncResult().getData()); } - private void NewDomain() + private void newDomain() { if (getWindow() != null) { @@ -340,7 +340,7 @@ model.getCommands().add(command); } - private void Edit() + private void edit() { StorageDomain storage = (StorageDomain) getSelectedItem(); @@ -405,6 +405,8 @@ case GLUSTERFS: item = prepareGlusterStorageForEdit(storage); break; + default: + break; } model.setItems(new ArrayList<IStorageModel>(Arrays.asList(new IStorageModel[] {item}))); @@ -414,12 +416,12 @@ if (getSystemTreeSelectedItem() != null && getSystemTreeSelectedItem().getType() != SystemTreeItemType.System) { - switch (getSystemTreeSelectedItem().getType()) - { - case Storage: { + switch (getSystemTreeSelectedItem().getType()) { + case Storage: model.getName().setIsChangable(false); model.getName().setInfo("Cannot edit Storage Domains's Name in this tree context"); //$NON-NLS-1$ - } + break; + default: break; } } @@ -583,7 +585,6 @@ private void prepareSanStorageForEdit(final SanStorageModel model) { StorageModel storageModel = (StorageModel) getWindow(); - StorageDomain storage = (StorageDomain) getSelectedItem(); boolean isStorageEditable = storageModel.isStorageActive() || storageModel.isNewStorage(); if (isStorageEditable) { @@ -618,7 +619,7 @@ }, storageModel.getHash()), storage.getStorage(), hostId); } - private void ImportDomain() + private void importDomain() { if (getWindow() != null) { @@ -665,7 +666,7 @@ model.getCommands().add(command); } - private void OnImport() + private void onImport() { StorageModel model = (StorageModel) getWindow(); @@ -719,7 +720,7 @@ } } - public void StorageNameValidation() + public void storageNameValidation() { StorageModel model = (StorageModel) getWindow(); String name = (String) model.getName().getEntity(); @@ -742,7 +743,7 @@ .getInvalidityReasons() .add(ConstantsManager.getInstance().getConstants().nameMustBeUniqueInvalidReason()); storageModel.getName().setIsValid(false); - storageListModel.PostStorageNameValidation(); + storageListModel.postStorageNameValidation(); } else { AsyncDataProvider.GetStorageDomainMaxNameLength(new AsyncQuery(storageListModel, new INewAsyncCallback() { @@ -758,7 +759,7 @@ .nameCanContainOnlyMsg(nameMaxLength)); storageModel1.getName().validateEntity(new IValidation[] { new NotEmptyValidation(), tempVar2}); - storageListModel1.PostStorageNameValidation(); + storageListModel1.postStorageNameValidation(); } })); @@ -769,11 +770,11 @@ name); } - public void PostStorageNameValidation() + public void postStorageNameValidation() { if (getLastExecutedCommand().getName().equals("OnSave")) //$NON-NLS-1$ { - OnSavePostNameValidation(); + onSavePostNameValidation(); } } @@ -836,7 +837,7 @@ }), VDSStatus.Up); } - private void OnRemove() + private void onRemove() { if (getSelectedItem() != null) { @@ -858,10 +859,10 @@ Frontend.RunAction(VdcActionType.RemoveStorageDomain, tempVar, null, this); } - Cancel(); + cancel(); } - private void Destroy() + private void destroy() { ConfirmationModel model = new ConfirmationModel(); setWindow(model); @@ -887,7 +888,7 @@ model.getCommands().add(command); } - private void OnDestroy() + private void onDestroy() { ConfirmationModel model = (ConfirmationModel) getWindow(); @@ -913,19 +914,19 @@ ConfirmationModel localModel = (ConfirmationModel) result.getState(); localModel.StopProgress(); - Cancel(); + cancel(); } }, model); } - private void OnSave() + private void onSave() { - StorageNameValidation(); + storageNameValidation(); } - private void OnSavePostNameValidation() + private void onSavePostNameValidation() { StorageModel model = (StorageModel) getWindow(); @@ -1009,14 +1010,14 @@ ArrayList<String> usedLunsMessages = sanStorageModel.getUsedLunsMessages(); if (usedLunsMessages.isEmpty()) { - OnSaveSanStorage(); + onSaveSanStorage(); } else { forceCreationWarning(usedLunsMessages); } } - private void OnSaveSanStorage() + private void onSaveSanStorage() { ConfirmationModel confirmationModel = (ConfirmationModel) getConfirmWindow(); @@ -1025,7 +1026,7 @@ return; } - CancelConfirm(); + cancelConfirm(); getWindow().StartProgress(null); Task.Create(this, new ArrayList<Object>(Arrays.asList(new Object[] { "SaveSan" }))).Run(); //$NON-NLS-1$ @@ -1056,12 +1057,12 @@ model.getCommands().add(command); } - private void CancelConfirm() + private void cancelConfirm() { setConfirmWindow(null); } - private void Cancel() + private void cancel() { setWindow(null); Frontend.Unsubscribe(); @@ -1179,15 +1180,15 @@ if (command == getNewDomainCommand()) { - NewDomain(); + newDomain(); } else if (command == getImportDomainCommand()) { - ImportDomain(); + importDomain(); } else if (command == getEditCommand()) { - Edit(); + edit(); } else if (command == getRemoveCommand()) { @@ -1195,35 +1196,35 @@ } else if (command == getDestroyCommand()) { - Destroy(); + destroy(); } else if (StringHelper.stringsEqual(command.getName(), "OnSave")) //$NON-NLS-1$ { - OnSave(); + onSave(); } else if (StringHelper.stringsEqual(command.getName(), "Cancel")) //$NON-NLS-1$ { - Cancel(); + cancel(); } else if (StringHelper.stringsEqual(command.getName(), "CancelConfirm")) //$NON-NLS-1$ { - CancelConfirm(); + cancelConfirm(); } else if (StringHelper.stringsEqual(command.getName(), "OnImport")) //$NON-NLS-1$ { - OnImport(); + onImport(); } else if (StringHelper.stringsEqual(command.getName(), "OnRemove")) //$NON-NLS-1$ { - OnRemove(); + onRemove(); } else if (StringHelper.stringsEqual(command.getName(), "OnDestroy")) //$NON-NLS-1$ { - OnDestroy(); + onDestroy(); } else if (StringHelper.stringsEqual(command.getName(), "OnSaveSanStorage")) //$NON-NLS-1$ { - OnSaveSanStorage(); + onSaveSanStorage(); } } @@ -1256,12 +1257,12 @@ if (storages != null && storages.size() > 0) { String storageName = storages.get(0).getStorageName(); - OnFinish(storageListModel.context, + onFinish(storageListModel.context, false, storageListModel.storageModel, ConstantsManager.getInstance().getMessages().createFailedDomainAlreadyExistStorageMsg(storageName)); } else { - storageListModel.SaveNewPosixStorage(); + storageListModel.saveNewPosixStorage(); } } }), null, path); @@ -1275,14 +1276,14 @@ @Override public void executed(FrontendActionAsyncResult result) { StorageListModel storageListModel = (StorageListModel) result.getState(); - storageListModel.OnFinish(storageListModel.context, true, storageListModel.storageModel); + storageListModel.onFinish(storageListModel.context, true, storageListModel.storageModel); } }, this); } } } - public void SaveNewPosixStorage() { + public void saveNewPosixStorage() { StorageModel model = (StorageModel) getWindow(); PosixStorageModel posixModel = (PosixStorageModel) model.getSelectedItem(); @@ -1332,10 +1333,10 @@ StorageModel storageModel = (StorageModel) storageListModel.getWindow(); StoragePool dataCenter = (StoragePool) storageModel.getDataCenter().getSelectedItem(); if (!dataCenter.getId().equals(StorageModel.UnassignedDataCenterId)) { - storageListModel.AttachStorageToDataCenter((Guid) storageListModel.storageId, dataCenter.getId()); + storageListModel.attachStorageToDataCenter((Guid) storageListModel.storageId, dataCenter.getId()); } - storageListModel.OnFinish(storageListModel.context, true, storageListModel.storageModel); + storageListModel.onFinish(storageListModel.context, true, storageListModel.storageModel); } }; @@ -1345,7 +1346,7 @@ StorageListModel storageListModel = (StorageListModel) result.getState(); storageListModel.cleanConnection(storageListModel.connection, storageListModel.hostId); - storageListModel.OnFinish(storageListModel.context, false, storageListModel.storageModel); + storageListModel.onFinish(storageListModel.context, false, storageListModel.storageModel); } }; @@ -1385,7 +1386,7 @@ if (storages != null && storages.size() > 0) { String storageName = storages.get(0).getStorageName(); - OnFinish(storageListModel.context, + onFinish(storageListModel.context, false, storageListModel.storageModel, ConstantsManager.getInstance().getMessages().createFailedDomainAlreadyExistStorageMsg(storageName)); @@ -1401,7 +1402,7 @@ public void executed(FrontendActionAsyncResult result) { StorageListModel storageListModel = (StorageListModel) result.getState(); - storageListModel.OnFinish(storageListModel.context, true, storageListModel.storageModel); + storageListModel.onFinish(storageListModel.context, true, storageListModel.storageModel); } }, this); @@ -1456,10 +1457,10 @@ StorageModel storageModel = (StorageModel) storageListModel.getWindow(); StoragePool dataCenter = (StoragePool) storageModel.getDataCenter().getSelectedItem(); if (!dataCenter.getId().equals(StorageModel.UnassignedDataCenterId)) { - storageListModel.AttachStorageToDataCenter((Guid) storageListModel.storageId, dataCenter.getId()); + storageListModel.attachStorageToDataCenter((Guid) storageListModel.storageId, dataCenter.getId()); } - storageListModel.OnFinish(storageListModel.context, true, storageListModel.storageModel); + storageListModel.onFinish(storageListModel.context, true, storageListModel.storageModel); } }; @@ -1469,7 +1470,7 @@ StorageListModel storageListModel = (StorageListModel) result.getState(); storageListModel.cleanConnection(storageListModel.connection, storageListModel.hostId); - storageListModel.OnFinish(storageListModel.context, false, storageListModel.storageModel); + storageListModel.onFinish(storageListModel.context, false, storageListModel.storageModel); } }; @@ -1516,12 +1517,12 @@ if (storages != null && storages.size() > 0) { String storageName = storages.get(0).getStorageName(); - OnFinish(storageListModel.context, + onFinish(storageListModel.context, false, storageListModel.storageModel, ConstantsManager.getInstance().getMessages().createFailedDomainAlreadyExistStorageMsg(storageName)); } else { - storageListModel.SaveNewNfsStorage(); + storageListModel.saveNewNfsStorage(); } } }), null, path); @@ -1538,7 +1539,7 @@ @Override public void executed(FrontendActionAsyncResult result) { StorageListModel storageListModel = (StorageListModel) result.getState(); - storageListModel.OnFinish(storageListModel.context, true, storageListModel.storageModel); + storageListModel.onFinish(storageListModel.context, true, storageListModel.storageModel); } }, this); @@ -1578,7 +1579,7 @@ @Override public void executed(FrontendActionAsyncResult result) { StorageListModel storageListModel = (StorageListModel) result.getState(); - storageListModel.OnFinish(storageListModel.context, true, storageListModel.storageModel); + storageListModel.onFinish(storageListModel.context, true, storageListModel.storageModel); } }, this); @@ -1603,7 +1604,7 @@ } - public void SaveNewNfsStorage() + public void saveNewNfsStorage() { StorageModel model = (StorageModel) getWindow(); NfsStorageModel nfsModel = (NfsStorageModel) model.getSelectedItem(); @@ -1666,10 +1667,10 @@ StoragePool dataCenter = (StoragePool) storageModel.getDataCenter().getSelectedItem(); if (!dataCenter.getId().equals(StorageModel.UnassignedDataCenterId)) { - storageListModel.AttachStorageToDataCenter((Guid) storageListModel.storageId, dataCenter.getId()); + storageListModel.attachStorageToDataCenter((Guid) storageListModel.storageId, dataCenter.getId()); } - storageListModel.OnFinish(storageListModel.context, true, storageListModel.storageModel); + storageListModel.onFinish(storageListModel.context, true, storageListModel.storageModel); } }; @@ -1679,7 +1680,7 @@ StorageListModel storageListModel = (StorageListModel) result.getState(); storageListModel.cleanConnection(storageListModel.connection, storageListModel.hostId); - storageListModel.OnFinish(storageListModel.context, false, storageListModel.storageModel); + storageListModel.onFinish(storageListModel.context, false, storageListModel.storageModel); } }; @@ -1691,7 +1692,7 @@ this); } - public void SaveNewSanStorage() + public void saveNewSanStorage() { StorageModel model = (StorageModel) getWindow(); SanStorageModel sanModel = (SanStorageModel) model.getSelectedItem(); @@ -1716,7 +1717,7 @@ StorageModel storageModel = (StorageModel) storageListModel.getWindow(); storageListModel.storageModel = storageModel.getSelectedItem(); if (!result.getReturnValue().getSucceeded()) { - storageListModel.OnFinish(storageListModel.context, false, storageListModel.storageModel); + storageListModel.onFinish(storageListModel.context, false, storageListModel.storageModel); return; } @@ -1724,10 +1725,10 @@ if (!dataCenter.getId().equals(StorageModel.UnassignedDataCenterId)) { VdcReturnValueBase returnValue = result.getReturnValue(); NGuid storageId = (NGuid) returnValue.getActionReturnValue(); - storageListModel.AttachStorageToDataCenter((Guid) storageId, dataCenter.getId()); + storageListModel.attachStorageToDataCenter((Guid) storageId, dataCenter.getId()); } - storageListModel.OnFinish(storageListModel.context, true, storageListModel.storageModel); + storageListModel.onFinish(storageListModel.context, true, storageListModel.storageModel); } }, this); } @@ -1766,12 +1767,12 @@ if (storages != null && storages.size() > 0) { String storageName = storages.get(0).getStorageName(); - OnFinish(storageListModel.context, + onFinish(storageListModel.context, false, storageListModel.storageModel, ConstantsManager.getInstance().getMessages().createFailedDomainAlreadyExistStorageMsg(storageName)); } else { - storageListModel.SaveNewLocalStorage(); + storageListModel.saveNewLocalStorage(); } } @@ -1784,14 +1785,14 @@ public void executed(FrontendActionAsyncResult result) { StorageListModel storageListModel = (StorageListModel) result.getState(); - storageListModel.OnFinish(storageListModel.context, true, storageListModel.storageModel); + storageListModel.onFinish(storageListModel.context, true, storageListModel.storageModel); } }, this); } } - public void SaveNewLocalStorage() + public void saveNewLocalStorage() { StorageModel model = (StorageModel) getWindow(); LocalStorageModel localModel = (LocalStorageModel) model.getSelectedItem(); @@ -1835,7 +1836,7 @@ StorageListModel storageListModel = (StorageListModel) result.getState(); storageListModel.removeConnection = false; - storageListModel.OnFinish(storageListModel.context, true, storageListModel.storageModel); + storageListModel.onFinish(storageListModel.context, true, storageListModel.storageModel); } }; @@ -1851,7 +1852,7 @@ storageListModel.removeConnection = false; } - storageListModel.OnFinish(storageListModel.context, false, storageListModel.storageModel); + storageListModel.onFinish(storageListModel.context, false, storageListModel.storageModel); } }; @@ -1863,12 +1864,12 @@ this); } - public void OnFinish(TaskContext context, boolean isSucceeded, IStorageModel model) + public void onFinish(TaskContext context, boolean isSucceeded, IStorageModel model) { - OnFinish(context, isSucceeded, model, null); + onFinish(context, isSucceeded, model, null); } - public void OnFinish(TaskContext context, boolean isSucceeded, IStorageModel model, String message) + public void onFinish(TaskContext context, boolean isSucceeded, IStorageModel model, String message) { context.InvokeUIThread(this, new ArrayList<Object>(Arrays.asList(new Object[] { "Finish", isSucceeded, model, //$NON-NLS-1$ @@ -1902,7 +1903,7 @@ if (isNew) { - SaveNewSanStorage(); + saveNewSanStorage(); } else { @@ -1926,19 +1927,19 @@ new ExtendSANStorageDomainParameters(storageDomain1.getId(), lunIds, force), null, this); } - storageListModel.OnFinish(storageListModel.context, true, storageListModel.storageModel); + storageListModel.onFinish(storageListModel.context, true, storageListModel.storageModel); } }, this); } } - private void AttachStorageToDataCenter(Guid storageId, Guid dataCenterId) + private void attachStorageToDataCenter(Guid storageId, Guid dataCenterId) { Frontend.RunAction(VdcActionType.AttachStorageDomainToPool, new StorageDomainPoolParametersBase(storageId, dataCenterId), null, this); } - private void ImportFileStorage(TaskContext context) + private void importFileStorage(TaskContext context) { this.context = context; @@ -1951,10 +1952,10 @@ domainType = (StorageDomainType) data.get(3); storageType = (StorageType) data.get(4); - ImportFileStorageInit(); + importFileStorageInit(); } - public void ImportFileStorageInit() + public void importFileStorageInit() { if (fileConnection != null) { @@ -1971,7 +1972,7 @@ if (success) { storageListModel.fileConnection = null; } - storageListModel.ImportFileStoragePostInit(); + storageListModel.importFileStoragePostInit(); } }, @@ -1979,11 +1980,11 @@ } else { - ImportFileStoragePostInit(); + importFileStoragePostInit(); } } - public void ImportFileStoragePostInit() + public void importFileStoragePostInit() { // Check storage domain existence AsyncDataProvider.GetStorageDomainsByConnection(new AsyncQuery(this, new INewAsyncCallback() { @@ -1996,7 +1997,7 @@ if (storages != null && storages.size() > 0) { String storageName = storages.get(0).getStorageName(); - OnFinish(storageListModel.context, + onFinish(storageListModel.context, false, storageListModel.storageModel, ConstantsManager.getInstance().getMessages().importFailedDomainAlreadyExistStorageMsg(storageName)); @@ -2019,13 +2020,13 @@ tempVar.setMountOptions((String) posixModel.getMountOptions().getEntity()); } storageListModel.fileConnection = tempVar; - storageListModel.ImportFileStorageConnect(); + storageListModel.importFileStorageConnect(); } } }), null, path); } - public void ImportFileStorageConnect() + public void importFileStorageConnect() { Frontend.RunAction(VdcActionType.AddStorageServerConnection, new StorageServerConnectionParametersBase(fileConnection, hostId), new IFrontendActionAsyncCallback() { @@ -2048,7 +2049,7 @@ { if (domains.isEmpty()) { - PostImportFileStorage(storageListModel1.context, + postImportFileStorage(storageListModel1.context, false, storageListModel1.storageModel, ConstantsManager.getInstance() @@ -2057,12 +2058,12 @@ } else { - storageListModel1.ImportFileStorageAddDomain(domains); + storageListModel1.importFileStorageAddDomain(domains); } } else { - PostImportFileStorage(storageListModel1.context, + postImportFileStorage(storageListModel1.context, false, storageListModel1.storageModel, ConstantsManager.getInstance() @@ -2079,7 +2080,7 @@ } else { - PostImportFileStorage(storageListModel.context, + postImportFileStorage(storageListModel.context, false, storageListModel.storageModel, ConstantsManager.getInstance() @@ -2092,7 +2093,7 @@ this); } - public void ImportFileStorageAddDomain(ArrayList<StorageDomain> domains) + public void importFileStorageAddDomain(ArrayList<StorageDomain> domains) { StorageDomain sdToAdd = Linq.firstOrDefault(domains); StorageDomainStatic sdsToAdd = sdToAdd == null ? null : sdToAdd.getStorageStaticData(); @@ -2114,18 +2115,18 @@ StorageModel model = (StorageModel) storageListModel.getWindow(); StoragePool dataCenter = (StoragePool) model.getDataCenter().getSelectedItem(); if (!dataCenter.getId().equals(StorageModel.UnassignedDataCenterId)) { - storageListModel.AttachStorageToDataCenter(sdToAdd1.getId(), dataCenter.getId()); + storageListModel.attachStorageToDataCenter(sdToAdd1.getId(), dataCenter.getId()); } - PostImportFileStorage(storageListModel.context, true, storageListModel.storageModel, null); + postImportFileStorage(storageListModel.context, true, storageListModel.storageModel, null); } else { - PostImportFileStorage(storageListModel.context, false, storageListModel.storageModel, ""); //$NON-NLS-1$ + postImportFileStorage(storageListModel.context, false, storageListModel.storageModel, ""); //$NON-NLS-1$ } } }, new Object[] {this, sdToAdd}); } - public void PostImportFileStorage(TaskContext context, boolean isSucceeded, IStorageModel model, String message) + public void postImportFileStorage(TaskContext context, boolean isSucceeded, IStorageModel model, String message) { Frontend.RunAction(VdcActionType.DisconnectStorageServerConnection, new StorageServerConnectionParametersBase(fileConnection, hostId), @@ -2139,7 +2140,7 @@ fileConnection = null; } Object[] array = (Object[]) result.getState(); - OnFinish((TaskContext) array[0], + onFinish((TaskContext) array[0], (Boolean) array[1], (IStorageModel) array[2], (String) array[3]); @@ -2178,7 +2179,7 @@ } else if (StringHelper.stringsEqual(key, "ImportFile")) //$NON-NLS-1$ { - ImportFileStorage(context); + importFileStorage(context); } else if (StringHelper.stringsEqual(key, "Finish")) //$NON-NLS-1$ { @@ -2186,7 +2187,7 @@ if ((Boolean) data.get(1)) { - Cancel(); + cancel(); } else { @@ -2210,11 +2211,11 @@ if (systemTreeSelectedItem != value) { systemTreeSelectedItem = value; - OnSystemTreeSelectedItemChanged(); + onSystemTreeSelectedItemChanged(); } } - private void OnSystemTreeSelectedItemChanged() + private void onSystemTreeSelectedItemChanged() { updateActionAvailability(); } -- To view, visit http://gerrit.ovirt.org/14449 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idb17363d996bfbddd9ffefcfa06de055da00a42b Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tal Nisan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
