Tal Nisan has uploaded a new change for review. Change subject: findbugs: Fix fingbugs errors in SearchableListModel class ......................................................................
findbugs: Fix fingbugs errors in SearchableListModel class Change-Id: I3c4ef597b8bd10596d14e2479309c84fda1e7a69 Signed-off-by: Tal Nisan <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/CommonModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/ListWithDetailsModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SearchableListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/autocomplete/SearchSuggestModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterNetworkListModel.java 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/disks/DiskListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/events/EventListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkClusterListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/quota/QuotaListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/reports/ReportsListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/UserListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/volumes/VolumeListModel.java M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/presenter/AbstractModelActivationPresenter.java M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/uicommon/model/UserPortalDataBoundModelProvider.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/configure/ConfigurePopupPresenterWidget.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/MainSectionView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/configure/RoleView.java 25 files changed, 135 insertions(+), 137 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/65/14465/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/CommonModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/CommonModel.java index 3b09145..1f5c7d4 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/CommonModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/CommonModel.java @@ -698,15 +698,15 @@ // Stop search on all list models. for (SearchableListModel listModel : getItems()) { - listModel.EnsureAsyncSearchStopped(); + listModel.ensureAsyncSearchStopped(); } - getEventList().EnsureAsyncSearchStopped(); - getAlertList().EnsureAsyncSearchStopped(); - getTaskList().EnsureAsyncSearchStopped(); - getBookmarkList().EnsureAsyncSearchStopped(); - getRoleListModel().EnsureAsyncSearchStopped(); - getSystemPermissionListModel().EnsureAsyncSearchStopped(); + getEventList().ensureAsyncSearchStopped(); + getAlertList().ensureAsyncSearchStopped(); + getTaskList().ensureAsyncSearchStopped(); + getBookmarkList().ensureAsyncSearchStopped(); + getRoleListModel().ensureAsyncSearchStopped(); + getSystemPermissionListModel().ensureAsyncSearchStopped(); if (Frontend.getIsUserLoggedIn()) { @@ -865,7 +865,7 @@ listWithDetails.setActiveDetailModel(null); } - oldModel.EnsureAsyncSearchStopped(); + oldModel.ensureAsyncSearchStopped(); } } @@ -915,7 +915,7 @@ SearchableListModel model = null; for (SearchableListModel a : getItems()) { - if (a.IsSearchStringMatch(getEffectiveSearchString())) + if (a.isSearchStringMatch(getEffectiveSearchString())) { model = a; break; @@ -1004,54 +1004,54 @@ switch (model.getType()) { case DataCenter: { - if (dataCenterList.IsSearchStringMatch(source)) + if (dataCenterList.isSearchStringMatch(source)) { prefix.argvalue = "DataCenter: name = " + model.getTitle(); //$NON-NLS-1$ } - else if (clusterList.IsSearchStringMatch(source)) + else if (clusterList.isSearchStringMatch(source)) { prefix.argvalue = "Cluster: datacenter.name = " + model.getTitle(); //$NON-NLS-1$ } - else if (hostList.IsSearchStringMatch(source)) + else if (hostList.isSearchStringMatch(source)) { prefix.argvalue = "Host: datacenter = " + model.getTitle(); //$NON-NLS-1$ } - else if (storageList.IsSearchStringMatch(source)) + else if (storageList.isSearchStringMatch(source)) { prefix.argvalue = "Storage: datacenter = " + model.getTitle(); //$NON-NLS-1$ } - else if (vmList.IsSearchStringMatch(source)) + else if (vmList.isSearchStringMatch(source)) { prefix.argvalue = "Vms: datacenter = " + model.getTitle(); //$NON-NLS-1$ } - else if (templateList.IsSearchStringMatch(source)) + else if (templateList.isSearchStringMatch(source)) { prefix.argvalue = "Template: datacenter = " + model.getTitle(); //$NON-NLS-1$ } - else if (eventList.IsSearchStringMatch(source)) + else if (eventList.isSearchStringMatch(source)) { prefix.argvalue = "Events: event_datacenter = " + model.getTitle(); //$NON-NLS-1$ } - else if (diskList.IsSearchStringMatch(source)) + else if (diskList.isSearchStringMatch(source)) { prefix.argvalue = "Disk: datacenter.name = " + model.getTitle() + " and disk_type = image"; //$NON-NLS-1$ //$NON-NLS-2$ } - else if (quotaList.IsSearchStringMatch(source)) + else if (quotaList.isSearchStringMatch(source)) { prefix.argvalue = "Quota: storagepoolname = " + model.getTitle(); //$NON-NLS-1$ } - else if (networkList.IsSearchStringMatch(source)) + else if (networkList.isSearchStringMatch(source)) { prefix.argvalue = "Network: datacenter = " + model.getTitle(); //$NON-NLS-1$ } - else if (poolList.IsSearchStringMatch(source)) + else if (poolList.isSearchStringMatch(source)) { prefix.argvalue = "Pools: datacenter = " + model.getTitle(); //$NON-NLS-1$ } } break; case Clusters: { - if (clusterList.IsSearchStringMatch(source)) + if (clusterList.isSearchStringMatch(source)) { prefix.argvalue = "Cluster: datacenter.name = " + model.getParent().getTitle(); //$NON-NLS-1$ } @@ -1060,73 +1060,73 @@ case Cluster: case Cluster_Gluster: { - if (clusterList.IsSearchStringMatch(source)) + if (clusterList.isSearchStringMatch(source)) { prefix.argvalue = "Cluster: name = " + model.getTitle(); //$NON-NLS-1$ } - else if (hostList.IsSearchStringMatch(source)) + else if (hostList.isSearchStringMatch(source)) { prefix.argvalue = "Host: cluster = " + model.getTitle(); //$NON-NLS-1$ } - else if (volumeList.IsSearchStringMatch(source)) + else if (volumeList.isSearchStringMatch(source)) { prefix.argvalue = "Volume: cluster = " + model.getTitle(); //$NON-NLS-1$ } - else if (storageList.IsSearchStringMatch(source)) + else if (storageList.isSearchStringMatch(source)) { prefix.argvalue = "Storage: cluster.name = " + model.getTitle(); //$NON-NLS-1$ } - else if (vmList.IsSearchStringMatch(source)) + else if (vmList.isSearchStringMatch(source)) { prefix.argvalue = "Vms: cluster = " + model.getTitle(); //$NON-NLS-1$ } - else if (templateList.IsSearchStringMatch(source)) + else if (templateList.isSearchStringMatch(source)) { prefix.argvalue = "Template: cluster = " + model.getTitle(); //$NON-NLS-1$ } - else if (eventList.IsSearchStringMatch(source)) + else if (eventList.isSearchStringMatch(source)) { prefix.argvalue = "Events: cluster = " + model.getTitle(); //$NON-NLS-1$ } - else if (networkList.IsSearchStringMatch(source)) + else if (networkList.isSearchStringMatch(source)) { prefix.argvalue = "Network: Cluster_network.cluster_name = " + model.getTitle(); //$NON-NLS-1$ } - else if (poolList.IsSearchStringMatch(source)) + else if (poolList.isSearchStringMatch(source)) { prefix.argvalue = "Pools: cluster = " + model.getTitle(); //$NON-NLS-1$ } } break; case Hosts: { - if (hostList.IsSearchStringMatch(source)) + if (hostList.isSearchStringMatch(source)) { prefix.argvalue = "Host: cluster = " + model.getParent().getTitle(); //$NON-NLS-1$ } } break; case Host: { - if (hostList.IsSearchStringMatch(source)) + if (hostList.isSearchStringMatch(source)) { prefix.argvalue = "Host: name = " + model.getTitle(); //$NON-NLS-1$ } - else if (storageList.IsSearchStringMatch(source)) + else if (storageList.isSearchStringMatch(source)) { prefix.argvalue = "Storage: host.name = " + model.getTitle(); //$NON-NLS-1$ } - else if (vmList.IsSearchStringMatch(source)) + else if (vmList.isSearchStringMatch(source)) { prefix.argvalue = "Vms: Hosts.name = " + model.getTitle(); //$NON-NLS-1$ } - else if (templateList.IsSearchStringMatch(source)) + else if (templateList.isSearchStringMatch(source)) { prefix.argvalue = "Template: Hosts.name = " + model.getTitle(); //$NON-NLS-1$ } - else if (eventList.IsSearchStringMatch(source)) + else if (eventList.isSearchStringMatch(source)) { prefix.argvalue = "Events: host.name = " + model.getTitle(); //$NON-NLS-1$ } - else if (networkList.IsSearchStringMatch(source)) + else if (networkList.isSearchStringMatch(source)) { prefix.argvalue = "Network: Host_network.host_name = " + model.getTitle(); //$NON-NLS-1$ } @@ -1134,7 +1134,7 @@ break; case Volumes: { - if (volumeList.IsSearchStringMatch(source)) + if (volumeList.isSearchStringMatch(source)) { prefix.argvalue = "Volume: cluster = " + model.getParent().getTitle(); //$NON-NLS-1$ } @@ -1142,109 +1142,109 @@ break; case Volume: { - if (volumeList.IsSearchStringMatch(source)) + if (volumeList.isSearchStringMatch(source)) { prefix.argvalue = "Volume: name = " + model.getTitle(); //$NON-NLS-1$ } - else if (clusterList.IsSearchStringMatch(source)) + else if (clusterList.isSearchStringMatch(source)) { prefix.argvalue = "Cluster: volume.name = " + model.getTitle(); //$NON-NLS-1$ } - else if (dataCenterList.IsSearchStringMatch(source)) + else if (dataCenterList.isSearchStringMatch(source)) { prefix.argvalue = "DataCenter: volume.name = " + model.getTitle(); //$NON-NLS-1$ } - else if (templateList.IsSearchStringMatch(source)) + else if (templateList.isSearchStringMatch(source)) { prefix.argvalue = "Template: Volumes.name = " + model.getTitle(); //$NON-NLS-1$ } - else if (eventList.IsSearchStringMatch(source)) + else if (eventList.isSearchStringMatch(source)) { prefix.argvalue = "Events: volume.name = " + model.getTitle(); //$NON-NLS-1$ } } break; case Storages: { - if (storageList.IsSearchStringMatch(source)) + if (storageList.isSearchStringMatch(source)) { prefix.argvalue = "Storage: datacenter = " + model.getParent().getTitle(); //$NON-NLS-1$ } } break; case Storage: { - if (dataCenterList.IsSearchStringMatch(source)) + if (dataCenterList.isSearchStringMatch(source)) { prefix.argvalue = "DataCenter: storage.name = " + model.getTitle(); //$NON-NLS-1$ } - else if (clusterList.IsSearchStringMatch(source)) + else if (clusterList.isSearchStringMatch(source)) { prefix.argvalue = "Cluster: storage.name = " + model.getTitle(); //$NON-NLS-1$ } - else if (hostList.IsSearchStringMatch(source)) + else if (hostList.isSearchStringMatch(source)) { prefix.argvalue = "Host: storage.name = " + model.getTitle(); //$NON-NLS-1$ } - else if (storageList.IsSearchStringMatch(source)) + else if (storageList.isSearchStringMatch(source)) { prefix.argvalue = "Storage: name = " + model.getTitle(); //$NON-NLS-1$ } - else if (vmList.IsSearchStringMatch(source)) + else if (vmList.isSearchStringMatch(source)) { prefix.argvalue = "Vms: storage.name = " + model.getTitle(); //$NON-NLS-1$ } - else if (templateList.IsSearchStringMatch(source)) + else if (templateList.isSearchStringMatch(source)) { prefix.argvalue = "Templates: storage.name = " + model.getTitle(); //$NON-NLS-1$ } - else if (eventList.IsSearchStringMatch(source)) + else if (eventList.isSearchStringMatch(source)) { prefix.argvalue = "Events: event_storage = " + model.getTitle(); //$NON-NLS-1$ } - else if (diskList.IsSearchStringMatch(source)) + else if (diskList.isSearchStringMatch(source)) { prefix.argvalue = "Disk: storages.name = " + model.getTitle(); //$NON-NLS-1$ } } break; case Templates: { - if (templateList.IsSearchStringMatch(source)) + if (templateList.isSearchStringMatch(source)) { prefix.argvalue = "Template: datacenter = " + model.getParent().getTitle(); //$NON-NLS-1$ } } break; case VMs: { - if (vmList.IsSearchStringMatch(source)) + if (vmList.isSearchStringMatch(source)) { prefix.argvalue = "Vms: cluster = " + model.getParent().getTitle(); //$NON-NLS-1$ } } break; case Networks: { - if (networkList.IsSearchStringMatch(source)) + if (networkList.isSearchStringMatch(source)) { prefix.argvalue = "Network: datacenter = " + model.getParent().getTitle(); //$NON-NLS-1$ } } break; case Network: { - if (networkList.IsSearchStringMatch(source)) + if (networkList.isSearchStringMatch(source)) { prefix.argvalue = "Network: name = " + model.getTitle() + " datacenter = " + model.getParent().getTitle(); //$NON-NLS-1$ //$NON-NLS-2$ } - else if (clusterList.IsSearchStringMatch(source)) + else if (clusterList.isSearchStringMatch(source)) { prefix.argvalue = "Cluster: Cluster_network.network_name = " + model.getTitle() + " Datacenter.name = " + model.getParent().getTitle(); //$NON-NLS-1$ //$NON-NLS-2$ } - else if (hostList.IsSearchStringMatch(source)) + else if (hostList.isSearchStringMatch(source)) { prefix.argvalue = "Host : Nic.network_name = " + model.getTitle() + " datacenter = " + model.getParent().getTitle(); //$NON-NLS-1$ //$NON-NLS-2$ } - else if (vmList.IsSearchStringMatch(source)) + else if (vmList.isSearchStringMatch(source)) { prefix.argvalue = "Vm : Vnic.network_name = " + model.getTitle() + " datacenter = " + model.getParent().getTitle(); //$NON-NLS-1$ //$NON-NLS-2$ } - else if (templateList.IsSearchStringMatch(source)) + else if (templateList.isSearchStringMatch(source)) { prefix.argvalue = "Template : Vnic.network_name = " + model.getTitle() + " datacenter = " + model.getParent().getTitle(); //$NON-NLS-1$ //$NON-NLS-2$ } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/ListWithDetailsModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/ListWithDetailsModel.java index c7d12bf..ec57cf0 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/ListWithDetailsModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/ListWithDetailsModel.java @@ -66,7 +66,7 @@ if (oldValue instanceof SearchableListModel) { - ((SearchableListModel) oldValue).EnsureAsyncSearchStopped(); + ((SearchableListModel) oldValue).ensureAsyncSearchStopped(); } } @@ -119,7 +119,7 @@ // If selected item become null, make sure we stop all activity on an active detail model. if (getActiveDetailModel() != null && getActiveDetailModel() instanceof SearchableListModel) { - ((SearchableListModel) getActiveDetailModel()).EnsureAsyncSearchStopped(); + ((SearchableListModel) getActiveDetailModel()).ensureAsyncSearchStopped(); } } @@ -143,9 +143,9 @@ } @Override - public void EnsureAsyncSearchStopped() + public void ensureAsyncSearchStopped() { - super.EnsureAsyncSearchStopped(); + super.ensureAsyncSearchStopped(); if (getDetailModels() != null) { @@ -155,7 +155,7 @@ if (model instanceof SearchableListModel) { SearchableListModel listModel = (SearchableListModel) model; - listModel.EnsureAsyncSearchStopped(); + listModel.ensureAsyncSearchStopped(); } } } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SearchableListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SearchableListModel.java index 1ee57b5..3a88f4a 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SearchableListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SearchableListModel.java @@ -109,7 +109,7 @@ ArrayList<IVdcQueryable> items = getSelectedItems() != null ? Linq.<IVdcQueryable> cast(getSelectedItems()) : new ArrayList<IVdcQueryable>(); - UpdateReportCommandAvailability(reportCommand, items); + updateReportCommandAvailability(reportCommand, items); return reportCommand; } else { @@ -201,7 +201,7 @@ { if (asyncResult != value) { - AsyncResultChanging(value, asyncResult); + asyncResultChanging(value, asyncResult); asyncResult = value; onPropertyChanged(new PropertyChangedEventArgs("AsyncResult")); //$NON-NLS-1$ } @@ -219,7 +219,7 @@ if (!StringHelper.stringsEqual(searchString, value)) { searchString = value; - SearchStringChanged(); + searchStringChanged(); onPropertyChanged(new PropertyChangedEventArgs("SearchString")); //$NON-NLS-1$ } } @@ -292,7 +292,7 @@ setSearchPageSize(UnknownInteger); asyncCallback = new PrivateAsyncCallback(this); - UpdateActionAvailability(); + updateActionAvailabilityInternal(); // Most of SearchableListModels will not have paging. The ones that // should have paging will set it explicitly in their constructors. @@ -303,7 +303,7 @@ /** * Returns value indicating whether the specified search string is matching this list model. */ - public boolean IsSearchStringMatch(String searchString) + protected boolean isSearchStringMatch(String searchString) { return true; } @@ -385,7 +385,7 @@ protected abstract String getListName(); - protected void SearchStringChanged() + protected void searchStringChanged() { } @@ -394,11 +394,11 @@ // Defer search if there max result limit was not yet retrieved. if (getSearchPageSize() == UnknownInteger) { - asyncCallback.RequestSearch(); + asyncCallback.requestSearch(); } else { - EnsureAsyncSearchStopped(); + ensureAsyncSearchStopped(); if (getIsQueryFirstTime()) { @@ -427,7 +427,7 @@ } } - public void ForceRefresh() + public void forceRefresh() { getTimer().stop(); setIsQueryFirstTime(true); @@ -443,7 +443,7 @@ } - protected void OpenReport() + protected void openReport() { setWidgetModel(createReportModel()); } @@ -493,7 +493,7 @@ return date.getYear() + "-" + date.getMonth() + "-" + date.getDate(); //$NON-NLS-1$ //$NON-NLS-2$ } - private void AsyncResultChanging(RegistrationResult newValue, RegistrationResult oldValue) + private void asyncResultChanging(RegistrationResult newValue, RegistrationResult oldValue) { if (oldValue != null) { @@ -539,11 +539,10 @@ } } - private void ResetIsEmpty() + private void resetIsEmpty() { - // Note: Do NOT use IList: 'Items' is not necissarily IList - // (e.g in Monitor models, the different ListModels' Items are - // of type 'valueObjectEnumerableList', which is not IList). + // Note: Do NOT use a cast List: 'Items' is not necessarily a List but might be a collection thus we use + // iterator if (getItems() != null) { Iterator enumerator = getItems().iterator(); @@ -559,8 +558,8 @@ { super.itemsChanged(); - ResetIsEmpty(); - UpdatePagingAvailability(); + resetIsEmpty(); + updatePagingAvailability(); } @Override @@ -568,39 +567,39 @@ { super.itemsCollectionChanged(sender, e); - ResetIsEmpty(); - UpdatePagingAvailability(); + resetIsEmpty(); + updatePagingAvailability(); } @Override protected void onSelectedItemChanged() { super.onSelectedItemChanged(); - UpdateActionAvailability(); + updateActionAvailabilityInternal(); } @Override protected void selectedItemsChanged() { super.selectedItemsChanged(); - UpdateActionAvailability(); + updateActionAvailabilityInternal(); } - private void UpdateReportCommandAvailability(ReportCommand reportCommand, List<?> selectedItems) { + private void updateReportCommandAvailability(ReportCommand reportCommand, List<?> selectedItems) { reportCommand.setIsExecutionAllowed((!reportCommand.isMultiple() && (selectedItems.size() == 1)) || (reportCommand.isMultiple() && (selectedItems.size() > 1))); } - private void UpdateActionAvailability() { + private void updateActionAvailabilityInternal() { List<?> items = getSelectedItems() != null ? getSelectedItems() : Collections.emptyList(); for (ReportCommand reportCommand : openReportCommands) { - UpdateReportCommandAvailability(reportCommand, items); + updateReportCommandAvailability(reportCommand, items); } } - protected void UpdatePagingAvailability() + protected void updatePagingAvailability() { getSearchNextPageCommand().setIsExecutionAllowed(getSearchNextPageCommand().getIsAvailable() && getNextSearchPageAllowed()); @@ -608,7 +607,7 @@ && getPreviousSearchPageAllowed()); } - private void SetSearchStringPage(int newSearchPageNumber) + private void setSearchStringPage(int newSearchPageNumber) { if (Regex.IsMatch(getSearchString(), PAGE_STRING_REGEX, RegexOptions.IgnoreCase)) { @@ -622,15 +621,15 @@ } } - protected void SearchNextPage() + protected void searchNextPage() { - SetSearchStringPage(getNextSearchPageNumber()); + setSearchStringPage(getNextSearchPageNumber()); getSearchCommand().Execute(); } - protected void SearchPreviousPage() + protected void searchPreviousPage() { - SetSearchStringPage(getPreviousSearchPageNumber()); + setSearchStringPage(getPreviousSearchPageNumber()); getSearchCommand().Execute(); } @@ -716,7 +715,7 @@ itemsChanging(value, items); items = value; - UpdatePagingAvailability(); + updatePagingAvailability(); getItemsChangedEvent().raise(this, EventArgs.Empty); onPropertyChanged(new PropertyChangedEventArgs("Items")); //$NON-NLS-1$ @@ -811,7 +810,7 @@ { } - public void EnsureAsyncSearchStopped() + public void ensureAsyncSearchStopped() { getTimer().stop(); if (getAsyncResult() != null && !getAsyncResult().getId().equals(NGuid.Empty)) @@ -831,18 +830,17 @@ } else if (command == getSearchNextPageCommand()) { - SearchNextPage(); + searchNextPage(); } else if (command == getSearchPreviousPageCommand()) { - SearchPreviousPage(); + searchPreviousPage(); } else if (command == getForceRefreshCommand()) { - ForceRefresh(); + forceRefresh(); } else if (command instanceof ReportCommand) { - ReportCommand reportCommand = (ReportCommand) command; - OpenReport(); + openReport(); } if (command != null && command.isAutoRefresh()) { @@ -865,13 +863,13 @@ public void onSuccess(Object model1, Object result1) { PrivateAsyncCallback privateAsyncCallback1 = (PrivateAsyncCallback) model1; - privateAsyncCallback1.ApplySearchPageSize((Integer) result1); + privateAsyncCallback1.applySearchPageSize((Integer) result1); } }; AsyncDataProvider.GetSearchResultsLimit(_asyncQuery1); } - public void RequestSearch() + private void requestSearch() { searchRequested = true; model.setItems(new ArrayList()); @@ -879,7 +877,7 @@ model.getSelectedItemsChangedEvent().raise(this, new EventArgs()); } - private void ApplySearchPageSize(int value) + private void applySearchPageSize(int value) { model.setSearchPageSize(value); @@ -890,7 +888,7 @@ } // Sure paging functionality. - model.UpdatePagingAvailability(); + model.updatePagingAvailability(); } } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/autocomplete/SearchSuggestModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/autocomplete/SearchSuggestModel.java index f581132..73dd9a5 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/autocomplete/SearchSuggestModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/autocomplete/SearchSuggestModel.java @@ -84,9 +84,9 @@ } @Override - protected void SearchStringChanged() + protected void searchStringChanged() { - super.SearchStringChanged(); + super.searchStringChanged(); getSearchCommand().Execute(); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java index 5437415..ff30320 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java @@ -269,7 +269,7 @@ } @Override - public boolean IsSearchStringMatch(String searchString) + public boolean isSearchStringMatch(String searchString) { return searchString.trim().toLowerCase().startsWith("cluster"); //$NON-NLS-1$ } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterNetworkListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterNetworkListModel.java index 6df0a66..2b39453 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterNetworkListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterNetworkListModel.java @@ -286,7 +286,7 @@ private void doFinish() { windowModel.StopProgress(); Cancel(); - ForceRefresh(); + forceRefresh(); } }; 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 75fc0c5..a5ccc68 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 @@ -244,7 +244,7 @@ } @Override - public boolean IsSearchStringMatch(String searchString) + public boolean isSearchStringMatch(String searchString) { return searchString.trim().toLowerCase().startsWith("datacenter"); //$NON-NLS-1$ } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskListModel.java index 5eec134..938a80b 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskListModel.java @@ -577,7 +577,7 @@ } @Override - public boolean IsSearchStringMatch(String searchString) + public boolean isSearchStringMatch(String searchString) { return searchString.trim().toLowerCase().startsWith("disk"); //$NON-NLS-1$ } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/events/EventListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/events/EventListModel.java index afa2276..b6544a9 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/events/EventListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/events/EventListModel.java @@ -118,7 +118,7 @@ } @Override - public boolean IsSearchStringMatch(String searchString) + public boolean isSearchStringMatch(String searchString) { return searchString.trim().toLowerCase().startsWith("event"); //$NON-NLS-1$ } @@ -214,7 +214,7 @@ if (command == getRefreshCommand()) { refreshModel(); - UpdatePagingAvailability(); + updatePagingAvailability(); } else if (command == getDetailsCommand()) { details(); } else if (StringHelper.stringsEqual(command.getName(), "Cancel")) { //$NON-NLS-1$ @@ -228,9 +228,9 @@ } @Override - public void EnsureAsyncSearchStopped() + public void ensureAsyncSearchStopped() { - super.EnsureAsyncSearchStopped(); + super.ensureAsyncSearchStopped(); timer.stop(); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java index 78130e7..362b397a 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java @@ -1552,7 +1552,7 @@ } @Override - public boolean IsSearchStringMatch(String searchString) + public boolean isSearchStringMatch(String searchString) { return searchString.trim().toLowerCase().startsWith("host"); //$NON-NLS-1$ } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkClusterListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkClusterListModel.java index cc1694d..c89e3cc 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkClusterListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkClusterListModel.java @@ -169,7 +169,7 @@ private void doFinish() { windowModel.StopProgress(); cancel(); - ForceRefresh(); + forceRefresh(); } }; diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkListModel.java index c6dd688..db6aa86 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkListModel.java @@ -159,7 +159,7 @@ } @Override - public boolean IsSearchStringMatch(String searchString) { + public boolean isSearchStringMatch(String searchString) { return searchString.trim().toLowerCase().startsWith("network"); //$NON-NLS-1$ } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java index b4ae493..9da808f 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java @@ -184,7 +184,7 @@ } @Override - public boolean IsSearchStringMatch(String searchString) + public boolean isSearchStringMatch(String searchString) { return searchString.trim().toLowerCase().startsWith("pool"); //$NON-NLS-1$ } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/quota/QuotaListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/quota/QuotaListModel.java index b5c70b2..ce13c91 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/quota/QuotaListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/quota/QuotaListModel.java @@ -699,7 +699,7 @@ } @Override - public boolean IsSearchStringMatch(String searchString) + public boolean isSearchStringMatch(String searchString) { return searchString.trim().toLowerCase().startsWith("quota"); //$NON-NLS-1$ } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/reports/ReportsListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/reports/ReportsListModel.java index 14fbc02..1a9524d 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/reports/ReportsListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/reports/ReportsListModel.java @@ -208,7 +208,7 @@ } @Override - public boolean IsSearchStringMatch(String searchString) + public boolean isSearchStringMatch(String searchString) { return searchString.trim().toLowerCase().startsWith("reports"); //$NON-NLS-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 48a4ce9..3e8edce 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 @@ -243,7 +243,7 @@ } @Override - public boolean IsSearchStringMatch(String searchString) + public boolean isSearchStringMatch(String searchString) { return searchString.trim().toLowerCase().startsWith("storage"); //$NON-NLS-1$ } @@ -2226,7 +2226,7 @@ } @Override - protected void OpenReport() { + protected void openReport() { final ReportModel reportModel = super.createReportModel(); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateListModel.java index 994aa84..f5605f1 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateListModel.java @@ -266,7 +266,7 @@ } @Override - public boolean IsSearchStringMatch(String searchString) + public boolean isSearchStringMatch(String searchString) { return searchString.trim().toLowerCase().startsWith("template"); //$NON-NLS-1$ } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/UserListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/UserListModel.java index a6cf4a0..8da11b7 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/UserListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/UserListModel.java @@ -376,7 +376,7 @@ } @Override - public boolean IsSearchStringMatch(String searchString) + public boolean isSearchStringMatch(String searchString) { return searchString.trim().toLowerCase().startsWith("user"); //$NON-NLS-1$ } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java index ce8df1b..2807899 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java @@ -649,7 +649,7 @@ } @Override - public boolean IsSearchStringMatch(String searchString) + public boolean isSearchStringMatch(String searchString) { return searchString.trim().toLowerCase().startsWith("vm"); //$NON-NLS-1$ } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/volumes/VolumeListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/volumes/VolumeListModel.java index f2ab20e..ef96e59 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/volumes/VolumeListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/volumes/VolumeListModel.java @@ -684,7 +684,7 @@ } @Override - public boolean IsSearchStringMatch(String searchString) { + public boolean isSearchStringMatch(String searchString) { return searchString.trim().toLowerCase().startsWith("volume"); //$NON-NLS-1$ } } diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/presenter/AbstractModelActivationPresenter.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/presenter/AbstractModelActivationPresenter.java index 38bbb30..39596eb 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/presenter/AbstractModelActivationPresenter.java +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/presenter/AbstractModelActivationPresenter.java @@ -44,7 +44,7 @@ } else { // Stop model currentModel.setItems(null); - currentModel.EnsureAsyncSearchStopped(); + currentModel.ensureAsyncSearchStopped(); } } diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/uicommon/model/UserPortalDataBoundModelProvider.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/uicommon/model/UserPortalDataBoundModelProvider.java index ae1a084..a477bb7 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/uicommon/model/UserPortalDataBoundModelProvider.java +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/uicommon/model/UserPortalDataBoundModelProvider.java @@ -113,7 +113,7 @@ @Override public void onUserLoginChange(UserLoginChangeEvent event) { if (!user.isLoggedIn()) { - getModel().EnsureAsyncSearchStopped(); + getModel().ensureAsyncSearchStopped(); } } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/configure/ConfigurePopupPresenterWidget.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/configure/ConfigurePopupPresenterWidget.java index 4b6e18e..1cdddfb 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/configure/ConfigurePopupPresenterWidget.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/configure/ConfigurePopupPresenterWidget.java @@ -44,9 +44,9 @@ @Override protected void onHide() { super.onHide(); - roleModelProvider.getModel().EnsureAsyncSearchStopped(); - permissionModelProvider.getModel().EnsureAsyncSearchStopped(); - systemPermissionModelProvider.getModel().EnsureAsyncSearchStopped(); + roleModelProvider.getModel().ensureAsyncSearchStopped(); + permissionModelProvider.getModel().ensureAsyncSearchStopped(); + systemPermissionModelProvider.getModel().ensureAsyncSearchStopped(); } } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/MainSectionView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/MainSectionView.java index 61aae8b..c6c7312 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/MainSectionView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/MainSectionView.java @@ -150,7 +150,7 @@ if (event.getSelectedItem() == BOOKMARK_INDEX) { bookmarkModelProvider.getModel().executeBookmarksSearch(); } else { - bookmarkModelProvider.getModel().EnsureAsyncSearchStopped(); + bookmarkModelProvider.getModel().ensureAsyncSearchStopped(); } } }); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/configure/RoleView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/configure/RoleView.java index a149c46..bf234aa 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/configure/RoleView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/configure/RoleView.java @@ -104,7 +104,7 @@ public void onValueChange(ValueChangeEvent<Boolean> event) { if (event.getValue()) { roleModelProvider.getModel().setItemsFilter(null); - roleModelProvider.getModel().ForceRefresh(); + roleModelProvider.getModel().forceRefresh(); } } }); @@ -115,7 +115,7 @@ public void onValueChange(ValueChangeEvent<Boolean> event) { if (event.getValue()) { roleModelProvider.getModel().setItemsFilter(RoleType.ADMIN); - roleModelProvider.getModel().ForceRefresh(); + roleModelProvider.getModel().forceRefresh(); } } }); @@ -126,7 +126,7 @@ public void onValueChange(ValueChangeEvent<Boolean> event) { if (event.getValue()) { roleModelProvider.getModel().setItemsFilter(RoleType.USER); - roleModelProvider.getModel().ForceRefresh(); + roleModelProvider.getModel().forceRefresh(); } } }); -- To view, visit http://gerrit.ovirt.org/14465 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3c4ef597b8bd10596d14e2479309c84fda1e7a69 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
