Fix MenuReplaceOperation onExecute not being async, and update method references were not private

Author: renonick87

examples/js/hello-sdl/index.html

@@ -152,7 +152,7 @@
 
                 const cellList = [mainCell1, mainCell2];
 
-                await screenManager.setMenu(cellList);
+                screenManager.setMenu(cellList);
             }
 
             async _onHmiStatusListener (onHmiStatus) {

examples/node/hello-sdl-tcp/index.js

@@ -147,7 +147,7 @@ class AppClient {
 
         const cellList = [mainCell1, mainCell2];
 
-        await screenManager.setMenu(cellList);
+        screenManager.setMenu(cellList);
     }
 
     async _onHmiStatusListener (onHmiStatus) {

examples/node/hello-sdl/AppClient.js

@@ -135,7 +135,7 @@ class AppClient {
 
         const cellList = [mainCell1, mainCell2];
 
-        await screenManager.setMenu(cellList);
+        screenManager.setMenu(cellList);
     }
 
     _onHmiStatusListener (onHmiStatus) {

examples/webengine/hello-sdl/index.html

@@ -157,7 +157,7 @@
 
                 const cellList = [mainCell1, mainCell2];
 
-                await screenManager.setMenu(cellList);
+                screenManager.setMenu(cellList);
             }
 
             async _onSystemCapabilityUpdatedRpcListener (capabilityMessage) {

lib/js/src/manager/screen/_ScreenManagerBase.js

@@ -666,8 +666,8 @@ class _ScreenManagerBase extends _SubManagerBase {
      * Note: the manager will store a deep copy the menuCells internally to be able to handle future updates correctly
      * @param {MenuCell[]} menuCells - The menu cells that are to be sent to the head unit, including their sub-cells.
      */
-    async setMenu (menuCells) {
-        await this._menuManagerBase._setMenuCells(menuCells);
+    setMenu (menuCells) {
+        this._menuManagerBase._setMenuCells(menuCells);
     }
 
     /**

lib/js/src/manager/screen/menu/_MenuManagerBase.js

@@ -159,21 +159,18 @@ class _MenuManagerBase extends _SubManagerBase {
         this._menuCells = cells.map(cell => cell.clone());
         const isDynamicMenuUpdateActiveBoolean = this._isDynamicMenuUpdateActive(this._dynamicMenuUpdatesMode, this._displayType);
 
-        return new Promise((resolve) => {
-            const operation = new _MenuReplaceOperation(this._lifecycleManager, this._fileManager, this._windowCapability,
-                this._currentMenuConfiguration, this._currentMenuCells, this._menuCells, isDynamicMenuUpdateActiveBoolean, new _MenuManagerCompletionListener()
-                    .setOnComplete((success, currentMenuCells) => {
-                        this._currentMenuCells = currentMenuCells;
-                        this._updateMenuReplaceOperationsWithNewCurrentMenu();
-                        console.log('MenuManagerBase - Finished updating menu');
-                        resolve(success);
-                    })
-            );
-
-            // Cancel previous MenuReplaceOperations
-            this._cancelAllTasks('MenuReplaceOperation');
-            this._addTask(operation);
-        });
+        const operation = new _MenuReplaceOperation(this._lifecycleManager, this._fileManager, this._windowCapability,
+            this._currentMenuConfiguration, this._currentMenuCells, this._menuCells, isDynamicMenuUpdateActiveBoolean, new _MenuManagerCompletionListener()
+                .setOnComplete((success, currentMenuCells) => {
+                    this._currentMenuCells = currentMenuCells;
+                    this._updateMenuReplaceOperationsWithNewCurrentMenu();
+                    console.log('MenuManagerBase - Finished updating menu');
+                })
+        );
+
+        // Cancel previous MenuReplaceOperations
+        this._cancelAllTasks('MenuReplaceOperation');
+        this._addTask(operation);
     }
 
     /**
@@ -307,7 +304,7 @@ class _MenuManagerBase extends _SubManagerBase {
     _updateMenuReplaceOperationsWithNewCurrentMenu () {
         this._taskQueue.forEach(task => {
             if (task.getName() === 'MenuReplaceOperation') {
-                task.setCurrentMenu(this._currentMenuCells);
+                task._setCurrentMenu(this._currentMenuCells);
             }
         });
     }
@@ -329,7 +326,7 @@ class _MenuManagerBase extends _SubManagerBase {
     _updateMenuReplaceOperationsWithNewMenuConfiguration () {
         this._taskQueue.forEach(task => {
             if (task.getName() === 'MenuReplaceOperation') {
-                task.setMenuConfiguration(this._currentMenuConfiguration);
+                task._setMenuConfiguration(this._currentMenuConfiguration);
             }
         });
     }

lib/js/src/manager/screen/menu/_MenuReplaceOperation.js

@@ -67,8 +67,8 @@ class _MenuReplaceOperation extends _Task {
      * The method that causes the task to run.
      * @param {_Task} task - The task instance
      */
-    onExecute (task) {
-        this._start();
+    async onExecute (task) {
+        await this._start();
     }
 
     /**