diff options
| author | Bilal Alsharifi <bilal.alsharifi@gmail.com> | 2020-04-08 11:14:41 -0400 |
|---|---|---|
| committer | Bilal Alsharifi <bilal.alsharifi@gmail.com> | 2020-04-08 11:14:41 -0400 |
| commit | 40ed2d11522da4529c645b5df05df0fedd8769e1 (patch) | |
| tree | f29263c7ec5e529c546b14e39e60c4f1a6087ea0 | |
| parent | 0f045661724a7100fbb6890a3277da46aed3a36d (diff) | |
| download | sdl_android-40ed2d11522da4529c645b5df05df0fedd8769e1.tar.gz | |
Simplify some helper methods in screen manager
3 files changed, 5 insertions, 15 deletions
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/BaseTextAndGraphicManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/BaseTextAndGraphicManager.java index 6d88c2cb8..2deb11f09 100644 --- 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 @@ abstract class BaseTextAndGraphicManager extends BaseSubManager { * @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 @@ abstract class BaseTextAndGraphicManager extends BaseSubManager { * @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 index 57c87d17d..bce9aabb8 100644 --- 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 @@ class PreloadChoicesOperation extends AsynchronousOperation { } 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 index 414a9163c..00abba550 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 @@ -780,9 +780,7 @@ abstract class BaseMenuManager extends BaseSubManager { @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){ |