Skip to content

Commit ef086d7

Browse files
Apply suggestions from code review
Co-authored-by: Julian Kast <Julian.kast@livio.io>
1 parent afab99f commit ef086d7

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseMenuManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ private boolean openMenuPrivate(MenuCell cell) {
223223
DebugTool.logError(TAG, String.format("The cell %s does not contain any sub cells, so no submenu can be opened", cell.getTitle()));
224224
return false;
225225
} else if (cell != null && foundClonedCell == null) {
226-
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");
226+
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");
227227
return false;
228228
} else if (internalInterface.getSdlMsgVersion().getMajorVersion() < 6) {
229229
DebugTool.logWarning(TAG, "The openSubmenu method is not supported on this head unit.");

base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuReplaceOperation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ private void updateMenuCells(final CompletionListener listener) {
155155
final List<MenuCell> cellsToDelete = filterMenuCellsWithStatusList(currentMenu, deleteMenuStatus, MenuCellState.DELETE);
156156
final List<MenuCell> cellsToAdd = filterMenuCellsWithStatusList(updatedMenu, addMenuStatus, MenuCellState.ADD);
157157

158-
// These arrays should ONLY contain KEEPS. These will be used for SubMenu compares
158+
// These lists should ONLY contain KEEPS. These will be used for SubMenu compares
159159
final List<MenuCell> oldKeeps = filterMenuCellsWithStatusList(currentMenu, deleteMenuStatus, MenuCellState.KEEP);
160160
final List<MenuCell> newKeeps = filterMenuCellsWithStatusList(updatedMenu, addMenuStatus, MenuCellState.KEEP);
161161

base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuReplaceUtilities.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@ static int getNextMenuId() {
6969
}
7070

7171
/**
72-
* Assign cell ids on an array of menu cells given a parent id (or no parent id)
72+
* Assign cell ids on a list of menu cells given a parent id (or no parent id)
7373
*
74-
* @param menuCells The array of menu cells to update
74+
* @param menuCells The list of menu cells to update
7575
* @param parentId The parent id to assign if needed
7676
*/
7777
static void addIdsToMenuCells(List<MenuCell> menuCells, int parentId) {

0 commit comments

Comments
 (0)