diff options
author | Bilal Alsharifi <599206+bilal-alsharifi@users.noreply.github.com> | 2021-09-15 12:15:07 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-15 12:15:07 -0400 |
commit | ef086d79b72321f7d9a60e5a08aa9a2e8aae7e94 (patch) | |
tree | 6981353e93c28817041b6a540e9e7759d97e1d99 | |
parent | afab99f14134bc63c956857cf33da6f02982fd36 (diff) | |
download | sdl_android-ef086d79b72321f7d9a60e5a08aa9a2e8aae7e94.tar.gz |
Apply suggestions from code review
Co-authored-by: Julian Kast <Julian.kast@livio.io>
3 files changed, 4 insertions, 4 deletions
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseMenuManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseMenuManager.java index 554f12c2e..96b4f82c5 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseMenuManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseMenuManager.java @@ -223,7 +223,7 @@ abstract class BaseMenuManager extends BaseSubManager { DebugTool.logError(TAG, String.format("The cell %s does not contain any sub cells, so no submenu can be opened", cell.getTitle())); return false; } else if (cell != null && foundClonedCell == null) { - DebugTool.logError(TAG, "This cell has not been sent to the head unit, so no submenu can be opened. Make sure that the cell exists in the SDLManager.menu array"); + DebugTool.logError(TAG, "This cell has not been sent to the head unit, so no submenu can be opened. Make sure that the cell exists in the SDLManager.menu list"); return false; } else if (internalInterface.getSdlMsgVersion().getMajorVersion() < 6) { DebugTool.logWarning(TAG, "The openSubmenu method is not supported on this head unit."); diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuReplaceOperation.java b/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuReplaceOperation.java index 1ee297142..3a597acbf 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuReplaceOperation.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuReplaceOperation.java @@ -155,7 +155,7 @@ class MenuReplaceOperation extends Task { final List<MenuCell> cellsToDelete = filterMenuCellsWithStatusList(currentMenu, deleteMenuStatus, MenuCellState.DELETE); final List<MenuCell> cellsToAdd = filterMenuCellsWithStatusList(updatedMenu, addMenuStatus, MenuCellState.ADD); - // These arrays should ONLY contain KEEPS. These will be used for SubMenu compares + // These lists should ONLY contain KEEPS. These will be used for SubMenu compares final List<MenuCell> oldKeeps = filterMenuCellsWithStatusList(currentMenu, deleteMenuStatus, MenuCellState.KEEP); final List<MenuCell> newKeeps = filterMenuCellsWithStatusList(updatedMenu, addMenuStatus, MenuCellState.KEEP); diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuReplaceUtilities.java b/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuReplaceUtilities.java index b35df7c20..46daf1620 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuReplaceUtilities.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuReplaceUtilities.java @@ -69,9 +69,9 @@ class MenuReplaceUtilities { } /** - * Assign cell ids on an array of menu cells given a parent id (or no parent id) + * Assign cell ids on a list of menu cells given a parent id (or no parent id) * - * @param menuCells The array of menu cells to update + * @param menuCells The list of menu cells to update * @param parentId The parent id to assign if needed */ static void addIdsToMenuCells(List<MenuCell> menuCells, int parentId) { |