Add NonNull annotationsfeature/dynamic_menu_fixes

2 files changed, 10 insertions, 11 deletions

diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/BaseScreenManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/BaseScreenManager.java
index fea7513f4..2afd0f6f6 100644
--- a/base/src/main/java/com/smartdevicelink/managers/screen/BaseScreenManager.java
+++ b/base/src/main/java/com/smartdevicelink/managers/screen/BaseScreenManager.java
@@ -376,7 +376,7 @@ abstract class BaseScreenManager extends BaseSubManager {
 	 * Set voice commands
 	 * @param voiceCommands the voice commands to be sent to the head unit
 	 */
-	public void setVoiceCommands(List<VoiceCommand> voiceCommands){
+	public void setVoiceCommands(@NonNull List<VoiceCommand> voiceCommands){
 		this.voiceCommandManager.setVoiceCommands(voiceCommands);
 	}
 
@@ -393,7 +393,7 @@ abstract class BaseScreenManager extends BaseSubManager {
 	 * Note: the manager will store a deep copy the menuCells internally to be able to handle future updates correctly
 	 * @param menuCells - the menu cells that are to be sent to the head unit, including their sub-cells.
 	 */
-	public void setMenu(List<MenuCell> menuCells){
+	public void setMenu(@NonNull List<MenuCell> menuCells){
 		this.menuManager.setMenuCells(menuCells);
 	}
 
@@ -401,7 +401,7 @@ abstract class BaseScreenManager extends BaseSubManager {
 	 * Sets the behavior of how menus are updated. For explanations of the differences, see {@link DynamicMenuUpdatesMode}
 	 * @param value - the update mode
 	 */
-	public void setDynamicMenuUpdatesMode(DynamicMenuUpdatesMode value){
+	public void setDynamicMenuUpdatesMode(@NonNull DynamicMenuUpdatesMode value){
 		this.menuManager.setDynamicUpdatesMode(value);
 	}
 
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 20ab24994..33b002513 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
@@ -147,7 +147,7 @@ abstract class BaseMenuManager extends BaseSubManager {
 
 	// SETTERS
 
-	public void setDynamicUpdatesMode(DynamicMenuUpdatesMode value){
+	public void setDynamicUpdatesMode(@NonNull DynamicMenuUpdatesMode value){
 		this.dynamicMenuUpdatesMode = value;
 	}
 
@@ -155,7 +155,7 @@ abstract class BaseMenuManager extends BaseSubManager {
 	 * Creates and sends all associated Menu RPCs
 	 * @param cells - the menu cells that are to be sent to the head unit, including their sub-cells.
 	 */
-	public void setMenuCells(List<MenuCell> cells){
+	public void setMenuCells(@NonNull List<MenuCell> cells){
 
 		// Create a deep copy of the list so future changes by developers don't affect the algorithm logic
 		List <MenuCell> clonedCells = cloneMenuCellsList(cells);
@@ -944,11 +944,11 @@ abstract class BaseMenuManager extends BaseSubManager {
 					public void onComplete(boolean success) {
 						inProgressUpdate = null;
 
-						if (!success){
+						if (!success) {
 							DebugTool.logError("Error Sending Current Menu");
 						}
 
-						if (hasQueuedUpdate){
+						if (hasQueuedUpdate) {
 							setMenuCells(waitingUpdateMenuCells);
 							hasQueuedUpdate = false;
 						}
@@ -1174,16 +1174,15 @@ abstract class BaseMenuManager extends BaseSubManager {
 		});
 	}
 
-	private List<MenuCell> cloneMenuCellsList (List<MenuCell> originalList){
-		if (originalList == null){
+	private List<MenuCell> cloneMenuCellsList(List<MenuCell> originalList) {
+		if (originalList == null) {
 			return null;
 		}
 
 		List<MenuCell> clone = new ArrayList<>();
-		for (MenuCell menuCell : originalList){
+		for (MenuCell menuCell : originalList) {
 			clone.add(menuCell.clone());
 		}
 		return clone;
 	}
-
 }