diff options
| author | Noah Stanford <noah@livio.io> | 2022-01-05 15:26:20 -0500 |
|---|---|---|
| committer | Noah Stanford <noah@livio.io> | 2022-01-05 15:26:20 -0500 |
| commit | 97e2dee1004002aa66b04a1b315c38d0bbda9df7 (patch) | |
| tree | 8df6085a8fb5b4272d3abaef52d39927290d4ad6 | |
| parent | ec969250ae44dc9e3987d31a46945048879dbc3f (diff) | |
| download | sdl_android-97e2dee1004002aa66b04a1b315c38d0bbda9df7.tar.gz | |
Reformat base Java files
60 files changed, 206 insertions, 157 deletions
diff --git a/base/src/main/java/com/smartdevicelink/managers/AlertCompletionListener.java b/base/src/main/java/com/smartdevicelink/managers/AlertCompletionListener.java index 7801632ba..b15315603 100644 --- a/base/src/main/java/com/smartdevicelink/managers/AlertCompletionListener.java +++ b/base/src/main/java/com/smartdevicelink/managers/AlertCompletionListener.java @@ -4,7 +4,8 @@ public interface AlertCompletionListener { /** * Returns whether an Alert operation was successful or not along with tryAgainTime - * @param success - Boolean that is True if Operation was a success, False otherwise. + * + * @param success - Boolean that is True if Operation was a success, False otherwise. * @param tryAgainTime - Amount of time (in seconds) that an app must wait before resending an alert. */ void onComplete(boolean success, Integer tryAgainTime); diff --git a/base/src/main/java/com/smartdevicelink/managers/ISdl.java b/base/src/main/java/com/smartdevicelink/managers/ISdl.java index 94b9f0842..2c55afbaa 100644 --- a/base/src/main/java/com/smartdevicelink/managers/ISdl.java +++ b/base/src/main/java/com/smartdevicelink/managers/ISdl.java @@ -89,8 +89,8 @@ public interface ISdl { /** * Starts the video streaming service * - * @param parameters desired video streaming params for this service to be started with - * @param encrypted flag to start this service with encryption or not + * @param parameters desired video streaming params for this service to be started with + * @param encrypted flag to start this service with encryption or not * @param withPendingRestart flag to start this service right after OnSystemCapabilityUpdated */ void startVideoService(VideoStreamingParameters parameters, boolean encrypted, boolean withPendingRestart); diff --git a/base/src/main/java/com/smartdevicelink/managers/file/UploadFileOperation.java b/base/src/main/java/com/smartdevicelink/managers/file/UploadFileOperation.java index aab50a280..df2a4f3f7 100644 --- a/base/src/main/java/com/smartdevicelink/managers/file/UploadFileOperation.java +++ b/base/src/main/java/com/smartdevicelink/managers/file/UploadFileOperation.java @@ -244,7 +244,7 @@ class UploadFileOperation extends Task { try { this.inputStream.close(); } catch (IOException e) { - DebugTool.logError(TAG,"Error attempting to close input stream", e); + DebugTool.logError(TAG, "Error attempting to close input stream", e); } } @@ -353,7 +353,7 @@ class UploadFileOperation extends Task { try { bytesRead = inputStream.read(buffer, 0, size); } catch (IOException e) { - DebugTool.logError(TAG,"Error attempting to read from input stream", e); + DebugTool.logError(TAG, "Error attempting to read from input stream", e); } if (bytesRead > 0) { @@ -388,7 +388,7 @@ class UploadFileOperation extends Task { try { size = inputStream.available(); } catch (IOException e) { - DebugTool.logError(TAG,"Error trying to get input stream size", e); + DebugTool.logError(TAG, "Error trying to get input stream size", e); } } return size; diff --git a/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java b/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java index 6602e7085..2f0872d55 100644 --- a/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java @@ -153,7 +153,7 @@ abstract class BaseLifecycleManager { try { session.startSession(); } catch (SdlException e) { - DebugTool.logError(TAG,"Error attempting to start session", e); + DebugTool.logError(TAG, "Error attempting to start session", e); } } @@ -843,7 +843,7 @@ abstract class BaseLifecycleManager { } // HAX: Issue #1690, Ford Sync bug returning incorrect display capabilities (https://github.com/smartdevicelink/sdl_java_suite/issues/1690). Save the next desired layout type to the update capabilities when the SetDisplayLayout response is received if (FunctionID.SET_DISPLAY_LAYOUT.toString().equals(message.getFunctionName())) { - lastDisplayLayoutRequestTemplate = ((SetDisplayLayout)message).getDisplayLayout(); + lastDisplayLayoutRequestTemplate = ((SetDisplayLayout) message).getDisplayLayout(); } } else if (RPCMessage.KEY_RESPONSE.equals(message.getMessageType())) { // Response Specifics RPCResponse response = (RPCResponse) message; @@ -871,7 +871,7 @@ abstract class BaseLifecycleManager { session.sendMessage(pm); } catch (OutOfMemoryError e) { - DebugTool.logError(TAG,"Error attempting to send RPC message.", e); + DebugTool.logError(TAG, "Error attempting to send RPC message.", e); } } @@ -1034,7 +1034,7 @@ abstract class BaseLifecycleManager { @Override public void addServiceListener(SessionType serviceType, ISdlServiceListener sdlServiceListener) { synchronized (BaseLifecycleManager.this) { - if(BaseLifecycleManager.this.session != null ){ + if (BaseLifecycleManager.this.session != null) { BaseLifecycleManager.this.session.addServiceListener(serviceType, sdlServiceListener); } } @@ -1125,11 +1125,11 @@ abstract class BaseLifecycleManager { @Override public SdlMsgVersion getSdlMsgVersion() { SdlMsgVersion msgVersion; - if(rpcSpecVersion != null) { + if (rpcSpecVersion != null) { msgVersion = new SdlMsgVersion(rpcSpecVersion.getMajor(), rpcSpecVersion.getMinor()); msgVersion.setPatchVersion(rpcSpecVersion.getPatch()); } else { - msgVersion = new SdlMsgVersion(1,0); + msgVersion = new SdlMsgVersion(1, 0); } return msgVersion; @@ -1272,6 +1272,7 @@ abstract class BaseLifecycleManager { /** * Using the vehicle type information, specifically the make, the library will attempt to init * the security library that is associated with that OEM. + * * @param vehicleType type of vehicle that is currently connected */ private void setSecurityLibraryIfAvailable(VehicleType vehicleType) { @@ -1328,7 +1329,7 @@ abstract class BaseLifecycleManager { abstract void cycle(SdlDisconnectedReason disconnectedReason); - void saveVehicleType(String address, VehicleType type){ + void saveVehicleType(String address, VehicleType type) { } void saveVehicleType(List<TransportRecord> activeTransports, VehicleType type) { diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/AlertView.java b/base/src/main/java/com/smartdevicelink/managers/screen/AlertView.java index f69011170..4d0076014 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/AlertView.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/AlertView.java @@ -98,7 +98,7 @@ public class AlertView implements Cloneable { * Timeout in seconds. Defaults to 0, which will use `defaultTimeout`. If this is set below the * minimum, it will be capped at 3 seconds. Minimum 3 seconds, maximum 10 seconds. If this is * set above the maximum, it will be capped at 10 seconds. Defaults to 0. - * + * <p> * Please note that if a button is added to the alert, the defaultTimeout and timeout values will be ignored. */ public Builder setTimeout(Integer timeout) { diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/BaseAlertManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/BaseAlertManager.java index 10db9c54c..51bf5d2bb 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/BaseAlertManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/BaseAlertManager.java @@ -95,6 +95,7 @@ abstract class BaseAlertManager extends BaseSubManager { /** * Starts the manager + * * @param listener CompletionListener that is called once the BaseSubManager's state is READY, LIMITED, or ERROR */ @Override 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 4372cda9f..7a55d5e18 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/BaseScreenManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/BaseScreenManager.java @@ -738,7 +738,7 @@ abstract class BaseScreenManager extends BaseSubManager { * Used across managers to check and assign SoftButton ID's to prevent conflicts. * * @param softButtonObjects - list of SoftButtonObjects - * @param location - location from which the button came from, so if new buttons get set on screen, we can clear the old ID's out + * @param location - location from which the button came from, so if new buttons get set on screen, we can clear the old ID's out * @return True if ButtonID's are good, False if not. */ static boolean checkAndAssignButtonIds(List<SoftButtonObject> softButtonObjects, @ManagerLocation int location) { diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/BaseSoftButtonManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/BaseSoftButtonManager.java index 4d93be501..b2e727885 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/BaseSoftButtonManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/BaseSoftButtonManager.java @@ -298,7 +298,7 @@ abstract class BaseSoftButtonManager extends BaseSubManager { return; } - if (!BaseScreenManager.checkAndAssignButtonIds(softButtonObjects, BaseScreenManager.ManagerLocation.SOFTBUTTON_MANAGER)) { + if (!BaseScreenManager.checkAndAssignButtonIds(softButtonObjects, BaseScreenManager.ManagerLocation.SOFTBUTTON_MANAGER)) { DebugTool.logError(TAG, "Attempted to set soft button objects, but multiple buttons had the same id"); return; } diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/DispatchGroup.java b/base/src/main/java/com/smartdevicelink/managers/screen/DispatchGroup.java index f6dccb715..352f0bbc4 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/DispatchGroup.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/DispatchGroup.java @@ -38,20 +38,25 @@ package com.smartdevicelink.managers.screen; class DispatchGroup { private int count; private Runnable runnable; + DispatchGroup() { count = 0; } + synchronized void enter() { count++; } + synchronized void leave() { count--; run(); } + void notify(Runnable runnable) { this.runnable = runnable; run(); } + private void run() { if (count <= 0 && runnable != null) { runnable.run(); diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/PresentAlertOperation.java b/base/src/main/java/com/smartdevicelink/managers/screen/PresentAlertOperation.java index 9957ad309..f2085bd42 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/PresentAlertOperation.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/PresentAlertOperation.java @@ -62,7 +62,7 @@ import java.util.Map; /** * Operation that handles uploading images and audio data needed by the alert and, once the data uploads are complete, sending the alert. - * + * <p> * Created by Julian Kast on 12/10/20. */ public class PresentAlertOperation extends Task { @@ -156,6 +156,7 @@ public class PresentAlertOperation extends Task { /** * Checks the `AlertView` data to make sure it conforms to the RPC Spec, which says that at least either `alertText1`, `alertText2` or `TTSChunks` need to be provided. + * * @param alertView - Alert data that needs to be presented * @return true if AlertView data conforms to RPC Spec */ @@ -194,7 +195,7 @@ public class PresentAlertOperation extends Task { List<SdlFile> filesToBeUploaded = new ArrayList<>(); for (TTSChunk ttsChunk : alertView.getAudio().getAudioData()) { - if(ttsChunk.getType() != SpeechCapabilities.FILE){ + if (ttsChunk.getType() != SpeechCapabilities.FILE) { continue; } SdlFile audioFile = alertView.getAudio().getAudioFiles().get(ttsChunk.getText()); @@ -300,7 +301,7 @@ public class PresentAlertOperation extends Task { public void onResponse(int correlationId, RPCResponse response) { if (!response.getSuccess()) { DebugTool.logError(TAG, "There was an error presenting the alert: " + response.getInfo()); - } else { + } else { DebugTool.logInfo(TAG, "Alert finished presenting"); } finishOperation(response.getSuccess(), ((AlertResponse) response).getTryAgainTime()); @@ -395,18 +396,19 @@ public class PresentAlertOperation extends Task { /** * Checks if AudioFiles are supported by module and removes them form audioData list if they are not + * * @param alertView * @return List of ttsChunks */ private List<TTSChunk> getTTSChunksForAlert(AlertView alertView) { AlertAudioData alertAudioData = alertView.getAudio(); List<TTSChunk> ttsChunks = new ArrayList<>(); - for (TTSChunk chunk : alertAudioData.getAudioData()) { - if (chunk.getType() == SpeechCapabilities.FILE && !supportsAlertAudioFile()) { - continue; - } - ttsChunks.add(chunk); + for (TTSChunk chunk : alertAudioData.getAudioData()) { + if (chunk.getType() == SpeechCapabilities.FILE && !supportsAlertAudioFile()) { + continue; } + ttsChunks.add(chunk); + } return ttsChunks.size() > 0 ? ttsChunks : null; } @@ -446,7 +448,7 @@ public class PresentAlertOperation extends Task { if (nonNullFields.isEmpty()) { return alert; } - int numberOfLines = currentWindowCapability!= null ? ManagerUtility.WindowCapabilityUtility.getMaxNumberOfAlertFieldLines(currentWindowCapability) : 3; + int numberOfLines = currentWindowCapability != null ? ManagerUtility.WindowCapabilityUtility.getMaxNumberOfAlertFieldLines(currentWindowCapability) : 3; switch (numberOfLines) { case 1: alert = assembleOneLineAlertText(alert, nonNullFields); diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/SoftButtonObject.java b/base/src/main/java/com/smartdevicelink/managers/screen/SoftButtonObject.java index 76301bc07..68d486080 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/SoftButtonObject.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/SoftButtonObject.java @@ -50,7 +50,7 @@ import java.util.List; * * @see SoftButtonState */ -public class SoftButtonObject implements Cloneable{ +public class SoftButtonObject implements Cloneable { private static final String TAG = "SoftButtonObject"; static final int SOFT_BUTTON_ID_NOT_SET_VALUE = -1; static final int SOFT_BUTTON_ID_MIN_VALUE = 0; diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/SoftButtonReplaceOperation.java b/base/src/main/java/com/smartdevicelink/managers/screen/SoftButtonReplaceOperation.java index c6578ff2e..b157c4cb9 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/SoftButtonReplaceOperation.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/SoftButtonReplaceOperation.java @@ -116,7 +116,7 @@ class SoftButtonReplaceOperation extends Task { List<SdlArtwork> initialStatesToBeUploaded = new ArrayList<>(); for (SoftButtonObject softButtonObject : softButtonObjects) { SoftButtonState softButtonState = softButtonObject.getCurrentState(); - if (softButtonState != null && fileManager.get()!= null && fileManager.get().fileNeedsUpload(softButtonState.getArtwork()) && supportsSoftButtonImages()) { + if (softButtonState != null && fileManager.get() != null && fileManager.get().fileNeedsUpload(softButtonState.getArtwork()) && supportsSoftButtonImages()) { initialStatesToBeUploaded.add(softButtonState.getArtwork()); } } diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceCell.java b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceCell.java index 46d478000..9a4f1bedb 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceCell.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceCell.java @@ -40,7 +40,7 @@ import com.smartdevicelink.util.DebugTool; import java.util.ArrayList; import java.util.List; -public class ChoiceCell implements Cloneable{ +public class ChoiceCell implements Cloneable { private String text, secondaryText, tertiaryText; private List<String> voiceCommands; private SdlArtwork artwork, secondaryArtwork; diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSet.java b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSet.java index d38cf9713..2ae8371e8 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSet.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSet.java @@ -68,10 +68,10 @@ public class ChoiceSet { /** * Initialize with a title, listener, and choices. It will use the default timeout and layout, * all other properties (such as prompts) will be `null`. - * - * NOTE: If you display multiple cells with the same `text` with the only uniquing property between cells being different `vrCommands` or a feature that is not displayed on the head unit (e.g. if the head unit doesn't display `secondaryArtwork` and that's the only uniquing property between two cells) then the cells may appear to be the same to the user in `Manual` mode. This only applies to RPC connections >= 7.1.0. - * - * NOTE: On < 7.1.0 connections, the `text` cell will be automatically modified among cells that have the same `text` when they are preloaded, so they will always appear differently on-screen when they are displayed. `choiceCell.uniqueText` will be created by appending ` (2)`, ` (3)`, etc. + * <p> + * NOTE: If you display multiple cells with the same `text` with the only uniquing property between cells being different `vrCommands` or a feature that is not displayed on the head unit (e.g. if the head unit doesn't display `secondaryArtwork` and that's the only uniquing property between two cells) then the cells may appear to be the same to the user in `Manual` mode. This only applies to RPC connections >= 7.1.0. + * <p> + * NOTE: On < 7.1.0 connections, the `text` cell will be automatically modified among cells that have the same `text` when they are preloaded, so they will always appear differently on-screen when they are displayed. `choiceCell.uniqueText` will be created by appending ` (2)`, ` (3)`, etc. * * @param title - The choice set's title * @param listener - The choice set listener called after the user has interacted with your choice set @@ -93,10 +93,10 @@ public class ChoiceSet { /** * Constructor with all possible properties. - * - * NOTE: If you display multiple cells with the same `text` with the only uniquing property between cells being different `vrCommands` or a feature that is not displayed on the head unit (e.g. if the head unit doesn't display `secondaryArtwork` and that's the only uniquing property between two cells) then the cells may appear to be the same to the user in `Manual` mode. This only applies to RPC connections >= 7.1.0. - * - * NOTE: On < 7.1.0 connections, the `text` cell will be automatically modified among cells that have the same `text` when they are preloaded, so they will always appear differently on-screen when they are displayed. `choiceCell.uniqueText` will be created by appending ` (2)`, ` (3)`, etc. + * <p> + * NOTE: If you display multiple cells with the same `text` with the only uniquing property between cells being different `vrCommands` or a feature that is not displayed on the head unit (e.g. if the head unit doesn't display `secondaryArtwork` and that's the only uniquing property between two cells) then the cells may appear to be the same to the user in `Manual` mode. This only applies to RPC connections >= 7.1.0. + * <p> + * NOTE: On < 7.1.0 connections, the `text` cell will be automatically modified among cells that have the same `text` when they are preloaded, so they will always appear differently on-screen when they are displayed. `choiceCell.uniqueText` will be created by appending ` (2)`, ` (3)`, etc. * * @param title - The choice set's title * @param listener - The choice set listener called after the user has interacted with your choice set @@ -138,10 +138,10 @@ public class ChoiceSet { /** * Constructor with all possible properties. - * - * NOTE: If you display multiple cells with the same `text` with the only uniquing property between cells being different `vrCommands` or a feature that is not displayed on the head unit (e.g. if the head unit doesn't display `secondaryArtwork` and that's the only uniquing property between two cells) then the cells may appear to be the same to the user in `Manual` mode. This only applies to RPC connections >= 7.1.0. - * - * NOTE: On < 7.1.0 connections, the `text` cell will be automatically modified among cells that have the same `text` when they are preloaded, so they will always appear differently on-screen when they are displayed. `choiceCell.uniqueText` will be created by appending ` (2)`, ` (3)`, etc. + * <p> + * NOTE: If you display multiple cells with the same `text` with the only uniquing property between cells being different `vrCommands` or a feature that is not displayed on the head unit (e.g. if the head unit doesn't display `secondaryArtwork` and that's the only uniquing property between two cells) then the cells may appear to be the same to the user in `Manual` mode. This only applies to RPC connections >= 7.1.0. + * <p> + * NOTE: On < 7.1.0 connections, the `text` cell will be automatically modified among cells that have the same `text` when they are preloaded, so they will always appear differently on-screen when they are displayed. `choiceCell.uniqueText` will be created by appending ` (2)`, ` (3)`, etc. * * @param title - The choice set's title * @param listener - The choice set listener called after the user has interacted with your choice set @@ -320,7 +320,7 @@ public class ChoiceSet { * If this is set above the maximum, it will be capped at 100 seconds. */ public void setTimeout(Integer timeout) { - this.timeout = timeout; + this.timeout = timeout; } public int getDefaultTimeout() { diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadPresentChoicesOperation.java b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadPresentChoicesOperation.java index 91a32ea0b..fd3dc9792 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadPresentChoicesOperation.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadPresentChoicesOperation.java @@ -40,8 +40,10 @@ import androidx.annotation.NonNull; import com.livio.taskmaster.Task; import com.smartdevicelink.managers.CompletionListener; import com.smartdevicelink.managers.ISdl; + import static com.smartdevicelink.managers.ManagerUtility.WindowCapabilityUtility.hasImageFieldOfName; import static com.smartdevicelink.managers.ManagerUtility.WindowCapabilityUtility.hasTextFieldOfName; + import com.smartdevicelink.managers.file.FileManager; import com.smartdevicelink.managers.file.MultipleFileCompletionListener; import com.smartdevicelink.managers.file.filetypes.SdlArtwork; @@ -110,6 +112,7 @@ class PreloadPresentChoicesOperation extends Task { Integer selectedCellRow; KeyboardListener keyboardListener; final SdlMsgVersion sdlMsgVersion; + private enum SDLPreloadPresentChoicesOperationState { NOT_STARTED, UPLOADING_IMAGES, @@ -120,10 +123,11 @@ class PreloadPresentChoicesOperation extends Task { RESETTING_KEYBOARD_PROPERTIES, FINISHING } + private SDLPreloadPresentChoicesOperationState currentState; PreloadPresentChoicesOperation(ISdl internalInterface, FileManager fileManager, String displayName, WindowCapability defaultWindowCapability, - Boolean isVROptional, LinkedHashSet<ChoiceCell> cellsToPreload, HashSet<ChoiceCell> loadedCells, BaseChoiceSetManager.ChoicesOperationCompletionListener listener) { + Boolean isVROptional, LinkedHashSet<ChoiceCell> cellsToPreload, HashSet<ChoiceCell> loadedCells, BaseChoiceSetManager.ChoicesOperationCompletionListener listener) { super("PreloadPresentChoiceOperation"); this.internalInterface = new WeakReference<>(internalInterface); this.fileManager = new WeakReference<>(fileManager); @@ -207,14 +211,14 @@ class PreloadPresentChoicesOperation extends Task { @Override public void onComplete(boolean success) { // If some artworks failed to upload, we are still going to try to load the cells - if (getState()==CANCELED || !success) { + if (getState() == CANCELED || !success) { finishOperation(false); return; } preloadCells(new CompletionListener() { @Override public void onComplete(boolean success) { - if (getState()==CANCELED || !success) { + if (getState() == CANCELED || !success) { finishOperation(false); return; } @@ -227,7 +231,7 @@ class PreloadPresentChoicesOperation extends Task { updateKeyboardProperties(new CompletionListener() { @Override public void onComplete(boolean success) { - if (getState()==CANCELED || !success) { + if (getState() == CANCELED || !success) { finishOperation(false); return; } @@ -383,7 +387,7 @@ class PreloadPresentChoicesOperation extends Task { void resetKeyboardProperties(final CompletionListener listener) { this.currentState = SDLPreloadPresentChoicesOperationState.RESETTING_KEYBOARD_PROPERTIES; if (this.keyboardListener == null || this.originalKeyboardProperties == null) { - if(listener != null) { + if (listener != null) { listener.onComplete(true); finishOperation(true); return; @@ -482,7 +486,7 @@ class PreloadPresentChoicesOperation extends Task { DebugTool.logInfo(TAG, "Canceling the operation before a present."); this.cancelTask(); return; - }else if (sdlMsgVersion.getMajorVersion() < 6) { + } else if (sdlMsgVersion.getMajorVersion() < 6) { DebugTool.logWarning(TAG, "Canceling a presented choice set is not supported on this head unit"); this.cancelTask(); return; @@ -591,7 +595,7 @@ class PreloadPresentChoicesOperation extends Task { int lastUsedId = usedIds.get(usedIds.size() - 1); if (lastUsedId < MAX_CHOICE_ID) { choiceId = lastUsedId + 1; - return choiceId; + return choiceId; } // All our easy options are gone. Find and grab an empty slot from within the sorted list @@ -646,7 +650,7 @@ class PreloadPresentChoicesOperation extends Task { } private void transferUniqueNamesFromCells(ArrayList<ChoiceCell> fromCells, ArrayList<ChoiceCell> toCells) { - for (int i = 0; i< fromCells.size(); i++) { + for (int i = 0; i < fromCells.size(); i++) { toCells.get(i).setUniqueTextId(fromCells.get(i).getUniqueTextId()); } } @@ -711,7 +715,7 @@ class PreloadPresentChoicesOperation extends Task { ArrayList<Integer> uniqueIds = dictCounter.get(cellKey); Integer lowestMissingUniqueId = uniqueIds.get(uniqueIds.size() - 1) + 1; for (int i = 1; i < dictCounter.get(cellKey).size() + 1; i++) { - if (i != dictCounter.get(cellKey).get(i -1)) { + if (i != dictCounter.get(cellKey).get(i - 1)) { lowestMissingUniqueId = i; break; } diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseVoiceCommandManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseVoiceCommandManager.java index 9c5c39c21..0cf2549cb 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseVoiceCommandManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseVoiceCommandManager.java @@ -76,7 +76,7 @@ abstract class BaseVoiceCommandManager extends BaseSubManager { this.transactionQueue = newTransactionQueue(); - currentHMILevel = null; + currentHMILevel = null; addListeners(); lastVoiceCommandId = voiceCommandIdMin; } diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/menu/DynamicMenuUpdateAlgorithm.java b/base/src/main/java/com/smartdevicelink/managers/screen/menu/DynamicMenuUpdateAlgorithm.java index b6fa0266c..23e815a57 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/menu/DynamicMenuUpdateAlgorithm.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/menu/DynamicMenuUpdateAlgorithm.java @@ -110,9 +110,10 @@ class DynamicMenuUpdateAlgorithm { /** * Builds a 1-1 list of Deletes for every element in the array + * * @param oldMenu The old menu list */ - static List<MenuCellState> buildAllDeleteStatusesForMenu (List<MenuCell> oldMenu){ + static List<MenuCellState> buildAllDeleteStatusesForMenu(List<MenuCell> oldMenu) { List<MenuCellState> oldMenuStatus = new ArrayList<>(oldMenu.size()); for (int index = 0; index < oldMenu.size(); index++) { oldMenuStatus.add(MenuCellState.DELETE); @@ -122,9 +123,10 @@ class DynamicMenuUpdateAlgorithm { /** * Builds a 1-1 list of Adds for every element in the list + * * @param newMenu The new menu list */ - static List<MenuCellState> buildAllAddStatusesForMenu (List<MenuCell> newMenu){ + static List<MenuCellState> buildAllAddStatusesForMenu(List<MenuCell> newMenu) { List<MenuCellState> newMenuStatus = new ArrayList<>(newMenu.size()); for (int index = 0; index < newMenu.size(); index++) { newMenuStatus.add(MenuCellState.ADD); diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuCell.java b/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuCell.java index eaf91ae76..f854aba82 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuCell.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuCell.java @@ -133,13 +133,13 @@ public class MenuCell implements Cloneable { /** * Creates a new MenuCell Object with multiple parameters and optional fields set * - * @param title The cell's primary text - * @param secondaryText The cell's secondary text - * @param tertiaryText The cell's tertiary text - * @param icon The cell's image - * @param secondaryArtwork The cell's secondary image - * @param voiceCommands Voice commands that will activate the menu cell - * @param listener Calls the code that will be run when the menu cell is selected + * @param title The cell's primary text + * @param secondaryText The cell's secondary text + * @param tertiaryText The cell's tertiary text + * @param icon The cell's image + * @param secondaryArtwork The cell's secondary image + * @param voiceCommands Voice commands that will activate the menu cell + * @param listener Calls the code that will be run when the menu cell is selected */ public MenuCell(@NonNull String title, @Nullable String secondaryText, @Nullable String tertiaryText, @Nullable SdlArtwork icon, @Nullable SdlArtwork secondaryArtwork, @Nullable List<String> voiceCommands, @Nullable MenuSelectionListener listener) { setTitle(title); // title is the only required param @@ -181,14 +181,14 @@ public class MenuCell implements Cloneable { * Creates a new MenuCell Object with multiple parameters and optional fields set * <strong>NOTE: because this has sub-cells, there does not need to be a listener</strong> * - * @param title The cell's primary text - * @param secondaryText The cell's secondary text - * @param tertiaryText The cell's tertiary text - * @param subMenuLayout The submenu's layout that the subCells will be shown in. If `null`, the - * default submenu layout in the screen manager's `MenuConfiguration` will be used. - * @param icon The cell's image - * @param secondaryArtwork The cell's secondary image - * @param subCells The sub-cells for the sub menu that will appear when the cell is selected + * @param title The cell's primary text + * @param secondaryText The cell's secondary text + * @param tertiaryText The cell's tertiary text + * @param subMenuLayout The submenu's layout that the subCells will be shown in. If `null`, the + * default submenu layout in the screen manager's `MenuConfiguration` will be used. + * @param icon The cell's image + * @param secondaryArtwork The cell's secondary image + * @param subCells The sub-cells for the sub menu that will appear when the cell is selected */ public MenuCell(@NonNull String title, @Nullable String secondaryText, @Nullable String tertiaryText, @Nullable MenuLayout subMenuLayout, @Nullable SdlArtwork icon, @Nullable SdlArtwork secondaryArtwork, @Nullable List<MenuCell> subCells) { setTitle(title); // title is the only required param @@ -388,7 +388,7 @@ public class MenuCell implements Cloneable { * * @return the cell's tertiaryText */ - public String getTertiaryText(){ + public String getTertiaryText() { return tertiaryText; } @@ -406,7 +406,7 @@ public class MenuCell implements Cloneable { * * @return the cell's secondaryArtwork */ - public SdlArtwork getSecondaryArtwork(){ + public SdlArtwork getSecondaryArtwork() { return secondaryArtwork; } diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuConfiguration.java b/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuConfiguration.java index 9ae1ae28d..29399a219 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuConfiguration.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuConfiguration.java @@ -104,6 +104,7 @@ public class MenuConfiguration { /** * Note: You should compare using the {@link #equals(Object)} method. <br> * Hash the parameters of the object and return the result for comparison + * * @return the hash code as an int */ @Override 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 2e9711dda..6bec48097 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 @@ -173,7 +173,7 @@ class MenuReplaceUtilities { return cell.isSubMenuCell() ? hasImageFieldOfName(windowCapability, ImageFieldName.menuSubMenuSecondaryImage) : hasImageFieldOfName(windowCapability, ImageFieldName.menuCommandSecondaryImage); } - // If there is an icon and the icon has been uploaded, or if the icon is a static icon, it should include the image + // If there is an icon and the icon has been uploaded, or if the icon is a static icon, it should include the image static boolean shouldCellIncludePrimaryImageFromCell(ISdl internalInterface, MenuCell cell, FileManager fileManager, WindowCapability windowCapability) { boolean supportsImage = windowCapabilitySupportsPrimaryImage(internalInterface, windowCapability, cell); return cell.getIcon() != null && supportsImage && (fileManager.hasUploadedFile(cell.getIcon()) || cell.getIcon().isStaticIcon()); diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/menu/SendingRPCsCompletionListener.java b/base/src/main/java/com/smartdevicelink/managers/screen/menu/SendingRPCsCompletionListener.java index 1339df1eb..b5f4f3b3c 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/menu/SendingRPCsCompletionListener.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/menu/SendingRPCsCompletionListener.java @@ -42,5 +42,6 @@ import java.util.Map; */ interface SendingRPCsCompletionListener { void onComplete(boolean success, Map<RPCRequest, String> errors); + void onResponse(RPCRequest request, RPCResponse response); } diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/menu/VoiceCommandUpdateOperation.java b/base/src/main/java/com/smartdevicelink/managers/screen/menu/VoiceCommandUpdateOperation.java index 0650ab388..1144e1479 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/menu/VoiceCommandUpdateOperation.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/menu/VoiceCommandUpdateOperation.java @@ -206,7 +206,7 @@ class VoiceCommandUpdateOperation extends Task { private void sendCurrentVoiceCommands(final CompletionListener listener) { - List<VoiceCommand> voiceCommandsToAdd = voiceCommandsInListNotInSecondList(pendingVoiceCommands, oldVoiceCommands); + List<VoiceCommand> voiceCommandsToAdd = voiceCommandsInListNotInSecondList(pendingVoiceCommands, oldVoiceCommands); if (voiceCommandsToAdd.size() == 0) { if (listener != null) { diff --git a/base/src/main/java/com/smartdevicelink/protocol/SdlProtocolBase.java b/base/src/main/java/com/smartdevicelink/protocol/SdlProtocolBase.java index f7dd797d0..fcee5a80f 100644 --- a/base/src/main/java/com/smartdevicelink/protocol/SdlProtocolBase.java +++ b/base/src/main/java/com/smartdevicelink/protocol/SdlProtocolBase.java @@ -1566,7 +1566,7 @@ public class SdlProtocolBase { * This method will return copy of active transports * * @return a list of active transports - * */ + */ public List<TransportRecord> getActiveTransports() { List<TransportRecord> records = new ArrayList<>(); for (TransportRecord record : activeTransports.values()) { diff --git a/base/src/main/java/com/smartdevicelink/protocol/SecurityQueryPayload.java b/base/src/main/java/com/smartdevicelink/protocol/SecurityQueryPayload.java index a41052c0d..bc588a1cd 100644 --- a/base/src/main/java/com/smartdevicelink/protocol/SecurityQueryPayload.java +++ b/base/src/main/java/com/smartdevicelink/protocol/SecurityQueryPayload.java @@ -163,7 +163,7 @@ public class SecurityQueryPayload { } public void setBulkData(byte[] _bulkData) { - if(_bulkData == null) { + if (_bulkData == null) { this._bulkDataSize = 0; this._bulkData = null; return; diff --git a/base/src/main/java/com/smartdevicelink/proxy/RPCStruct.java b/base/src/main/java/com/smartdevicelink/proxy/RPCStruct.java index 1db39f2e9..3ef92f936 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/RPCStruct.java +++ b/base/src/main/java/com/smartdevicelink/proxy/RPCStruct.java @@ -270,7 +270,7 @@ public class RPCStruct implements Cloneable { return customObject;
} catch (Exception e) {
- DebugTool.logError(TAG,"Error attempting to format an object from a Hashtable", e);
+ DebugTool.logError(TAG, "Error attempting to format an object from a Hashtable", e);
}
} else if (obj instanceof List<?>) {
List<?> list = (List<?>) obj;
@@ -302,7 +302,7 @@ public class RPCStruct implements Cloneable { }
newList.add(customObject);
} catch (Exception e) {
- DebugTool.logError(TAG,"Error attempting to format object from list of Hashtables", e);
+ DebugTool.logError(TAG, "Error attempting to format object from list of Hashtables", e);
return null;
}
}
@@ -336,15 +336,15 @@ public class RPCStruct implements Cloneable { try {
valueForString = tClass.getDeclaredMethod("valueForString", String.class);
} catch (NoSuchMethodException e) {
- DebugTool.logError(TAG,"Error attempting to find valueForString method in class", e);
+ DebugTool.logError(TAG, "Error attempting to find valueForString method in class", e);
}
if (valueForString != null) {
try {
return valueForString.invoke(null, (String) s);
} catch (IllegalAccessException e) {
- DebugTool.logError(TAG,"Illegal access while using reflection to get enum from string", e);
+ DebugTool.logError(TAG, "Illegal access while using reflection to get enum from string", e);
} catch (InvocationTargetException e) {
- DebugTool.logError(TAG,"Error attempting to use method from reflection to get enum from string", e);
+ DebugTool.logError(TAG, "Error attempting to use method from reflection to get enum from string", e);
}
}
return null;
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/AddSubMenu.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/AddSubMenu.java index f1c1c7ecf..abfd3a3d1 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/AddSubMenu.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/AddSubMenu.java @@ -332,7 +332,7 @@ public class AddSubMenu extends RPCRequest { * Sets the secondaryText.
*
* @param secondaryText Optional secondary text to display
- * {"string_min_length": 1, "string_max_length": 500}
+ * {"string_min_length": 1, "string_max_length": 500}
* @since SmartDeviceLink 7.1.0
*/
public AddSubMenu setSecondaryText(String secondaryText) {
@@ -355,7 +355,7 @@ public class AddSubMenu extends RPCRequest { * Sets the tertiaryText.
*
* @param tertiaryText Optional tertiary text to display
- * {"string_min_length": 1, "string_max_length": 500}
+ * {"string_min_length": 1, "string_max_length": 500}
* @since SmartDeviceLink 7.1.0
*/
public AddSubMenu setTertiaryText(String tertiaryText) {
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/AppCapability.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/AppCapability.java index 213a4a758..2190c9ffb 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/AppCapability.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/AppCapability.java @@ -39,7 +39,6 @@ import com.smartdevicelink.proxy.rpc.enums.AppCapabilityType; import java.util.Hashtable; /** - * * <p><b>Parameter List</b></p> * * <table border="1" rules="all"> @@ -68,6 +67,7 @@ import java.util.Hashtable; * <td></td> * </tr> * </table> + * * @since SmartDeviceLink 7.1.0 */ public class AppCapability extends RPCStruct { @@ -77,7 +77,8 @@ public class AppCapability extends RPCStruct { /** * Constructs a new AppCapability object */ - public AppCapability() { } + public AppCapability() { + } /** * Constructs a new AppCapability object indicated by the Hashtable parameter @@ -92,7 +93,7 @@ public class AppCapability extends RPCStruct { * Constructs a new AppCapability object * * @param appCapabilityType Used as a descriptor of what data to expect in this struct. The corresponding param to - * this enum should be included and the only other param included. + * this enum should be included and the only other param included. */ public AppCapability(@NonNull AppCapabilityType appCapabilityType) { this(); @@ -103,7 +104,7 @@ public class AppCapability extends RPCStruct { * Sets the appCapabilityType. * * @param appCapabilityType Used as a descriptor of what data to expect in this struct. The corresponding param to - * this enum should be included and the only other param included. + * this enum should be included and the only other param included. */ public AppCapability setAppCapabilityType(@NonNull AppCapabilityType appCapabilityType) { setValue(KEY_APP_CAPABILITY_TYPE, appCapabilityType); diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/BodyInformation.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/BodyInformation.java index 90b7e0374..799bb6b78 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/BodyInformation.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/BodyInformation.java @@ -353,7 +353,7 @@ public class BodyInformation extends RPCStruct { * Sets the doorStatuses.
*
* @param doorStatuses Provides status for doors if Ajar/Closed/Locked
- * {"array_min_size": 0, "array_max_size": 100}
+ * {"array_min_size": 0, "array_max_size": 100}
* @since SmartDeviceLink 7.1.0
*/
public BodyInformation setDoorStatuses(List<DoorStatus> doorStatuses) {
@@ -377,7 +377,7 @@ public class BodyInformation extends RPCStruct { * Sets the gateStatuses.
*
* @param gateStatuses Provides status for trunk/hood/etc. if Ajar/Closed/Locked
- * {"array_min_size": 0, "array_max_size": 100}
+ * {"array_min_size": 0, "array_max_size": 100}
* @since SmartDeviceLink 7.1.0
*/
public BodyInformation setGateStatuses(List<GateStatus> gateStatuses) {
@@ -401,8 +401,8 @@ public class BodyInformation extends RPCStruct { * Sets the roofStatuses.
*
* @param roofStatuses Provides status for roof/convertible roof/sunroof/moonroof etc., if Closed/Ajar/Removed
- * etc.
- * {"array_min_size": 0, "array_max_size": 100}
+ * etc.
+ * {"array_min_size": 0, "array_max_size": 100}
* @since SmartDeviceLink 7.1.0
*/
public BodyInformation setRoofStatuses(List<RoofStatus> roofStatuses) {
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/ClimateData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/ClimateData.java index e44635163..fc9302469 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/ClimateData.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/ClimateData.java @@ -37,7 +37,6 @@ import com.smartdevicelink.util.SdlDataTypeConverter; import java.util.Hashtable; /** - * * <p><b>Parameter List</b></p> * * <table border="1" rules="all"> @@ -74,6 +73,7 @@ import java.util.Hashtable; * <td></td> * </tr> * </table> + * * @since SmartDeviceLink 7.1.0 */ public class ClimateData extends RPCStruct { @@ -84,7 +84,8 @@ public class ClimateData extends RPCStruct { /** * Constructs a new ClimateData object */ - public ClimateData() { } + public ClimateData() { + } /** * Constructs a new ClimateData object indicated by the Hashtable parameter @@ -137,7 +138,7 @@ public class ClimateData extends RPCStruct { * Sets the atmosphericPressure. * * @param atmosphericPressure Current atmospheric pressure in mBar - * {"num_min_value": 0.0, "num_max_value": 2000.0} + * {"num_min_value": 0.0, "num_max_value": 2000.0} */ public ClimateData setAtmosphericPressure(Float atmosphericPressure) { setValue(KEY_ATMOSPHERIC_PRESSURE, atmosphericPressure); diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/DoorStatus.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/DoorStatus.java index 777542085..93e12a629 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/DoorStatus.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/DoorStatus.java @@ -79,7 +79,8 @@ public class DoorStatus extends RPCStruct { /** * Constructs a new DoorStatus object */ - public DoorStatus() { } + public DoorStatus() { + } /** * Constructs a new DoorStatus object indicated by the Hashtable parameter diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/GateStatus.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/GateStatus.java index df000ecbc..6c5275d38 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/GateStatus.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/GateStatus.java @@ -79,7 +79,8 @@ public class GateStatus extends RPCStruct { /** * Constructs a new GateStatus object */ - public GateStatus() { } + public GateStatus() { + } /** * Constructs a new GateStatus object indicated by the Hashtable parameter diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleData.java index 005196f9b..8666de60f 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleData.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleData.java @@ -371,6 +371,7 @@ public class GetVehicleData extends RPCRequest { * @since SmartDeviceLink 7.1.0
*/
public static final String KEY_SEAT_OCCUPANCY = "seatOccupancy";
+
/**
* Constructs a new GetVehicleData object
*/
@@ -475,7 +476,7 @@ public class GetVehicleData extends RPCRequest { * Sets the externalTemperature.
*
* @param externalTemperature The external temperature in degrees celsius. This parameter is deprecated starting RPC
- * Spec 7.1.0, please see climateData.
+ * Spec 7.1.0, please see climateData.
* @since SmartDeviceLink 2.0.0
* @deprecated in SmartDeviceLink 7.1.0
*/
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleDataResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleDataResponse.java index 33ebf324f..c0d718e8f 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleDataResponse.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleDataResponse.java @@ -110,6 +110,7 @@ public class GetVehicleDataResponse extends RPCResponse { * @since SmartDeviceLink 7.1.0
*/
public static final String KEY_SEAT_OCCUPANCY = "seatOccupancy";
+
/**
* Constructs a new GetVehicleDataResponse object
*/
@@ -223,8 +224,8 @@ public class GetVehicleDataResponse extends RPCResponse { * Sets the externalTemperature.
*
* @param externalTemperature The external temperature in degrees celsius. This parameter is deprecated starting RPC
- * Spec 7.1.0, please see climateData.
- * {"num_min_value": -40.0, "num_max_value": 100.0}
+ * Spec 7.1.0, please see climateData.
+ * {"num_min_value": -40.0, "num_max_value": 100.0}
* @since SmartDeviceLink 2.0.0
* @deprecated in SmartDeviceLink 7.1.0
*/
@@ -648,6 +649,7 @@ public class GetVehicleDataResponse extends RPCResponse { public ClimateData getClimateData() {
return (ClimateData) getObject(ClimateData.class, KEY_CLIMATE_DATA);
}
+
/**
* Sets the seatOccupancy.
*
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/KeyboardCapabilities.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/KeyboardCapabilities.java index bc2fb4301..fecc821ed 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/KeyboardCapabilities.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/KeyboardCapabilities.java @@ -37,7 +37,6 @@ import java.util.Hashtable; import java.util.List; /** - * * <p><b>Parameter List</b></p> * * <table border="1" rules="all"> @@ -66,6 +65,7 @@ import java.util.List; * <td></td> * </tr> * </table> + * * @since SmartDeviceLink 7.1.0 */ public class KeyboardCapabilities extends RPCStruct { @@ -76,7 +76,8 @@ public class KeyboardCapabilities extends RPCStruct { /** * Constructs a new KeyboardCapabilities object */ - public KeyboardCapabilities() { } + public KeyboardCapabilities() { + } /** * Constructs a new KeyboardCapabilities object indicated by the Hashtable parameter @@ -91,7 +92,7 @@ public class KeyboardCapabilities extends RPCStruct { * Sets the maskInputCharactersSupported. * * @param maskInputCharactersSupported Availability of capability to mask input characters using keyboard. True: Available, - * False: Not Available + * False: Not Available */ public KeyboardCapabilities setMaskInputCharactersSupported(Boolean maskInputCharactersSupported) { setValue(KEY_MASK_INPUT_CHARACTERS_SUPPORTED, maskInputCharactersSupported); @@ -112,7 +113,7 @@ public class KeyboardCapabilities extends RPCStruct { * Sets the supportedKeyboards. * * @param supportedKeyboards Capabilities of supported keyboard layouts by HMI. - * {"array_max_size": 1000, "array_min_size": 1} + * {"array_max_size": 1000, "array_min_size": 1} */ public KeyboardCapabilities setSupportedKeyboards(List<KeyboardLayoutCapability> supportedKeyboards) { setValue(KEY_SUPPORTED_KEYBOARDS, supportedKeyboards); diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/KeyboardLayoutCapability.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/KeyboardLayoutCapability.java index cf3f13b9c..7972a4522 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/KeyboardLayoutCapability.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/KeyboardLayoutCapability.java @@ -79,7 +79,8 @@ public class KeyboardLayoutCapability extends RPCStruct { /** * Constructs a new KeyboardLayoutCapability object */ - public KeyboardLayoutCapability() { } + public KeyboardLayoutCapability() { + } /** * Constructs a new KeyboardLayoutCapability object indicated by the Hashtable parameter @@ -95,7 +96,7 @@ public class KeyboardLayoutCapability extends RPCStruct { * * @param keyboardLayout * @param numConfigurableKeys Number of keys available for special characters, App can customize as per their needs. - * {"num_max_value": 10, "num_min_value": 0} + * {"num_max_value": 10, "num_min_value": 0} */ public KeyboardLayoutCapability(@NonNull KeyboardLayout keyboardLayout, @NonNull Integer numConfigurableKeys) { this(); @@ -126,7 +127,7 @@ public class KeyboardLayoutCapability extends RPCStruct { * Sets the numConfigurableKeys. * * @param numConfigurableKeys Number of keys available for special characters, App can customize as per their needs. - * {"num_max_value": 10, "num_min_value": 0} + * {"num_max_value": 10, "num_min_value": 0} */ public KeyboardLayoutCapability setNumConfigurableKeys(@NonNull Integer numConfigurableKeys) { setValue(KEY_NUM_CONFIGURABLE_KEYS, numConfigurableKeys); diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/KeyboardProperties.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/KeyboardProperties.java index 619eb8f4d..7c1b6d3d3 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/KeyboardProperties.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/KeyboardProperties.java @@ -266,8 +266,8 @@ public class KeyboardProperties extends RPCStruct { * Sets the customKeys.
*
* @param customKeys Array of special characters to show in customizable keys. If omitted, keyboard will show
- * default special characters
- * {"string_max_length": 1, "string_min_length": 1, "array_max_size": 10, "array_min_size": 1}
+ * default special characters
+ * {"string_max_length": 1, "string_min_length": 1, "array_max_size": 10, "array_min_size": 1}
* @since SmartDeviceLink 7.1.0
*/
public KeyboardProperties setCustomKeys(List<String> customKeys) {
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/MenuParams.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/MenuParams.java index 727784651..aeec18fb5 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/MenuParams.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/MenuParams.java @@ -236,7 +236,7 @@ public class MenuParams extends RPCStruct { * Sets the secondaryText.
*
* @param secondaryText Optional secondary text to display
- * {"string_min_length": 1, "string_max_length": 500}
+ * {"string_min_length": 1, "string_max_length": 500}
* @since SmartDeviceLink 7.1.0
*/
public MenuParams setSecondaryText(String secondaryText) {
@@ -259,7 +259,7 @@ public class MenuParams extends RPCStruct { * Sets the tertiaryText.
*
* @param tertiaryText Optional tertiary text to display
- * {"string_min_length": 1, "string_max_length": 500}
+ * {"string_min_length": 1, "string_max_length": 500}
* @since SmartDeviceLink 7.1.0
*/
public MenuParams setTertiaryText(String tertiaryText) {
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java index 651349a82..32517dc31 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java @@ -326,7 +326,7 @@ import java.util.List; * <td>N</td>
* <td></td>
* <td>
- * @since SmartDeviceLink 7.1.0
+ * @since SmartDeviceLink 7.1.0
* </td>
* </tr>
* <tr>
@@ -409,6 +409,7 @@ public class OnVehicleData extends RPCNotification { * @since SmartDeviceLink 7.1.0
*/
public static final String KEY_SEAT_OCCUPANCY = "seatOccupancy";
+
public OnVehicleData() {
super(FunctionID.ON_VEHICLE_DATA.toString());
}
@@ -494,8 +495,8 @@ public class OnVehicleData extends RPCNotification { * Sets the externalTemperature.
*
* @param externalTemperature The external temperature in degrees celsius. This parameter is deprecated starting RPC
- * Spec 7.1.0, please see climateData.
- * {"num_min_value": -40.0, "num_max_value": 100.0}
+ * Spec 7.1.0, please see climateData.
+ * {"num_min_value": -40.0, "num_max_value": 100.0}
* @since SmartDeviceLink 2.0.0
* @deprecated in SmartDeviceLink 7.1.0
*/
@@ -923,6 +924,7 @@ public class OnVehicleData extends RPCNotification { public ClimateData getClimateData() {
return (ClimateData) getObject(ClimateData.class, KEY_CLIMATE_DATA);
}
+
/**
* Sets the seatOccupancy.
*
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/RegisterAppInterfaceResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/RegisterAppInterfaceResponse.java index d4ae5a706..6dbbbe9e8 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/RegisterAppInterfaceResponse.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/RegisterAppInterfaceResponse.java @@ -384,8 +384,9 @@ public class RegisterAppInterfaceResponse extends RPCResponse { /**
* Gets getVehicleType set when application interface is registered.
- * @deprecated in SmartDeviceLink 7.1.0
+ *
* @return vehicleType
+ * @deprecated in SmartDeviceLink 7.1.0
*/
@Deprecated
public VehicleType getVehicleType() {
@@ -394,8 +395,9 @@ public class RegisterAppInterfaceResponse extends RPCResponse { /**
* Sets vehicleType
- * @deprecated in SmartDeviceLink 7.1.0
+ *
* @param vehicleType
+ * @deprecated in SmartDeviceLink 7.1.0
*/
@Deprecated
public RegisterAppInterfaceResponse setVehicleType(VehicleType vehicleType) {
@@ -472,6 +474,7 @@ public class RegisterAppInterfaceResponse extends RPCResponse { /**
* The software version of the connected device.
+ *
* @param systemSoftwareVersion the version of software on the connected device
* @return RegisterAppInterface
* @deprecated in SmartDeviceLink 7.1.0
@@ -484,6 +487,7 @@ public class RegisterAppInterfaceResponse extends RPCResponse { /**
* The software version of the connected device.
+ *
* @return String the version of software on the connected device
* @deprecated in SmartDeviceLink 7.1.0
*/
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/RoofStatus.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/RoofStatus.java index 1bc28d7cf..8bf54ee13 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/RoofStatus.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/RoofStatus.java @@ -89,7 +89,8 @@ public class RoofStatus extends RPCStruct { /** * Constructs a new RoofStatus object */ - public RoofStatus() { } + public RoofStatus() { + } /** * Constructs a new RoofStatus object indicated by the Hashtable parameter diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/SeatOccupancy.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SeatOccupancy.java index c54ae0ef0..9aa329c8b 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/SeatOccupancy.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SeatOccupancy.java @@ -37,7 +37,6 @@ import java.util.Hashtable; import java.util.List; /** - * * <p><b>Parameter List</b></p> * * <table border="1" rules="all"> @@ -66,6 +65,7 @@ import java.util.List; * <td></td> * </tr> * </table> + * * @since SmartDeviceLink 7.1.0 */ public class SeatOccupancy extends RPCStruct { @@ -75,7 +75,8 @@ public class SeatOccupancy extends RPCStruct { /** * Constructs a new SeatOccupancy object */ - public SeatOccupancy() { } + public SeatOccupancy() { + } /** * Constructs a new SeatOccupancy object indicated by the Hashtable parameter @@ -90,7 +91,7 @@ public class SeatOccupancy extends RPCStruct { * Sets the seatsOccupied. * * @param seatsOccupied Seat status array containing location and whether the seats are occupied. - * {"array_min_size": 0, "array_max_size": 100} + * {"array_min_size": 0, "array_max_size": 100} */ public SeatOccupancy setSeatsOccupied(List<SeatStatus> seatsOccupied) { setValue(KEY_SEATS_OCCUPIED, seatsOccupied); @@ -112,7 +113,7 @@ public class SeatOccupancy extends RPCStruct { * Sets the seatsBelted. * * @param seatsBelted Seat status array containing location and whether the seats are belted. - * {"array_min_size": 0, "array_max_size": 100} + * {"array_min_size": 0, "array_max_size": 100} */ public SeatOccupancy setSeatsBelted(List<SeatStatus> seatsBelted) { setValue(KEY_SEATS_BELTED, seatsBelted); diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/SeatStatus.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SeatStatus.java index 65f60c8ff..57b7713bd 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/SeatStatus.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SeatStatus.java @@ -78,7 +78,8 @@ public class SeatStatus extends RPCStruct { /** * Constructs a new SeatStatus object */ - public SeatStatus() { } + public SeatStatus() { + } /** * Constructs a new SeatStatus object indicated by the Hashtable parameter diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/SeekStreamingIndicator.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SeekStreamingIndicator.java index 576543a07..8922e6334 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/SeekStreamingIndicator.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SeekStreamingIndicator.java @@ -79,7 +79,8 @@ public class SeekStreamingIndicator extends RPCStruct { /** * Constructs a new SeekStreamingIndicator object */ - public SeekStreamingIndicator() { } + public SeekStreamingIndicator() { + } /** * Constructs a new SeekStreamingIndicator object indicated by the Hashtable parameter @@ -123,9 +124,9 @@ public class SeekStreamingIndicator extends RPCStruct { * Sets the seekTime. * * @param seekTime If the type is TIME, this number of seconds may be present alongside the skip indicator. - * It will indicate the number of seconds that the currently playing media will skip forward - * or backward. - * {"num_min_value": 1, "num_max_value": 99} + * It will indicate the number of seconds that the currently playing media will skip forward + * or backward. + * {"num_min_value": 1, "num_max_value": 99} */ public SeekStreamingIndicator setSeekTime(Integer seekTime) { setValue(KEY_SEEK_TIME, seekTime); diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/SetMediaClockTimer.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SetMediaClockTimer.java index e0f3d551e..2442c5f94 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/SetMediaClockTimer.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SetMediaClockTimer.java @@ -99,7 +99,7 @@ import java.util.Hashtable; * <td>countRate</td>
* <td>Float</td>
* <td>The value of this parameter is the amount that the media clock timer will advance per 1.0 seconds of real time. Values less than 1.0 will therefore advance the timer slower than real-time, while values greater than 1.0 will advance the timer faster than real-time.e.g. If this parameter is set to `0.5`, the timer will advance one second per two seconds real-time, or at 50% speed. If this parameter is set to `2.0`, the timer will advance two seconds per one second real-time, or at 200% speed.</td>
-
+ *
* <td>N</td>
* <td>{"num_min_value": 0.1, "num_max_value": 100.0}</td>
* <td>
@@ -390,12 +390,12 @@ public class SetMediaClockTimer extends RPCRequest { * Sets the countRate.
*
* @param countRate The value of this parameter is the amount that the media clock timer will advance per 1.0
- * seconds of real time. Values less than 1.0 will therefore advance the timer slower than
- * real-time, while values greater than 1.0 will advance the timer faster than real-time.
- * e.g. If this parameter is set to `0.5`, the timer will advance one second per two seconds
- * real-time, or at 50% speed. If this parameter is set to `2.0`, the timer will advance two
- * seconds per one second real-time, or at 200% speed.
- * {"num_min_value": 0.1, "num_max_value": 100.0}
+ * seconds of real time. Values less than 1.0 will therefore advance the timer slower than
+ * real-time, while values greater than 1.0 will advance the timer faster than real-time.
+ * e.g. If this parameter is set to `0.5`, the timer will advance one second per two seconds
+ * real-time, or at 50% speed. If this parameter is set to `2.0`, the timer will advance two
+ * seconds per one second real-time, or at 200% speed.
+ * {"num_min_value": 0.1, "num_max_value": 100.0}
* @since SmartDeviceLink 7.1.0
*/
public SetMediaClockTimer setCountRate(Float countRate) {
@@ -424,7 +424,7 @@ public class SetMediaClockTimer extends RPCRequest { * Sets the forwardSeekIndicator.
*
* @param forwardSeekIndicator Used to control the forward seek button to either skip forward a set amount of time or to
- * the next track.
+ * the next track.
* @since SmartDeviceLink 7.1.0
*/
public SetMediaClockTimer setForwardSeekIndicator(SeekStreamingIndicator forwardSeekIndicator) {
@@ -447,7 +447,7 @@ public class SetMediaClockTimer extends RPCRequest { * Sets the backSeekIndicator.
*
* @param backSeekIndicator Used to control the forward seek button to either skip back a set amount of time or to the
- * previous track.
+ * previous track.
* @since SmartDeviceLink 7.1.0
*/
public SetMediaClockTimer setBackSeekIndicator(SeekStreamingIndicator backSeekIndicator) {
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/Show.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/Show.java index ce1dd1bb3..5c9e2e54f 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/Show.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/Show.java @@ -446,9 +446,9 @@ public class Show extends RPCRequest { * Sets the mediaClock.
*
* @param mediaClock Text value for MediaClock field. Has to be properly formatted by Mobile App according to
- * the module's capabilities. If this text is set, any automatic media clock updates
- * previously set with SetMediaClockTimer will be stopped.
- * {"string_min_length": 0, "string_max_length": 500}
+ * the module's capabilities. If this text is set, any automatic media clock updates
+ * previously set with SetMediaClockTimer will be stopped.
+ * {"string_min_length": 0, "string_max_length": 500}
* @since SmartDeviceLink 1.0.0
* @deprecated in SmartDeviceLink 7.1.0
*/
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/ShowConstantTbt.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/ShowConstantTbt.java index 22b85b5ff..68ebd7d31 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/ShowConstantTbt.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/ShowConstantTbt.java @@ -206,7 +206,7 @@ public class ShowConstantTbt extends RPCRequest { * Sets the distanceToManeuver. * * @param distanceToManeuver Distance (in meters) until next maneuver. May be used to calculate progress bar. - * {"num_min_value": 0.0, "num_max_value": 1000000000.0} + * {"num_min_value": 0.0, "num_max_value": 1000000000.0} * @since SmartDeviceLink 2.0.0 */ public ShowConstantTbt setDistanceToManeuver(Double distanceToManeuver) { @@ -229,8 +229,8 @@ public class ShowConstantTbt extends RPCRequest { * Sets the distanceToManeuverScale. * * @param distanceToManeuverScale Distance (in meters) from previous maneuver to next maneuver. May be used to calculate - * progress bar. - * {"num_min_value": 0.0, "num_max_value": 1000000000.0} + * progress bar. + * {"num_min_value": 0.0, "num_max_value": 1000000000.0} * @since SmartDeviceLink 2.0.0 */ public ShowConstantTbt setDistanceToManeuverScale(Double distanceToManeuverScale) { diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleData.java index 1b7b0fdc3..15158a4b2 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleData.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleData.java @@ -554,7 +554,7 @@ public class SubscribeVehicleData extends RPCRequest { * Sets the externalTemperature.
*
* @param externalTemperature The external temperature in degrees celsius. This parameter is deprecated starting RPC
- * Spec 7.1.0, please see climateData.
+ * Spec 7.1.0, please see climateData.
* @since SmartDeviceLink 2.0.0
* @deprecated in SmartDeviceLink 7.1.0
*/
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleDataResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleDataResponse.java index 7a268f0f3..eb9780cbf 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleDataResponse.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleDataResponse.java @@ -102,6 +102,7 @@ public class SubscribeVehicleDataResponse extends RPCResponse { * @since SmartDeviceLink 7.1.0
*/
public static final String KEY_SEAT_OCCUPANCY = "seatOccupancy";
+
/**
* Constructs a new SubscribeVehicleDataResponse object
*/
@@ -255,7 +256,7 @@ public class SubscribeVehicleDataResponse extends RPCResponse { * Sets the externalTemperature.
*
* @param externalTemperature The external temperature in degrees celsius. This parameter is deprecated starting RPC
- * Spec 7.1.0, please see climateData.
+ * Spec 7.1.0, please see climateData.
* @since SmartDeviceLink 2.0.0
* @deprecated in SmartDeviceLink 7.1.0
*/
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/TireStatus.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/TireStatus.java index 68c47cf50..bd7850480 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/TireStatus.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/TireStatus.java @@ -159,6 +159,7 @@ public class TireStatus extends RPCStruct { * @since SmartDeviceLink 2.0.0
*/
public static final String KEY_RIGHT_REAR = "rightRear";
+
public TireStatus() {
}
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleData.java index 3153e35eb..fca15f57e 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleData.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleData.java @@ -544,7 +544,7 @@ public class UnsubscribeVehicleData extends RPCRequest { * Sets the externalTemperature.
*
* @param externalTemperature The external temperature in degrees celsius. This parameter is deprecated starting RPC
- * Spec 7.1.0, please see climateData.
+ * Spec 7.1.0, please see climateData.
* @since SmartDeviceLink 2.0.0
* @deprecated in SmartDeviceLink 7.1.0
*/
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleDataResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleDataResponse.java index 114a1971a..372c6fc51 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleDataResponse.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleDataResponse.java @@ -102,6 +102,7 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { * @since SmartDeviceLink 7.1.0
*/
public static final String KEY_SEAT_OCCUPANCY = "seatOccupancy";
+
/**
* Constructs a new UnsubscribeVehicleDataResponse object
*/
@@ -256,7 +257,7 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { * Sets the externalTemperature.
*
* @param externalTemperature The external temperature in degrees celsius. This parameter is deprecated starting RPC
- * Spec 7.1.0, please see climateData.
+ * Spec 7.1.0, please see climateData.
* @since SmartDeviceLink 2.0.0
* @deprecated in SmartDeviceLink 7.1.0
*/
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/VideoStreamingCapability.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/VideoStreamingCapability.java index 6e1b6abbf..2b63ef2a0 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/VideoStreamingCapability.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/VideoStreamingCapability.java @@ -197,15 +197,14 @@ public class VideoStreamingCapability extends RPCStruct { * @since SmartDeviceLink 7.1.0 */ @SuppressWarnings("unchecked") - public List<VideoStreamingCapability> getAdditionalVideoStreamingCapabilities(){ + public List<VideoStreamingCapability> getAdditionalVideoStreamingCapabilities() { return (List<VideoStreamingCapability>) getObject(VideoStreamingCapability.class, KEY_ADDITIONAL_VIDEO_STREAMING_CAPABILITIES); } /** * Sets the additionalVideoStreamingCapabilities. * - * @param additionalVideoStreamingCapabilities - * {"array_min_size": 1, "array_max_size": 100} + * @param additionalVideoStreamingCapabilities {"array_min_size": 1, "array_max_size": 100} * @since SmartDeviceLink 7.1.0 */ public VideoStreamingCapability setAdditionalVideoStreamingCapabilities(List<VideoStreamingCapability> additionalVideoStreamingCapabilities) { diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/AppCapabilityType.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/AppCapabilityType.java index 79969528c..1cbd997e5 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/AppCapabilityType.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/AppCapabilityType.java @@ -42,13 +42,14 @@ public enum AppCapabilityType { /** * Convert String to AppCapabilityType + * * @param value String * @return AppCapabilityType */ public static AppCapabilityType valueForString(String value) { - try{ + try { return valueOf(value); - }catch(Exception e){ + } catch (Exception e) { return null; } } diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataType.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataType.java index 050a0169c..9255f8b08 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataType.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataType.java @@ -67,6 +67,7 @@ public enum VehicleDataType { VEHICLEDATA_CLIMATEDATA,
/**
* Notifies EXTERNTEMPData may be subscribed
+ *
* @deprecated since SmartDeviceLink 7.1.0
*/
@Deprecated
@@ -192,7 +193,7 @@ public enum VehicleDataType { * @since SmartDeviceLink 7.0.0
*/
VEHICLEDATA_GEARSTATUS,
- /**
+ /**
* @since SmartDeviceLink 7.1.0
*/
VEHICLEDATA_SEATOCCUPANCY;
diff --git a/base/src/main/java/com/smartdevicelink/session/BaseSdlSession.java b/base/src/main/java/com/smartdevicelink/session/BaseSdlSession.java index a33d3eb04..73221ec86 100644 --- a/base/src/main/java/com/smartdevicelink/session/BaseSdlSession.java +++ b/base/src/main/java/com/smartdevicelink/session/BaseSdlSession.java @@ -308,6 +308,7 @@ public abstract class BaseSdlSession implements ISdlProtocol, ISecurityInitializ /** * Extracts the SystemInfo out of a packet + * * @param packet should be a StartServiceACK for the RPC service * @return an instance of SystemInfo if the information is available, null otherwise */ @@ -514,7 +515,7 @@ public abstract class BaseSdlSession implements ISdlProtocol, ISecurityInitializ * Retrieves list of the active transports * * @return a list of active transports - * */ + */ @Nullable public List<TransportRecord> getActiveTransports() { if (this.sdlProtocol != null) { diff --git a/base/src/main/java/com/smartdevicelink/session/ISdlSessionListener.java b/base/src/main/java/com/smartdevicelink/session/ISdlSessionListener.java index 2f754a30e..863c52559 100644 --- a/base/src/main/java/com/smartdevicelink/session/ISdlSessionListener.java +++ b/base/src/main/java/com/smartdevicelink/session/ISdlSessionListener.java @@ -62,8 +62,8 @@ public interface ISdlSessionListener { * Called to indicate that a session has started with the connected SDL device. This means the * RPC and Bulk service types have also been started. * - * @param sessionID session ID associated with the session that was established - * @param version the protocol version that has been negotiated for this session + * @param sessionID session ID associated with the session that was established + * @param version the protocol version that has been negotiated for this session * @param systemInfo info about the device that this service is started */ void onSessionStarted(int sessionID, Version version, SystemInfo systemInfo); diff --git a/base/src/main/java/com/smartdevicelink/streaming/video/VideoStreamingParameters.java b/base/src/main/java/com/smartdevicelink/streaming/video/VideoStreamingParameters.java index 20d79bc45..977f120e0 100644 --- a/base/src/main/java/com/smartdevicelink/streaming/video/VideoStreamingParameters.java +++ b/base/src/main/java/com/smartdevicelink/streaming/video/VideoStreamingParameters.java @@ -88,6 +88,7 @@ public class VideoStreamingParameters { /** * deprecated constructor of VideoStreamingParameters. This constructor will be removed in the future version. + * * @param displayDensity * @param frameRate * @param bitrate @@ -109,6 +110,7 @@ public class VideoStreamingParameters { /** * new constructor of VideoStreamingParameters, which now has stableFrameRate param. + * * @param displayDensity * @param frameRate * @param bitrate @@ -312,9 +314,13 @@ public class VideoStreamingParameters { stableFrameRate = isStable; } - public double getScale() { return scale; } + public double getScale() { + return scale; + } - public double getPreferredDiagonal() { return preferredDiagonal; } + public double getPreferredDiagonal() { + return preferredDiagonal; + } @Override public String toString() { diff --git a/base/src/main/java/com/smartdevicelink/transport/SiphonServer.java b/base/src/main/java/com/smartdevicelink/transport/SiphonServer.java index 13c20370a..66019908c 100644 --- a/base/src/main/java/com/smartdevicelink/transport/SiphonServer.java +++ b/base/src/main/java/com/smartdevicelink/transport/SiphonServer.java @@ -107,7 +107,7 @@ public class SiphonServer { try {
SiphonServer.closeServer();
} catch (IOException e) {
- DebugTool.logError(TAG,"Error while trying to close siphon server", e);
+ DebugTool.logError(TAG, "Error while trying to close siphon server", e);
}
return m_listenPort;
diff --git a/base/src/main/java/com/smartdevicelink/util/BitConverter.java b/base/src/main/java/com/smartdevicelink/util/BitConverter.java index df507d6fe..1133579b9 100644 --- a/base/src/main/java/com/smartdevicelink/util/BitConverter.java +++ b/base/src/main/java/com/smartdevicelink/util/BitConverter.java @@ -107,7 +107,7 @@ public class BitConverter { /**
* @param sizeBuf byte array that will be converted to int
- * @param offset The position indicating where to begin converting.
+ * @param offset The position indicating where to begin converting.
* @return int converted from byte array,
* -1 if byte array is null,
* and 0 if the offset is greater than the length of the byte array
@@ -137,7 +137,7 @@ public class BitConverter { /**
* @param sizeBuf byte array that will be converted to short
- * @param offset The position indicating where to begin converting.
+ * @param offset The position indicating where to begin converting.
* @return short converted from byte array,
* -1 if byte array is null,
* and 0 if the offset is greater than the length of the byte array
diff --git a/base/src/main/java/com/smartdevicelink/util/FileUtls.java b/base/src/main/java/com/smartdevicelink/util/FileUtls.java index 747052415..c4db14e76 100644 --- a/base/src/main/java/com/smartdevicelink/util/FileUtls.java +++ b/base/src/main/java/com/smartdevicelink/util/FileUtls.java @@ -32,6 +32,7 @@ package com.smartdevicelink.util; import androidx.annotation.NonNull; + import com.smartdevicelink.BuildConfig; import java.io.ByteArrayOutputStream; @@ -74,7 +75,7 @@ public class FileUtls { try { return Files.readAllBytes(file.toPath()); } catch (IOException e) { - DebugTool.logError(TAG,"Error trying to get file data", e); + DebugTool.logError(TAG, "Error trying to get file data", e); } } } |