Tal Nisan has uploaded a new change for review. Change subject: findbugs: Fix fingbugs errors in DataCenterGuideModel class ......................................................................
findbugs: Fix fingbugs errors in DataCenterGuideModel class Change-Id: I12e685b09bf0f148324705a01b0ca9bc92567cb9 Signed-off-by: Tal Nisan <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java 1 file changed, 120 insertions(+), 124 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/83/14483/1 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 67dfa6e..97d267f 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 @@ -116,11 +116,9 @@ private TaskContext context; private IStorageModel storageModel; private NGuid storageId; - private StorageServerConnections nfsConnection; private StorageServerConnections connection; private Guid hostId = new Guid(); private String path; - private StorageDomainType domainType = StorageDomainType.values()[0]; private boolean removeConnection; private ArrayList<VDSGroup> clusters; private ArrayList<StorageDomain> allStorageDomains; @@ -148,10 +146,10 @@ protected void onEntityChanged() { super.onEntityChanged(); - UpdateOptions(); + updateOptions(); } - private void UpdateOptionsNonLocalFSData() { + private void updateOptionsNonLocalFSData() { AsyncDataProvider.GetClusterList(new AsyncQuery(this, new INewAsyncCallback() { @Override @@ -159,7 +157,7 @@ DataCenterGuideModel dataCenterGuideModel = (DataCenterGuideModel) target; ArrayList<VDSGroup> clusters = (ArrayList<VDSGroup>) returnValue; dataCenterGuideModel.clusters = clusters; - dataCenterGuideModel.UpdateOptionsNonLocalFS(); + dataCenterGuideModel.updateOptionsNonLocalFS(); } }), getEntity().getId()); @@ -171,7 +169,7 @@ ArrayList<StorageDomain> storageDomains = (ArrayList<StorageDomain>) returnValue; dataCenterGuideModel.allStorageDomains = storageDomains; - dataCenterGuideModel.UpdateOptionsNonLocalFS(); + dataCenterGuideModel.updateOptionsNonLocalFS(); } })); @@ -183,7 +181,7 @@ ArrayList<StorageDomain> storageDomains = (ArrayList<StorageDomain>) returnValue; dataCenterGuideModel.attachedStorageDomains = storageDomains; - dataCenterGuideModel.UpdateOptionsNonLocalFS(); + dataCenterGuideModel.updateOptionsNonLocalFS(); } }), getEntity().getId()); @@ -195,7 +193,7 @@ ArrayList<StorageDomain> storageDomains = (ArrayList<StorageDomain>) returnValue; dataCenterGuideModel.isoStorageDomains = storageDomains; - dataCenterGuideModel.UpdateOptionsNonLocalFS(); + dataCenterGuideModel.updateOptionsNonLocalFS(); } })); @@ -206,12 +204,12 @@ DataCenterGuideModel dataCenterGuideModel = (DataCenterGuideModel) target; ArrayList<VDS> hosts = (ArrayList<VDS>) returnValue; dataCenterGuideModel.allHosts = hosts; - dataCenterGuideModel.UpdateOptionsNonLocalFS(); + dataCenterGuideModel.updateOptionsNonLocalFS(); } })); } - private void UpdateOptionsLocalFSData() { + private void updateOptionsLocalFSData() { AsyncDataProvider.GetClusterList(new AsyncQuery(this, new INewAsyncCallback() { @Override @@ -219,7 +217,7 @@ DataCenterGuideModel dataCenterGuideModel = (DataCenterGuideModel) target; ArrayList<VDSGroup> clusters = (ArrayList<VDSGroup>) returnValue; dataCenterGuideModel.clusters = clusters; - dataCenterGuideModel.UpdateOptionsLocalFS(); + dataCenterGuideModel.updateOptionsLocalFS(); } }), getEntity().getId()); @@ -246,14 +244,14 @@ } else { noLocalStorageHost = true; } - dataCenterGuideModel.UpdateOptionsLocalFS(); + dataCenterGuideModel.updateOptionsLocalFS(); } }), dataCenterGuideModel.getEntity().getname()); } })); } - private void UpdateOptionsNonLocalFS() { + private void updateOptionsNonLocalFS() { if (clusters == null || allStorageDomains == null || attachedStorageDomains == null || isoStorageDomains == null || allHosts == null) { return; @@ -456,7 +454,7 @@ return false; } - private void UpdateOptionsLocalFS() { + private void updateOptionsLocalFS() { if (clusters == null || allHosts == null || (localStorageHost == null && !noLocalStorageHost)) { return; } @@ -531,7 +529,7 @@ stopProgress(); } - private void UpdateOptions() + private void updateOptions() { getCompulsoryActions().clear(); getOptionalActions().clear(); @@ -542,25 +540,23 @@ if (getEntity().getstorage_pool_type() != StorageType.LOCALFS) { - UpdateOptionsNonLocalFSData(); + updateOptionsNonLocalFSData(); } else { - UpdateOptionsLocalFSData(); + updateOptionsLocalFSData(); } } } - private void ResetData() { + private void resetData() { storageDomain = null; storageModel = null; storageId = null; - nfsConnection = null; connection = null; removeConnection = false; path = null; hostId = new Guid(); - domainType = StorageDomainType.values()[0]; clusters = null; allStorageDomains = null; attachedStorageDomains = null; @@ -570,7 +566,7 @@ noLocalStorageHost = false; } - private void AddLocalStorage() + private void addLocalStorage() { StorageModel model = new StorageModel(new NewEditStorageModelBehavior()); setWindow(model); @@ -612,17 +608,17 @@ getEntity().getname()); } - public void AddIsoStorage() + public void addIsoStorage() { - AddStorageInternal(ConstantsManager.getInstance().getConstants().newISOLibraryTitle(), StorageDomainType.ISO); + addStorageInternal(ConstantsManager.getInstance().getConstants().newISOLibraryTitle(), StorageDomainType.ISO); } - public void AddDataStorage() + public void addDataStorage() { - AddStorageInternal(ConstantsManager.getInstance().getConstants().newStorageTitle(), StorageDomainType.Data); + addStorageInternal(ConstantsManager.getInstance().getConstants().newStorageTitle(), StorageDomainType.Data); } - private void AddStorageInternal(String title, StorageDomainType type) + private void addStorageInternal(String title, StorageDomainType type) { StorageModel model = new StorageModel(new NewEditStorageModelBehavior()); setWindow(model); @@ -673,7 +669,7 @@ model.getCommands().add(tempVar7); } - public void OnAddStorage() + public void onAddStorage() { StorageModel model = (StorageModel) getWindow(); String storageName = (String) model.getName().getEntity(); @@ -710,7 +706,7 @@ .nameCanContainOnlyMsg(nameMaxLength)); storageModel1.getName().validateEntity(new IValidation[] { new NotEmptyValidation(), tempVar2 }); - dataCenterGuideModel1.PostOnAddStorage(); + dataCenterGuideModel1.postOnAddStorage(); } })); @@ -720,7 +716,7 @@ storageName); } - public void PostOnAddStorage() + public void postOnAddStorage() { StorageModel model = (StorageModel) getWindow(); @@ -732,19 +728,19 @@ // Save changes. if (model.getSelectedItem() instanceof NfsStorageModel) { - SaveNfsStorage(); + saveNfsStorage(); } else if (model.getSelectedItem() instanceof LocalStorageModel) { - SaveLocalStorage(); + saveLocalStorage(); } else { - SaveSanStorage(); + saveSanStorage(); } } - private void SaveLocalStorage() + private void saveLocalStorage() { if (getWindow().getProgress() != null) { @@ -756,7 +752,7 @@ Task.Create(this, new ArrayList<Object>(Arrays.asList(new Object[] { "SaveLocal" }))).Run(); //$NON-NLS-1$ } - private void SaveLocalStorage(TaskContext context) + private void saveLocalStorage(TaskContext context) { this.context = context; StorageModel model = (StorageModel) getWindow(); @@ -782,7 +778,7 @@ if (storages != null && storages.size() > 0) { String storageName = storages.get(0).getStorageName(); - OnFinish(dataCenterGuideModel.context, + onFinish(dataCenterGuideModel.context, false, dataCenterGuideModel.storageModel, ConstantsManager.getInstance() @@ -791,7 +787,7 @@ } else { - dataCenterGuideModel.SaveNewLocalStorage(); + dataCenterGuideModel.saveNewLocalStorage(); } } @@ -800,7 +796,7 @@ path); } - public void SaveNewLocalStorage() + public void saveNewLocalStorage() { StorageModel model = (StorageModel) getWindow(); LocalStorageModel localModel = (LocalStorageModel) model.getSelectedItem(); @@ -843,7 +839,7 @@ DataCenterGuideModel dataCenterGuideModel = (DataCenterGuideModel) result.getState(); dataCenterGuideModel.removeConnection = false; - dataCenterGuideModel.OnFinish(dataCenterGuideModel.context, true, dataCenterGuideModel.storageModel); + dataCenterGuideModel.onFinish(dataCenterGuideModel.context, true, dataCenterGuideModel.storageModel); } }; @@ -855,11 +851,11 @@ if (dataCenterGuideModel.removeConnection) { - dataCenterGuideModel.CleanConnection(dataCenterGuideModel.connection, dataCenterGuideModel.hostId); + dataCenterGuideModel.cleanConnection(dataCenterGuideModel.connection, dataCenterGuideModel.hostId); dataCenterGuideModel.removeConnection = false; } - dataCenterGuideModel.OnFinish(dataCenterGuideModel.context, false, dataCenterGuideModel.storageModel); + dataCenterGuideModel.onFinish(dataCenterGuideModel.context, false, dataCenterGuideModel.storageModel); } }; @@ -871,7 +867,7 @@ this); } - private void CleanConnection(StorageServerConnections connection, Guid hostId) + private void cleanConnection(StorageServerConnections connection, Guid hostId) { Frontend.RunAction(VdcActionType.DisconnectStorageServerConnection, new StorageServerConnectionParametersBase(connection, hostId), @@ -879,19 +875,19 @@ 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$ message }))); } - private void SaveNfsStorage() + private void saveNfsStorage() { if (getWindow().getProgress() != null) { @@ -903,7 +899,7 @@ Task.Create(this, new ArrayList<Object>(Arrays.asList(new Object[] { "SaveNfs" }))).Run(); //$NON-NLS-1$ } - private void SaveNfsStorage(TaskContext context) + private void saveNfsStorage(TaskContext context) { this.context = context; StorageModel model = (StorageModel) getWindow(); @@ -929,7 +925,7 @@ if (storages != null && storages.size() > 0) { String storageName = storages.get(0).getStorageName(); - OnFinish(dataCenterGuideModel.context, + onFinish(dataCenterGuideModel.context, false, dataCenterGuideModel.storageModel, ConstantsManager.getInstance() @@ -938,7 +934,7 @@ } else { - dataCenterGuideModel.SaveNewNfsStorage(); + dataCenterGuideModel.saveNewNfsStorage(); } } @@ -947,7 +943,7 @@ path); } - public void SaveNewNfsStorage() + public void saveNewNfsStorage() { StorageModel model = (StorageModel) getWindow(); NfsStorageModel nfsModel = (NfsStorageModel) model.getSelectedItem(); @@ -1004,11 +1000,11 @@ StoragePool dataCenter = (StoragePool) storageModel.getDataCenter().getSelectedItem(); if (!dataCenter.getId().equals(StorageModel.UnassignedDataCenterId)) { - dataCenterGuideModel.AttachStorageToDataCenter((Guid) dataCenterGuideModel.storageId, + dataCenterGuideModel.attachStorageToDataCenter((Guid) dataCenterGuideModel.storageId, dataCenter.getId()); } - dataCenterGuideModel.OnFinish(dataCenterGuideModel.context, true, dataCenterGuideModel.storageModel); + dataCenterGuideModel.onFinish(dataCenterGuideModel.context, true, dataCenterGuideModel.storageModel); } }; @@ -1017,8 +1013,8 @@ public void executed(FrontendActionAsyncResult result) { DataCenterGuideModel dataCenterGuideModel = (DataCenterGuideModel) result.getState(); - dataCenterGuideModel.CleanConnection(dataCenterGuideModel.connection, dataCenterGuideModel.hostId); - dataCenterGuideModel.OnFinish(dataCenterGuideModel.context, false, dataCenterGuideModel.storageModel); + dataCenterGuideModel.cleanConnection(dataCenterGuideModel.connection, dataCenterGuideModel.hostId); + dataCenterGuideModel.onFinish(dataCenterGuideModel.context, false, dataCenterGuideModel.storageModel); } }; @@ -1030,7 +1026,7 @@ this); } - private void SaveSanStorage() + private void saveSanStorage() { if (getWindow().getProgress() != null) { @@ -1042,7 +1038,7 @@ Task.Create(this, new ArrayList<Object>(Arrays.asList(new Object[] { "SaveSan" }))).Run(); //$NON-NLS-1$ } - private void SaveSanStorage(TaskContext context) + private void saveSanStorage(TaskContext context) { this.context = context; StorageModel model = (StorageModel) getWindow(); @@ -1065,7 +1061,7 @@ if (storages != null && storages.size() > 0) { String storageName = storages.get(0).getStorageName(); - OnFinish(dataCenterGuideModel.context, + onFinish(dataCenterGuideModel.context, false, dataCenterGuideModel.storageModel, ConstantsManager.getInstance() @@ -1074,7 +1070,7 @@ } else { - dataCenterGuideModel.SaveNewSanStorage(); + dataCenterGuideModel.saveNewSanStorage(); } dataCenterGuideModel.getWindow().stopProgress(); @@ -1084,7 +1080,7 @@ path); } - public void SaveNewSanStorage() + public void saveNewSanStorage() { StorageModel model = (StorageModel) getWindow(); SanStorageModel sanStorageModel = (SanStorageModel) model.getSelectedItem(); @@ -1092,14 +1088,14 @@ ArrayList<String> usedLunsMessages = sanStorageModel.getUsedLunsMessages(); if (usedLunsMessages.isEmpty()) { - OnSaveSanStorage(); + onSaveSanStorage(); } else { - ForceCreationWarning(usedLunsMessages); + forceCreationWarning(usedLunsMessages); } } - private void OnSaveSanStorage() + private void onSaveSanStorage() { ConfirmationModel confirmationModel = (ConfirmationModel) getConfirmWindow(); @@ -1108,7 +1104,7 @@ return; } - CancelConfirm(); + cancelConfirm(); getWindow().startProgress(null); StorageModel model = (StorageModel) getWindow(); @@ -1138,9 +1134,9 @@ { VdcReturnValueBase returnValue = result.getReturnValue(); NGuid storageId = (NGuid) returnValue.getActionReturnValue(); - dataCenterGuideModel.AttachStorageToDataCenter((Guid) storageId, dataCenter.getId()); + dataCenterGuideModel.attachStorageToDataCenter((Guid) storageId, dataCenter.getId()); } - dataCenterGuideModel.OnFinish(dataCenterGuideModel.context, + dataCenterGuideModel.onFinish(dataCenterGuideModel.context, true, dataCenterGuideModel.storageModel); @@ -1148,7 +1144,7 @@ }, this); } - private void ForceCreationWarning(ArrayList<String> usedLunsMessages) { + private void forceCreationWarning(ArrayList<String> usedLunsMessages) { StorageModel storageModel = (StorageModel) getWindow(); SanStorageModel sanStorageModel = (SanStorageModel) storageModel.getSelectedItem(); sanStorageModel.setForce(true); @@ -1173,7 +1169,7 @@ model.getCommands().add(command); } - private void AttachStorageInternal(List<StorageDomain> storages, String title) + private void attachStorageInternal(List<StorageDomain> storages, String title) { ListModel model = new ListModel(); model.setTitle(title); @@ -1199,7 +1195,7 @@ model.getCommands().add(tempVar3); } - private void AttachStorageToDataCenter(Guid storageId, Guid dataCenterId) + private void attachStorageToDataCenter(Guid storageId, Guid dataCenterId) { Frontend.RunAction(VdcActionType.AttachStorageDomainToPool, new StorageDomainPoolParametersBase(storageId, dataCenterId), @@ -1207,7 +1203,7 @@ this); } - public void OnAttachStorage() + public void onAttachStorage() { ListModel model = (ListModel) getWindow(); @@ -1224,15 +1220,15 @@ { for (StorageDomain sd : items) { - AttachStorageToDataCenter(sd.getId(), getEntity().getId()); + attachStorageToDataCenter(sd.getId(), getEntity().getId()); } } - Cancel(); - PostAction(); + cancel(); + postAction(); } - public void AttachIsoStorage() + public void attachIsoStorage() { AsyncDataProvider.GetStorageDomainList(new AsyncQuery(this, new INewAsyncCallback() { @@ -1272,7 +1268,7 @@ sdl.add(a); } } - dataCenterGuideModel.AttachStorageInternal(sdl, ConstantsManager.getInstance() + dataCenterGuideModel.attachStorageInternal(sdl, ConstantsManager.getInstance() .getConstants() .attachISOLibraryTitle()); } @@ -1282,7 +1278,7 @@ getEntity().getId()); } - public void AttachDataStorage() + public void attachDataStorage() { AsyncDataProvider.GetStorageDomainList(new AsyncQuery(this, new INewAsyncCallback() { @@ -1328,14 +1324,14 @@ unattachedStorage.add(item); } } - dataCenterGuideModel.AttachStorageInternal(unattachedStorage, ConstantsManager.getInstance() + dataCenterGuideModel.attachStorageInternal(unattachedStorage, ConstantsManager.getInstance() .getConstants() .attachStorageTitle()); } })); } - public void AddCluster() + public void addCluster() { ClusterModel model = new ClusterModel(); model.Init(false); @@ -1360,7 +1356,7 @@ model.getCommands().add(tempVar2); } - public void OnAddCluster() + public void onAddCluster() { ClusterModel model = (ClusterModel) getWindow(); VDSGroup cluster = new VDSGroup(); @@ -1400,13 +1396,13 @@ public void executed(FrontendActionAsyncResult result) { DataCenterGuideModel localModel = (DataCenterGuideModel) result.getState(); - localModel.PostOnAddCluster(result.getReturnValue()); + localModel.postOnAddCluster(result.getReturnValue()); } }, this); } - public void PostOnAddCluster(VdcReturnValueBase returnValue) + public void postOnAddCluster(VdcReturnValueBase returnValue) { ClusterModel model = (ClusterModel) getWindow(); @@ -1414,12 +1410,12 @@ if (returnValue != null && returnValue.getSucceeded()) { - Cancel(); - PostAction(); + cancel(); + postAction(); } } - public void SelectHost() + public void selectHost() { MoveHost model = new MoveHost(); model.setTitle(ConstantsManager.getInstance().getConstants().selectHostTitle()); @@ -1459,7 +1455,7 @@ }), getEntity().getId()); } - public void OnSelectHost() + public void onSelectHost() { MoveHost model = (MoveHost) getWindow(); @@ -1525,14 +1521,14 @@ } } dataCenterGuideModel.getWindow().stopProgress(); - dataCenterGuideModel.Cancel(); - dataCenterGuideModel.PostAction(); + dataCenterGuideModel.cancel(); + dataCenterGuideModel.postAction(); } }, this); } - public void AddHost() + public void addHost() { HostModel model = new HostModel(); setWindow(model); @@ -1557,7 +1553,7 @@ model.getCommands().add(tempVar2); } - public void OnConfirmPMHost() + public void onConfirmPMHost() { HostModel model = (HostModel) getWindow(); @@ -1585,13 +1581,13 @@ } else { - OnAddHost(); + onAddHost(); } } - public void OnAddHost() + public void onAddHost() { - CancelConfirm(); + cancelConfirm(); HostModel model = (HostModel) getWindow(); @@ -1640,13 +1636,13 @@ public void executed(FrontendActionAsyncResult result) { DataCenterGuideModel localModel = (DataCenterGuideModel) result.getState(); - localModel.PostOnAddHost(result.getReturnValue()); + localModel.postOnAddHost(result.getReturnValue()); } }, this); } - public void PostOnAddHost(VdcReturnValueBase returnValue) + public void postOnAddHost(VdcReturnValueBase returnValue) { HostModel model = (HostModel) getWindow(); @@ -1654,29 +1650,29 @@ if (returnValue != null && returnValue.getSucceeded()) { - Cancel(); - PostAction(); + cancel(); + postAction(); } } - private void PostAction() + private void postAction() { - ResetData(); - UpdateOptions(); + resetData(); + updateOptions(); } - public void Cancel() + public void cancel() { - ResetData(); + resetData(); setWindow(null); } - public void CancelConfirm() + public void cancelConfirm() { setConfirmWindow(null); } - public void CancelConfirmWithFocus() + public void cancelConfirmWithFocus() { setConfirmWindow(null); @@ -1691,83 +1687,83 @@ if (StringHelper.stringsEqual(command.getName(), "AddCluster")) //$NON-NLS-1$ { - AddCluster(); + addCluster(); } if (StringHelper.stringsEqual(command.getName(), "AddHost")) //$NON-NLS-1$ { - AddHost(); + addHost(); } if (StringHelper.stringsEqual(command.getName(), "SelectHost")) //$NON-NLS-1$ { - SelectHost(); + selectHost(); } if (StringHelper.stringsEqual(command.getName(), "AddDataStorage")) //$NON-NLS-1$ { - AddDataStorage(); + addDataStorage(); } if (StringHelper.stringsEqual(command.getName(), "AttachDataStorage")) //$NON-NLS-1$ { - AttachDataStorage(); + attachDataStorage(); } if (StringHelper.stringsEqual(command.getName(), "AddIsoStorage")) //$NON-NLS-1$ { - AddIsoStorage(); + addIsoStorage(); } if (StringHelper.stringsEqual(command.getName(), "AttachIsoStorage")) //$NON-NLS-1$ { - AttachIsoStorage(); + attachIsoStorage(); } if (StringHelper.stringsEqual(command.getName(), "OnAddCluster")) //$NON-NLS-1$ { - OnAddCluster(); + onAddCluster(); } if (StringHelper.stringsEqual(command.getName(), "OnSelectHost")) //$NON-NLS-1$ { - OnSelectHost(); + onSelectHost(); } if (StringHelper.stringsEqual(command.getName(), "OnAddHost")) //$NON-NLS-1$ { - OnAddHost(); + onAddHost(); } if (StringHelper.stringsEqual(command.getName(), "OnAddStorage")) //$NON-NLS-1$ { - OnAddStorage(); + onAddStorage(); } if (StringHelper.stringsEqual(command.getName(), "OnSaveSanStorage")) //$NON-NLS-1$ { - OnSaveSanStorage(); + onSaveSanStorage(); } if (StringHelper.stringsEqual(command.getName(), "OnAttachStorage")) //$NON-NLS-1$ { - OnAttachStorage(); + onAttachStorage(); } if (StringHelper.stringsEqual(command.getName(), "AddLocalStorage")) //$NON-NLS-1$ { - AddLocalStorage(); + addLocalStorage(); } if (StringHelper.stringsEqual(command.getName(), "OnConfirmPMHost")) //$NON-NLS-1$ { - OnConfirmPMHost(); + onConfirmPMHost(); } if (StringHelper.stringsEqual(command.getName(), "CancelConfirm")) //$NON-NLS-1$ { - CancelConfirm(); + cancelConfirm(); } if (StringHelper.stringsEqual(command.getName(), "CancelConfirmWithFocus")) //$NON-NLS-1$ { - CancelConfirmWithFocus(); + cancelConfirmWithFocus(); } if (StringHelper.stringsEqual(command.getName(), "Cancel")) //$NON-NLS-1$ { - Cancel(); + cancel(); } } @@ -1779,17 +1775,17 @@ if (StringHelper.stringsEqual(key, "SaveNfs")) //$NON-NLS-1$ { - SaveNfsStorage(context); + saveNfsStorage(context); } else if (StringHelper.stringsEqual(key, "SaveLocal")) //$NON-NLS-1$ { - SaveLocalStorage(context); + saveLocalStorage(context); } else if (StringHelper.stringsEqual(key, "SaveSan")) //$NON-NLS-1$ { - SaveSanStorage(context); + saveSanStorage(context); } else if (StringHelper.stringsEqual(key, "Finish")) //$NON-NLS-1$ @@ -1798,8 +1794,8 @@ if ((Boolean) data.get(1)) { - Cancel(); - PostAction(); + cancel(); + postAction(); } else { -- To view, visit http://gerrit.ovirt.org/14483 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I12e685b09bf0f148324705a01b0ca9bc92567cb9 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
