Tal Nisan has uploaded a new change for review. Change subject: findbugs: Fix fingbugs errors in DataCenterListModel & DataCenterModel classes ......................................................................
findbugs: Fix fingbugs errors in DataCenterListModel & DataCenterModel classes Change-Id: I9748ab5cd3151971f272c7e45c068fdf219f93d1 Signed-off-by: Tal Nisan <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/ConfigureLocalStorageModel.java 3 files changed, 53 insertions(+), 58 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/84/14484/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterListModel.java index 462a23b..832d048 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterListModel.java @@ -193,13 +193,13 @@ setActivateCommand(new UICommand("Activate", this)); //$NON-NLS-1$ setGuideCommand(new UICommand("Guide", this)); //$NON-NLS-1$ - UpdateActionAvailability(); + updateActionAvailability(); getSearchNextPageCommand().setIsAvailable(true); getSearchPreviousPageCommand().setIsAvailable(true); } - public void Guide() + public void guide() { DataCenterGuideModel model = new DataCenterGuideModel(); setWindow(model); @@ -268,7 +268,7 @@ setItems(getAsyncResult().getData()); } - public void New() + public void newDataCenter() { if (getWindow() != null) { @@ -292,7 +292,7 @@ model.getCommands().add(tempVar2); } - public void Edit() + public void edit() { StoragePool dataCenter = (StoragePool) getSelectedItem(); @@ -378,7 +378,7 @@ model.getCommands().add(tempVar2); } - public void ForceRemove() + public void forceRemove() { ConfirmationModel model = new ConfirmationModel(); setWindow(model); @@ -405,7 +405,7 @@ model.getCommands().add(tempVar2); } - public void RecoveryStorage() + public void recoveryStorage() { final ConfirmationModel windowModel = new ConfirmationModel(); setWindow(windowModel); @@ -465,7 +465,7 @@ })); } - public void OnRecover() + public void onRecover() { final ConfirmationModel windowModel = (ConfirmationModel) getWindow(); @@ -516,30 +516,25 @@ ConfirmationModel localModel = (ConfirmationModel) result.getState(); localModel.stopProgress(); - Cancel(); + cancel(); } }, windowModel); } else { - Cancel(); + cancel(); } } }), ((StoragePool) getSelectedItem()).getId()); } - public void Activate() + public void activate() { - // Frontend.RunMultipleActions(VdcActionType.ActivateStoragePool, - // SelectedItems.Cast<storage_pool>() - // .Select(a => (VdcActionParametersBase)new StoragePoolParametersBase(a.id)) - // .ToList() - // ); } - public void OnRemove() + public void onRemove() { ConfirmationModel model = (ConfirmationModel) getWindow(); @@ -563,13 +558,13 @@ ConfirmationModel localModel = (ConfirmationModel) result.getState(); localModel.stopProgress(); - Cancel(); + cancel(); } }, model); } - public void OnForceRemove() + public void onForceRemove() { ConfirmationModel model = (ConfirmationModel) getWindow(); if (!model.validate()) @@ -580,29 +575,29 @@ tempVar.setForceDelete(true); VdcActionParametersBase parametersBase = tempVar; Frontend.RunAction(VdcActionType.RemoveStoragePool, parametersBase); - Cancel(); + cancel(); } - public void Cancel() + public void cancel() { - CancelConfirmation(); + cancelConfirmation(); setGuideContext(null); setWindow(null); - UpdateActionAvailability(); + updateActionAvailability(); } - public void CancelConfirmation() + public void cancelConfirmation() { setConfirmWindow(null); } - public void OnSave() + public void onSave() { DataCenterModel model = (DataCenterModel) getWindow(); - if (!model.Validate()) + if (!model.validate()) { return; } @@ -641,7 +636,7 @@ } else { - OnSaveInternal(); + onSaveInternal(); } } @@ -658,7 +653,7 @@ if (((ArrayList<Quota>) ((VdcQueryReturnValue) returnValue).getReturnValue()).size() == 0) { promptNoQuotaInDCMessage(); } else { - OnSaveInternal(); + onSaveInternal(); } } })); @@ -685,7 +680,7 @@ getConfirmWindow().getCommands().add(tempVar2); } - public void OnSaveInternal() + public void onSaveInternal() { DataCenterModel model = (DataCenterModel) getWindow(); @@ -698,7 +693,7 @@ model.getIsNew() ? new StoragePool() : (StoragePool) Cloner.clone(getSelectedItem()); // cancel confirm window if there is - CancelConfirmation(); + cancelConfirmation(); // Save changes. dataCenter.setname((String) model.getName().getEntity()); @@ -719,7 +714,7 @@ @Override public void executed(FrontendActionAsyncResult result) { DataCenterListModel localModel = (DataCenterListModel) result.getState(); - localModel.PostOnSaveInternal(result.getReturnValue()); + localModel.postOnSaveInternal(result.getReturnValue()); } }, this); @@ -733,25 +728,25 @@ @Override public void executed(FrontendMultipleActionAsyncResult result) { DataCenterListModel localModel = (DataCenterListModel) result.getState(); - localModel.PostOnSaveInternal(result.getReturnValue().get(0)); + localModel.postOnSaveInternal(result.getReturnValue().get(0)); } }, this); } } - public void PostOnSaveInternal(VdcReturnValueBase returnValue) + public void postOnSaveInternal(VdcReturnValueBase returnValue) { DataCenterModel model = (DataCenterModel) getWindow(); model.stopProgress(); - Cancel(); + cancel(); if (model.getIsNew() && returnValue != null && returnValue.getSucceeded()) { setGuideContext(returnValue.getActionReturnValue()); - UpdateActionAvailability(); + updateActionAvailability(); getGuideCommand().Execute(); } } @@ -760,14 +755,14 @@ protected void onSelectedItemChanged() { super.onSelectedItemChanged(); - UpdateActionAvailability(); + updateActionAvailability(); } @Override protected void selectedItemsChanged() { super.selectedItemsChanged(); - UpdateActionAvailability(); + updateActionAvailability(); } @Override @@ -793,7 +788,7 @@ if (e.PropertyName.equals("status")) //$NON-NLS-1$ { - UpdateActionAvailability(); + updateActionAvailability(); } } @@ -808,7 +803,7 @@ } } - private void UpdateActionAvailability() + private void updateActionAvailability() { ArrayList<StoragePool> items = getSelectedItems() != null ? new ArrayList<StoragePool>(Linq.<StoragePool> cast(getSelectedItems())) @@ -867,11 +862,11 @@ if (command == getNewCommand()) { - New(); + newDataCenter(); } else if (command == getEditCommand()) { - Edit(); + edit(); } else if (command == getRemoveCommand()) { @@ -879,47 +874,47 @@ } else if (command == getForceRemoveCommand()) { - ForceRemove(); + forceRemove(); } else if (command == getActivateCommand()) { - Activate(); + activate(); } else if (command == getGuideCommand()) { - Guide(); + guide(); } else if (command == getRecoveryStorageCommand()) { - RecoveryStorage(); + recoveryStorage(); } 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(), "OnRemove")) //$NON-NLS-1$ { - OnRemove(); + onRemove(); } else if (StringHelper.stringsEqual(command.getName(), "OnForceRemove")) //$NON-NLS-1$ { - OnForceRemove(); + onForceRemove(); } else if (StringHelper.stringsEqual(command.getName(), "OnSaveInternal")) //$NON-NLS-1$ { - OnSaveInternal(); + onSaveInternal(); } else if (StringHelper.stringsEqual(command.getName(), "CancelConfirmation")) //$NON-NLS-1$ { - CancelConfirmation(); + cancelConfirmation(); } else if (StringHelper.stringsEqual(command.getName(), "OnRecover")) //$NON-NLS-1$ { - OnRecover(); + onRecover(); } } @@ -937,13 +932,13 @@ if (systemTreeSelectedItem != value) { systemTreeSelectedItem = value; - OnSystemTreeSelectedItemChanged(); + onSystemTreeSelectedItemChanged(); } } - private void OnSystemTreeSelectedItemChanged() + private void onSystemTreeSelectedItemChanged() { - UpdateActionAvailability(); + updateActionAvailability(); } @Override diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterModel.java index a7c0f66..4d17266 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterModel.java @@ -249,7 +249,7 @@ dataCenterModel.getVersion().setSelectedItem(Linq.selectHighestVersion(list)); if (getEntity() != null) { - InitVersion(); + initVersion(); } } else @@ -264,7 +264,7 @@ private boolean isVersionInit = false; - private void InitVersion() + private void initVersion() { if (!isVersionInit) { @@ -281,7 +281,7 @@ } } - public boolean Validate() + public boolean validate() { getName().validateEntity(new IValidation[] { new NotEmptyValidation(), diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/ConfigureLocalStorageModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/ConfigureLocalStorageModel.java index aff09b1..ac90971 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/ConfigureLocalStorageModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/ConfigureLocalStorageModel.java @@ -203,7 +203,7 @@ boolean isStorageValid = getStorage().validate() && getFormattedStorageName().getIsValid(); boolean isDataCenterValid = true; if (getCandidateDataCenter() == null) { - isDataCenterValid = getDataCenter().Validate(); + isDataCenterValid = getDataCenter().validate(); } boolean isClusterValid = true; if (getCandidateCluster() == null) { -- To view, visit http://gerrit.ovirt.org/14484 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9748ab5cd3151971f272c7e45c068fdf219f93d1 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
