Simplify some helper methods in screen manager

bilal-alsharifi · bilal-alsharifi · commit 40ed2d11522d · 2020-04-08T11:14:41.000-04:00
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/BaseTextAndGraphicManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/BaseTextAndGraphicManager.java
@@ -775,9 +775,7 @@ private boolean shouldUpdateSecondaryImage() {
 	 * @return true if image field is supported, false if not
 	 */
 	private boolean templateSupportsImageField(ImageFieldName name) {
-		return (defaultMainWindowCapability != null && defaultMainWindowCapability.getImageFields() != null)
-				? ManagerUtility.WindowCapabilityUtility.hasImageFieldOfName(defaultMainWindowCapability, name)
-				: true;
+		return (defaultMainWindowCapability == null || defaultMainWindowCapability.getImageFields() == null) || ManagerUtility.WindowCapabilityUtility.hasImageFieldOfName(defaultMainWindowCapability, name);
 	}
 
 	/**
@@ -801,9 +799,7 @@ private boolean shouldUpdateTitleField() {
 	 * @return true if field should be updated, false if not
 	 */
 	private boolean templateSupportsTextField(TextFieldName name) {
-		return (defaultMainWindowCapability != null && defaultMainWindowCapability.getTextFields() != null)
-				? ManagerUtility.WindowCapabilityUtility.hasTextFieldOfName(defaultMainWindowCapability, name)
-				: true;
+		return (defaultMainWindowCapability == null || defaultMainWindowCapability.getTextFields() == null) || ManagerUtility.WindowCapabilityUtility.hasTextFieldOfName(defaultMainWindowCapability, name);
 	}
 
 	// SCREEN ITEM SETTERS AND GETTERS
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadChoicesOperation.java b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadChoicesOperation.java
@@ -254,15 +254,11 @@ boolean shouldSendChoiceSecondaryImage() {
 	}
 
 	boolean templateSupportsTextField(TextFieldName name) {
-		return (defaultMainWindowCapability != null && defaultMainWindowCapability.getTextFields() != null)
-				? ManagerUtility.WindowCapabilityUtility.hasTextFieldOfName(defaultMainWindowCapability, name)
-				: true;
+		return (defaultMainWindowCapability == null || defaultMainWindowCapability.getTextFields() == null) || ManagerUtility.WindowCapabilityUtility.hasTextFieldOfName(defaultMainWindowCapability, name);
 	}
 
 	boolean templateSupportsImageField(ImageFieldName name) {
-		return (defaultMainWindowCapability != null && defaultMainWindowCapability.getImageFields() != null)
-				? ManagerUtility.WindowCapabilityUtility.hasImageFieldOfName(defaultMainWindowCapability, name)
-				: true;
+		return (defaultMainWindowCapability == null || defaultMainWindowCapability.getImageFields() == null) || ManagerUtility.WindowCapabilityUtility.hasImageFieldOfName(defaultMainWindowCapability, name);
 	}
 
 	List<SdlArtwork> artworksToUpload(){
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
@@ -780,9 +780,7 @@ private List<SdlArtwork> findAllArtworksToBeUploadedFromCells(List<MenuCell> cel
 
 	@SuppressWarnings("BooleanMethodIsAlwaysInverted")
 	private boolean supportsImages(){
-		return (defaultMainWindowCapability != null && defaultMainWindowCapability.getImageFields() != null)
-				? ManagerUtility.WindowCapabilityUtility.hasImageFieldOfName(defaultMainWindowCapability, ImageFieldName.cmdIcon)
-				: true;
+		return (defaultMainWindowCapability == null || defaultMainWindowCapability.getImageFields() == null) || ManagerUtility.WindowCapabilityUtility.hasImageFieldOfName(defaultMainWindowCapability, ImageFieldName.cmdIcon);
 	}
 
 	private boolean artworkNeedsUpload(SdlArtwork artwork){

Original file line number	Diff line number	Diff line change
`@@ -254,15 +254,11 @@ boolean shouldSendChoiceSecondaryImage() {`
`254`	`254`	`}`
`255`	`255`
`256`	`256`	`boolean templateSupportsTextField(TextFieldName name) {`
`257`		`- return (defaultMainWindowCapability != null && defaultMainWindowCapability.getTextFields() != null)`
`258`		`- ? ManagerUtility.WindowCapabilityUtility.hasTextFieldOfName(defaultMainWindowCapability, name)`
`259`		`- : true;`
	`257`	`+ return (defaultMainWindowCapability == null \|\| defaultMainWindowCapability.getTextFields() == null) \|\| ManagerUtility.WindowCapabilityUtility.hasTextFieldOfName(defaultMainWindowCapability, name);`
`260`	`258`	`}`
`261`	`259`
`262`	`260`	`boolean templateSupportsImageField(ImageFieldName name) {`
`263`		`- return (defaultMainWindowCapability != null && defaultMainWindowCapability.getImageFields() != null)`
`264`		`- ? ManagerUtility.WindowCapabilityUtility.hasImageFieldOfName(defaultMainWindowCapability, name)`
`265`		`- : true;`
	`261`	`+ return (defaultMainWindowCapability == null \|\| defaultMainWindowCapability.getImageFields() == null) \|\| ManagerUtility.WindowCapabilityUtility.hasImageFieldOfName(defaultMainWindowCapability, name);`
`266`	`262`	`}`
`267`	`263`
`268`	`264`	`List<SdlArtwork> artworksToUpload(){`
Original file line number	Diff line number	Diff line change
`@@ -780,9 +780,7 @@ private List<SdlArtwork> findAllArtworksToBeUploadedFromCells(List<MenuCell> cel`
`780`	`780`
`781`	`781`	`@SuppressWarnings("BooleanMethodIsAlwaysInverted")`
`782`	`782`	`private boolean supportsImages(){`
`783`		`- return (defaultMainWindowCapability != null && defaultMainWindowCapability.getImageFields() != null)`
`784`		`- ? ManagerUtility.WindowCapabilityUtility.hasImageFieldOfName(defaultMainWindowCapability, ImageFieldName.cmdIcon)`
`785`		`- : true;`
	`783`	`+ return (defaultMainWindowCapability == null \|\| defaultMainWindowCapability.getImageFields() == null) \|\| ManagerUtility.WindowCapabilityUtility.hasImageFieldOfName(defaultMainWindowCapability, ImageFieldName.cmdIcon);`
`786`	`784`	`}`
`787`	`785`
`788`	`786`	`private boolean artworkNeedsUpload(SdlArtwork artwork){`