Lior Vernia has uploaded a new change for review. Change subject: webadmin: Changed method names to camelCase ......................................................................
webadmin: Changed method names to camelCase For them to conform to the code that was merged into master while we were working on our own branch. Change-Id: Ie82569324723cd3660ef4abe44e3a37cb8756b3f Signed-off-by: Lior Vernia <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderGeneralModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/RemoveProvidersModel.java 4 files changed, 36 insertions(+), 36 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/98/14698/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderGeneralModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderGeneralModel.java index 1b6978b..806dfd5 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderGeneralModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderGeneralModel.java @@ -23,22 +23,22 @@ } @Override - protected void OnEntityChanged() { - super.OnEntityChanged(); + protected void onEntityChanged() { + super.onEntityChanged(); if (getEntity() != null) { - UpdateProperties(); + updateProperties(); } } @Override - protected void EntityPropertyChanged(Object sender, PropertyChangedEventArgs e) { - super.EntityPropertyChanged(sender, e); + protected void entityPropertyChanged(Object sender, PropertyChangedEventArgs e) { + super.entityPropertyChanged(sender, e); - UpdateProperties(); + updateProperties(); } - private void UpdateProperties() { + private void updateProperties() { Provider provider = (Provider) getEntity(); setName(provider.getName()); @@ -53,7 +53,7 @@ public void setName(String value) { if (!StringHelper.stringsEqual(name, value)) { name = value; - OnPropertyChanged(new PropertyChangedEventArgs(PROPERTY_NAME)); + onPropertyChanged(new PropertyChangedEventArgs(PROPERTY_NAME)); } } @@ -64,7 +64,7 @@ public void setDescription(String value) { if (!StringHelper.stringsEqual(description, value)) { description = value; - OnPropertyChanged(new PropertyChangedEventArgs(PROPERTY_DESCRIPTION)); + onPropertyChanged(new PropertyChangedEventArgs(PROPERTY_DESCRIPTION)); } } @@ -75,7 +75,7 @@ public void setUrl(String value) { if (!StringHelper.stringsEqual(url, value)) { url = value; - OnPropertyChanged(new PropertyChangedEventArgs(PROPERTY_URL)); + onPropertyChanged(new PropertyChangedEventArgs(PROPERTY_URL)); } } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderListModel.java index 4237410..924a84c 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderListModel.java @@ -44,7 +44,7 @@ setEditCommand(new UICommand(CMD_EDIT, this)); setRemoveCommand(new UICommand(CMD_REMOVE, this)); - UpdateActionAvailability(); + updateActionAvailability(); getSearchNextPageCommand().setIsAvailable(true); getSearchPreviousPageCommand().setIsAvailable(true); @@ -75,8 +75,8 @@ } @Override - protected void InitDetailModels() { - super.InitDetailModels(); + protected void initDetailModels() { + super.initDetailModels(); ObservableCollection<EntityModel> list = new ObservableCollection<EntityModel>(); @@ -99,28 +99,28 @@ public void setSystemTreeSelectedItem(SystemTreeItemModel value) { if (systemTreeSelectedItem != value) { systemTreeSelectedItem = value; - OnSystemTreeSelectedItemChanged(); + onSystemTreeSelectedItemChanged(); } } - private void OnSystemTreeSelectedItemChanged() { - UpdateActionAvailability(); + private void onSystemTreeSelectedItemChanged() { + updateActionAvailability(); } @Override - protected void OnSelectedItemChanged() { - super.OnSelectedItemChanged(); - UpdateActionAvailability(); + protected void onSelectedItemChanged() { + super.onSelectedItemChanged(); + updateActionAvailability(); } @Override - protected void SelectedItemsChanged() { - super.SelectedItemsChanged(); - UpdateActionAvailability(); + protected void selectedItemsChanged() { + super.selectedItemsChanged(); + updateActionAvailability(); } @SuppressWarnings("rawtypes") - private void UpdateActionAvailability() { + private void updateActionAvailability() { List tempVar = getSelectedItems(); List selectedItems = (tempVar != null) ? tempVar : new ArrayList(); @@ -134,13 +134,13 @@ } @Override - protected void SyncSearch() { + protected void syncSearch() { AsyncQuery asyncQuery = new AsyncQuery(); asyncQuery.asyncCallback = new INewAsyncCallback() { @SuppressWarnings("unchecked") @Override - public void OnSuccess(Object model, Object ReturnValue) { + public void onSuccess(Object model, Object ReturnValue) { setItems((List<Provider>) ((VdcQueryReturnValue) ReturnValue).getReturnValue()); } }; @@ -175,8 +175,8 @@ } @Override - public void ExecuteCommand(UICommand command) { - super.ExecuteCommand(command); + public void executeCommand(UICommand command) { + super.executeCommand(command); if (command == getAddCommand()) { add(); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderModel.java index 169f14d..c028f84 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderModel.java @@ -74,15 +74,15 @@ getCommands().add(tempVar2); } - private boolean Validate() { - getName().ValidateEntity(new IValidation[] { new NotEmptyValidation() }); + private boolean validate() { + getName().validateEntity(new IValidation[] { new NotEmptyValidation() }); Uri url = new Uri((String) getUrl().getEntity()); if (url.getScheme().isEmpty()) { url.setScheme(Uri.SCHEME_HTTP); getUrl().setEntity(url.toString()); } - getUrl().ValidateEntity(new IValidation[] { new NotEmptyValidation(), new UrlValidation() }); + getUrl().validateEntity(new IValidation[] { new NotEmptyValidation(), new UrlValidation() }); return getName().getIsValid() && getUrl().getIsValid(); } @@ -92,7 +92,7 @@ } private void onSave() { - if (!Validate()) { + if (!validate()) { return; } @@ -103,7 +103,7 @@ new IFrontendActionAsyncCallback() { @Override - public void Executed(FrontendActionAsyncResult result) { + public void executed(FrontendActionAsyncResult result) { sourceListModel.getSearchCommand().Execute(); } }); @@ -112,8 +112,8 @@ } @Override - public void ExecuteCommand(UICommand command) { - super.ExecuteCommand(command); + public void executeCommand(UICommand command) { + super.executeCommand(command); if (StringHelper.stringsEqual(command.getName(), CMD_SAVE)) { onSave(); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/RemoveProvidersModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/RemoveProvidersModel.java index 43a0b83..ee0e178 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/RemoveProvidersModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/RemoveProvidersModel.java @@ -64,8 +64,8 @@ } @Override - public void ExecuteCommand(UICommand command) { - super.ExecuteCommand(command); + public void executeCommand(UICommand command) { + super.executeCommand(command); if (StringHelper.stringsEqual(command.getName(), CMD_REMOVE)) { onRemove(); -- To view, visit http://gerrit.ovirt.org/14698 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie82569324723cd3660ef4abe44e3a37cb8756b3f Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Lior Vernia <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
