diff options
| author | Bilal Alsharifi <bilal.alsharifi@gmail.com> | 2020-09-16 13:47:38 -0400 |
|---|---|---|
| committer | Bilal Alsharifi <bilal.alsharifi@gmail.com> | 2020-09-16 13:47:38 -0400 |
| commit | ca572ffcc60b274b99236da4f6f46649062e32df (patch) | |
| tree | a7706c5e0d56897af0ee7d4e63b029dc7a0d13a3 /base/src/main/java/com/smartdevicelink/proxy | |
| parent | e297e68fd68e2302dc2d6fcd7b86798a863f7177 (diff) | |
| parent | de8e5c9a71ba2c4c793bcf6fcccbb964fe25853a (diff) | |
| download | sdl_android-ca572ffcc60b274b99236da4f6f46649062e32df.tar.gz | |
Merge branch 'develop' into feature/issue_1448_generate_deprecated_javadocfeature/issue_1448_generate_deprecated_javadoc
Diffstat (limited to 'base/src/main/java/com/smartdevicelink/proxy')
84 files changed, 395 insertions, 944 deletions
diff --git a/base/src/main/java/com/smartdevicelink/proxy/RPCMessage.java b/base/src/main/java/com/smartdevicelink/proxy/RPCMessage.java index 427379842..fd80c6cca 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/RPCMessage.java +++ b/base/src/main/java/com/smartdevicelink/proxy/RPCMessage.java @@ -47,8 +47,8 @@ public class RPCMessage extends RPCStruct { this(functionName, "request");
}
- protected RPCMessage(RPCMessage rpcm) {
- this(cloneStore(rpcm));
+ protected RPCMessage(RPCMessage rpcMessage) {
+ this(cloneStore(rpcMessage));
}
protected RPCMessage(RPCStruct rpcs) {
@@ -57,8 +57,8 @@ public class RPCMessage extends RPCStruct { }
public RPCMessage(String functionName, String messageType) {
- function = new Hashtable<String, Object>();
- parameters = new Hashtable<String, Object>();
+ function = new Hashtable<>();
+ parameters = new Hashtable<>();
this.messageType = messageType;
function.put(KEY_PARAMETERS, parameters);
@@ -94,7 +94,7 @@ public class RPCMessage extends RPCStruct { protected String messageType;
protected Hashtable<String, Object> parameters;
- protected Hashtable<String, Object> function;
+ protected final Hashtable<String, Object> function;
public String getFunctionName() {
return (String)function.get(KEY_FUNCTION_NAME);
diff --git a/base/src/main/java/com/smartdevicelink/proxy/RPCNotification.java b/base/src/main/java/com/smartdevicelink/proxy/RPCNotification.java index dd8388142..dfcd283a6 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/RPCNotification.java +++ b/base/src/main/java/com/smartdevicelink/proxy/RPCNotification.java @@ -29,29 +29,29 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package com.smartdevicelink.proxy;
-
-import java.util.Hashtable;
-
-public class RPCNotification extends RPCMessage {
-
- public RPCNotification(String functionName) {
- super(functionName, RPCMessage.KEY_NOTIFICATION);
- }
-
- public RPCNotification(Hashtable<String, Object> hash) {
- super(hash);
- }
-
- public RPCNotification(RPCMessage rpcMsg) {
- super(preprocessMsg(rpcMsg));
- }
-
- static RPCMessage preprocessMsg (RPCMessage rpcMsg) {
- if (rpcMsg.getMessageType() != RPCMessage.KEY_NOTIFICATION) {
- rpcMsg.messageType = RPCMessage.KEY_NOTIFICATION;
- }
-
- return rpcMsg;
- }
+package com.smartdevicelink.proxy; + +import java.util.Hashtable; + +public class RPCNotification extends RPCMessage { + + public RPCNotification(String functionName) { + super(functionName, RPCMessage.KEY_NOTIFICATION); + } + + public RPCNotification(Hashtable<String, Object> hash) { + super(hash); + } + + public RPCNotification(RPCMessage rpcMsg) { + super(preprocessMsg(rpcMsg)); + } + + static RPCMessage preprocessMsg (RPCMessage rpcMsg) { + if (!RPCMessage.KEY_NOTIFICATION.equals(rpcMsg.getMessageType())) { + rpcMsg.messageType = RPCMessage.KEY_NOTIFICATION; + } + + return rpcMsg; + } }
\ No newline at end of file diff --git a/base/src/main/java/com/smartdevicelink/proxy/RPCResponse.java b/base/src/main/java/com/smartdevicelink/proxy/RPCResponse.java index b0a3549dc..dd56b370f 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/RPCResponse.java +++ b/base/src/main/java/com/smartdevicelink/proxy/RPCResponse.java @@ -100,7 +100,7 @@ public class RPCResponse extends RPCMessage { }
static RPCMessage preprocessMsg (RPCMessage rpcMsg) {
- if (rpcMsg.getMessageType() != RPCMessage.KEY_RESPONSE) {
+ if (!RPCMessage.KEY_RESPONSE.equals(rpcMsg.getMessageType())) {
rpcMsg.messageType = RPCMessage.KEY_RESPONSE;
}
diff --git a/base/src/main/java/com/smartdevicelink/proxy/RPCStruct.java b/base/src/main/java/com/smartdevicelink/proxy/RPCStruct.java index e54694526..e7d915b1e 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/RPCStruct.java +++ b/base/src/main/java/com/smartdevicelink/proxy/RPCStruct.java @@ -57,7 +57,7 @@ public class RPCStruct { private Version rpcSpecVersion = null;
- protected Hashtable<String, Object> store = null;
+ protected Hashtable<String, Object> store;
public boolean getStoreValue(String key) { // for unit testing
return store.contains(key);
@@ -68,7 +68,7 @@ public class RPCStruct { }
public RPCStruct() {
- store = new Hashtable<String, Object>();
+ store = new Hashtable<>();
}
protected RPCStruct(RPCStruct rpcs) {
@@ -150,9 +150,9 @@ public class RPCStruct { }
/**
- * Cycles through parameters in this RPC to ensure they all get formated
+ * Cycles through parameters in this RPC to ensure they all get formatted
* @param rpcVersion version of the rpc spec that should be used to format this rpc
- * @param value the object to investigate if it needs to be formated
+ * @param value the object to investigate if it needs to be formatted
*/
private void internalFormat(Version rpcVersion, Object value) {
if(value instanceof RPCStruct) {
@@ -284,7 +284,7 @@ public class RPCStruct { } else if (tClass.isInstance(item)) {
return list;
} else if (item instanceof Hashtable) {
- List<Object> newList = new ArrayList<Object>();
+ List<Object> newList = new ArrayList<>();
Object customObject;
for (Object hashObj : list) {
try {
@@ -303,7 +303,7 @@ public class RPCStruct { }
return newList;
} else if (item instanceof String){
- List<Object> newList = new ArrayList<Object>();
+ List<Object> newList = new ArrayList<>();
for (Object hashObj : list) {
Object toAdd = getValueForString(tClass, (String) hashObj);
if (toAdd != null) {
diff --git a/base/src/main/java/com/smartdevicelink/proxy/interfaces/IAudioStreamListener.java b/base/src/main/java/com/smartdevicelink/proxy/interfaces/IAudioStreamListener.java deleted file mode 100644 index c39e6bee2..000000000 --- a/base/src/main/java/com/smartdevicelink/proxy/interfaces/IAudioStreamListener.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright (c) 2017, Xevo Inc. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * * Neither the name of the copyright holder nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -package com.smartdevicelink.proxy.interfaces; - -import com.smartdevicelink.managers.CompletionListener; - -import java.nio.ByteBuffer; - -/** - * A listener that receives audio streaming data from app. - */ -public interface IAudioStreamListener { - /** - * Sends a chunk of audio data to SDL Core. - * <p> - * Note: this method must not be called after SdlProxyBase.endAudioStream() is called. - * - * @param data Byte array containing audio data - * @param offset Starting offset in 'data' - * @param length Length of the data - * @param presentationTimeUs (Reserved for future use) Presentation timestamp (PTS) of the - * last audio sample data included in this chunk, in microseconds. - * It must be greater than the previous timestamp. - * Specify -1 if unknown. - * @throws ArrayIndexOutOfBoundsException When offset does not satisfy - * {@code 0 <= offset && offset <= data.length} - * or length does not satisfy - * {@code 0 < length && offset + length <= data.length} - */ - void sendAudio(byte[] data, int offset, int length, long presentationTimeUs) - throws ArrayIndexOutOfBoundsException; - - /** - * Sends a chunk of audio data to SDL Core. - * <p> - * Note: this method must not be called after SdlProxyBase.endAudioStream() is called. - * - * @param data Data chunk to send. Its position will be updated upon return. - * @param presentationTimeUs (Reserved for future use) Presentation timestamp (PTS) of the - * last audio sample data included in this chunk, in microseconds. - * It must be greater than the previous timestamp. - * Specify -1 if unknown. - * @param completionListener A completion listener that informs when the audio file is played - */ - void sendAudio(ByteBuffer data, long presentationTimeUs, CompletionListener completionListener); -} diff --git a/base/src/main/java/com/smartdevicelink/proxy/interfaces/ISdl.java b/base/src/main/java/com/smartdevicelink/proxy/interfaces/ISdl.java deleted file mode 100644 index d8a70b062..000000000 --- a/base/src/main/java/com/smartdevicelink/proxy/interfaces/ISdl.java +++ /dev/null @@ -1,209 +0,0 @@ -package com.smartdevicelink.proxy.interfaces; - -import androidx.annotation.NonNull; - -import com.livio.taskmaster.Taskmaster; -import com.smartdevicelink.managers.lifecycle.OnSystemCapabilityListener; -import com.smartdevicelink.managers.lifecycle.SystemCapabilityManager; -import com.smartdevicelink.protocol.enums.FunctionID; -import com.smartdevicelink.protocol.enums.SessionType; -import com.smartdevicelink.proxy.RPCMessage; -import com.smartdevicelink.proxy.RPCRequest; -import com.smartdevicelink.proxy.rpc.RegisterAppInterfaceResponse; -import com.smartdevicelink.proxy.rpc.SdlMsgVersion; -import com.smartdevicelink.proxy.rpc.enums.SystemCapabilityType; -import com.smartdevicelink.proxy.rpc.listeners.OnMultipleRequestListener; -import com.smartdevicelink.proxy.rpc.listeners.OnRPCListener; -import com.smartdevicelink.proxy.rpc.listeners.OnRPCNotificationListener; -import com.smartdevicelink.proxy.rpc.listeners.OnRPCRequestListener; -import com.smartdevicelink.streaming.audio.AudioStreamingCodec; -import com.smartdevicelink.streaming.audio.AudioStreamingParams; -import com.smartdevicelink.streaming.video.VideoStreamingParameters; -import com.smartdevicelink.util.Version; - -import java.util.List; - -/* - * Copyright (c) 2017 Livio, Inc. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following - * disclaimer in the documentation and/or other materials provided with the - * distribution. - * - * Neither the name of the Livio Inc. nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ -@SuppressWarnings("unused") -public interface ISdl { - - /** - * Starts the connection with the module - */ - void start(); - - /** - * Ends connection with the module - */ - void stop(); - - /** - * Method to check if the session is connected - * @return if there is a connected session - */ - boolean isConnected(); - - /** - * Add a service listener for a specific service type - * @param serviceType service type that the listener will be attached to - * @param sdlServiceListener listener for events that happen to the service - */ - void addServiceListener(SessionType serviceType, ISdlServiceListener sdlServiceListener); - - /** - * Remote a service listener for a specific service type - * @param serviceType service type that the listener was attached to - * @param sdlServiceListener service listener that was previously added for the service type - */ - void removeServiceListener(SessionType serviceType, ISdlServiceListener sdlServiceListener); - - /** - * Starts the video streaming service - * @param parameters desired video streaming params for this sevice to be started with - * @param encrypted flag to start this service with encryption or not - */ - void startVideoService(VideoStreamingParameters parameters, boolean encrypted); - - /** - * Starts the Audio streaming service - * @param encrypted flag to start this service with encryption or not - */ - void startAudioService(boolean encrypted); - - /** - * Pass an RPC message through the proxy to be sent to the connected module - * @param message RPCMessage that should be sent to the module - */ - void sendRPC(RPCMessage message); - - /** - * Pass a list of RPC messages through the proxy to be sent to core - * @param rpcs List of RPC messages - * @param listener OnMultipleRequestListener that is called between requests and after all are processed - */ - void sendRPCs(List<? extends RPCMessage> rpcs, final OnMultipleRequestListener listener); - - /** - * Takes a list of RPCMessages and sends it to SDL in a synchronous fashion. Responses are captured through callback on OnMultipleRequestListener. - * For sending requests asynchronously, use sendRequests <br> - * - * <strong>NOTE: This will override any listeners on individual RPCs</strong><br> - * - * <strong>ADDITIONAL NOTE: This only takes the type of RPCRequest for now, notifications and responses will be thrown out</strong> - * - * @param rpcs is the list of RPCMessages being sent - * @param listener listener for updates and completions - */ - void sendSequentialRPCs(final List<? extends RPCMessage> rpcs, final OnMultipleRequestListener listener); - - /** - * Add an OnRPCNotificationListener for specified notification - * @param notificationId FunctionID of the notification that is to be listened for - * @param listener listener that should be added for the notification ID - */ - void addOnRPCNotificationListener(FunctionID notificationId, OnRPCNotificationListener listener); - - /** - * Removes an OnRPCNotificationListener for specified notification - * @param notificationId FunctionID of the notification that was to be listened for - * @param listener listener that was previously added for the notification ID - */ - boolean removeOnRPCNotificationListener(FunctionID notificationId, OnRPCNotificationListener listener); - - /** - * Add an OnRPCRequestListener for specified request - * @param functionID FunctionID of the request that is to be listened for - * @param listener listener that should be added for the request ID - */ - void addOnRPCRequestListener(FunctionID functionID, OnRPCRequestListener listener); - - /** - * Removes an OnRPCRequestListener for specified request - * @param functionID FunctionID of the request that was to be listened for - * @param listener listener that was previously added for the request ID - */ - boolean removeOnRPCRequestListener(FunctionID functionID, OnRPCRequestListener listener); - - /** - * Add an OnRPCResponseListener for specified response - * @param responseId FunctionID of the response that is to be listened for - * @param listener listener that should be added for the response ID - */ - void addOnRPCListener(FunctionID responseId, OnRPCListener listener); - - /** - * Removes an OnRPCResponseListener for specified response - * @param responseId FunctionID of the response that was to be listened for - * @param listener listener that was previously added for the response ID - */ - boolean removeOnRPCListener(FunctionID responseId, OnRPCListener listener); - - /** - * Get RegisterAppInterfaceResponse - * @return the RegisterAppInterfaceResponse if available, null if not - */ - RegisterAppInterfaceResponse getRegisterAppInterfaceResponse(); - - /** - * Check to see if a transport is available to start/use the supplied service. - * @param serviceType the session that should be checked for transport availability - * @return true if there is either a supported - * transport currently connected or a transport is - * available to connect with for the supplied service type. - * <br>false if there is no - * transport connected to support the service type in question and - * no possibility in the foreseeable future. - */ - boolean isTransportForServiceAvailable(SessionType serviceType); - - /** - * Get the RPC specification version currently being used for the SDL messages - * @return SdlMsgVersion the current RPC specification version - */ - @NonNull SdlMsgVersion getSdlMsgVersion(); - - /** - * Get the protocol version of this session - * @return byte value representing WiPro version - */ - @NonNull Version getProtocolVersion(); - - /** - * Start encrypted RPC service - */ - void startRPCEncryption(); - - Taskmaster getTaskmaster(); - - SystemCapabilityManager getSystemCapabilityManager(); -} diff --git a/base/src/main/java/com/smartdevicelink/proxy/interfaces/ISdlServiceListener.java b/base/src/main/java/com/smartdevicelink/proxy/interfaces/ISdlServiceListener.java deleted file mode 100644 index 06c324cb3..000000000 --- a/base/src/main/java/com/smartdevicelink/proxy/interfaces/ISdlServiceListener.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following - * disclaimer in the documentation and/or other materials provided with the - * distribution. - * - * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its - * contributors may be used to endorse or promote products derived from this - * software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ -package com.smartdevicelink.proxy.interfaces; - - -import com.smartdevicelink.SdlConnection.SdlSession; -import com.smartdevicelink.protocol.enums.SessionType; - -public interface ISdlServiceListener { - public void onServiceStarted(SdlSession session, SessionType type, boolean isEncrypted); - public void onServiceEnded(SdlSession session, SessionType type); - public void onServiceError(SdlSession session, SessionType type, String reason); -} diff --git a/base/src/main/java/com/smartdevicelink/proxy/interfaces/IVideoStreamListener.java b/base/src/main/java/com/smartdevicelink/proxy/interfaces/IVideoStreamListener.java deleted file mode 100644 index f645b0d55..000000000 --- a/base/src/main/java/com/smartdevicelink/proxy/interfaces/IVideoStreamListener.java +++ /dev/null @@ -1,90 +0,0 @@ -/* - * Copyright (c) 2017, Xevo Inc. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * * Neither the name of the copyright holder nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -package com.smartdevicelink.proxy.interfaces; - -import java.nio.ByteBuffer; - -/** - * A listener that receives video streaming data from app. - */ -public interface IVideoStreamListener { - - /** - * Sends a chunk of data which represents a frame to SDL Core. - * <p> - * The format of the chunk should align with MediaCodec's "Compressed Buffer" format, i.e. it - * should contain a single video frame, and it should start and end on frame boundaries. - * Please refer to https://developer.android.com/reference/android/media/MediaCodec.html - * Also, for H.264 codec case the stream must be in byte-stream format (also known as Annex-B - * format). This isn't explained in the document above, but MediaCodec does output in this - * format. - * <p> - * In short, you can just provide MediaCodec's data outputs to this method without tweaking - * any data. - * <p> - * Note: this method must not be called after SdlProxyBase.endVideoStream() is called. - * - * @param data Byte array containing a video frame - * @param offset Starting offset in 'data' - * @param length Length of the data - * @param presentationTimeUs Presentation timestamp (PTS) of this frame, in microseconds. - * It must be greater than the previous timestamp. - * Specify -1 if unknown. - * @throws ArrayIndexOutOfBoundsException When offset does not satisfy - * {@code 0 <= offset && offset <= data.length} - * or length does not satisfy - * {@code 0 < length && offset + length <= data.length} - */ - void sendFrame(byte[] data, int offset, int length, long presentationTimeUs) - throws ArrayIndexOutOfBoundsException; - - /** - * Sends chunks of data which represent a frame to SDL Core. - * <p> - * The format of the chunk should align with MediaCodec's "Compressed Buffer" format, i.e. it - * should contain a single video frame, and it should start and end on frame boundaries. - * Please refer to https://developer.android.com/reference/android/media/MediaCodec.html - * Also, for H.264 codec case the stream must be in byte-stream format (also known as Annex-B - * format). This isn't explained in the document above, but MediaCodec does output in this - * format. - * <p> - * In short, you can just provide MediaCodec's data outputs to this method without tweaking - * any data. - * <p> - * Note: this method must not be called after SdlProxyBase.endVideoStream() is called. - * - * @param data Data chunk to send. Its position will be updated upon return. - * @param presentationTimeUs Presentation timestamp (PTS) of this frame, in microseconds. - * It must be greater than the previous timestamp. - * Specify -1 if unknown. - */ - void sendFrame(ByteBuffer data, long presentationTimeUs); -} diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/AddCommand.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/AddCommand.java index 57d0719a5..b3bb816e2 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/AddCommand.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/AddCommand.java @@ -66,7 +66,7 @@ import java.util.List; * <li>Choices having both MenuParams and VR synonym definitions</li>
* </ul>
*
-* <p><b>HMILevel needs to be FULL, LIMITED or BACKGROUD</b></p>
+* <p><b>HMILevel needs to be FULL, LIMITED or BACKGROUND</b></p>
*
* <p><b>Parameter List</b></p>
* <table border="1" rules="all">
@@ -185,7 +185,6 @@ public class AddCommand extends RPCRequest { * @return MenuParams -a MenuParams object
*
*/
- @SuppressWarnings("unchecked")
public MenuParams getMenuParams() {
return (MenuParams) getObject(MenuParams.class, KEY_MENU_PARAMS);
}
@@ -243,7 +242,6 @@ public class AddCommand extends RPCRequest { * @return Image -an Image object
* @since SmartDeviceLink 2.0
*/
- @SuppressWarnings("unchecked")
public Image getCmdIcon() {
return (Image) getObject(Image.class, KEY_CMD_ICON);
}
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 e2453a727..d989e8d36 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/AddSubMenu.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/AddSubMenu.java @@ -46,7 +46,7 @@ import java.util.Hashtable; * added to a SubMenu), and may only contain commands as children</p>
*
*
- * <p><b>HMILevel needs to be FULL, LIMITED or BACKGROUD</b></p>
+ * <p><b>HMILevel needs to be FULL, LIMITED or BACKGROUND</b></p>
*
* <p><b>Parameter List</b></p>
* <table border="1" rules="all">
@@ -260,7 +260,6 @@ public class AddSubMenu extends RPCRequest { * Gets the layout of the submenu screen.
* @return the MenuLayout
*/
- @SuppressWarnings("unchecked")
public MenuLayout getMenuLayout() {
return (MenuLayout) getObject(MenuLayout.class, KEY_MENU_LAYOUT);
}
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/Alert.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/Alert.java index dbb16c073..10a2039c8 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/Alert.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/Alert.java @@ -125,7 +125,7 @@ import java.util.List; * <tr>
* <td>softButtons</td>
* <td>SoftButton[]</td>
- * <td>Specifies the softbuttons, the apps wants to use in this alert.</td>
+ * <td>Specifies the soft buttons, the apps wants to use in this alert.</td>
* <td>N</td>
* <td>If omitted on supported displays, the alert will not have any SoftButton.ArrayMin: 0; ArrayMax: 4</td>
* <td>SmartDeviceLink 1.0</td>
@@ -439,7 +439,7 @@ public class Alert extends RPCRequest { public Alert setCancelID( Integer cancelID) {
setParameters(KEY_CANCEL_ID, cancelID);
return this;
- };
+ }
/**
* <p>Sets the Image
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/AudioPassThruCapabilities.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/AudioPassThruCapabilities.java index 769813bad..8311de9ac 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/AudioPassThruCapabilities.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/AudioPassThruCapabilities.java @@ -69,7 +69,7 @@ import java.util.Hashtable; * <tr>
* <td>audioType</td>
* <td>AudioType</td>
- * <td>Describes the audiotype for AudioPassThru
+ * <td>Describes the audioType for AudioPassThru
* </td>
* <td>SmartDeviceLink 2.0</td>
* </tr>
@@ -97,7 +97,7 @@ public class AudioPassThruCapabilities extends RPCStruct { * Constructs a newly allocated AudioPassThruCapabilities object
* @param samplingRate the sampling rate for AudioPassThru
* @param bitsPerSample the sample depth in bit for AudioPassThru
- * @param audioType the audiotype for AudioPassThru
+ * @param audioType the audioType for AudioPassThru
*/
public AudioPassThruCapabilities(@NonNull SamplingRate samplingRate, @NonNull BitsPerSample bitsPerSample, @NonNull AudioType audioType) {
this();
@@ -141,8 +141,8 @@ public class AudioPassThruCapabilities extends RPCStruct { }
/**
- * set the audiotype for AudioPassThru
- * @param audioType the audiotype for AudioPassThru
+ * set the audioType for AudioPassThru
+ * @param audioType the audioType for AudioPassThru
*/
public AudioPassThruCapabilities setAudioType(@NonNull AudioType audioType) {
setValue(KEY_AUDIO_TYPE, audioType);
@@ -150,8 +150,8 @@ public class AudioPassThruCapabilities extends RPCStruct { }
/**
- * get the audiotype for AudioPassThru
- * @return the audiotype for AudioPassThru
+ * get the audioType for AudioPassThru
+ * @return the audioType for AudioPassThru
*/
public AudioType getAudioType() {
return (AudioType) getObject(AudioType.class, KEY_AUDIO_TYPE);
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 61379d9dc..391d2928d 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/BodyInformation.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/BodyInformation.java @@ -56,7 +56,7 @@ import java.util.Hashtable; * <td>parkBrakeActive</td>
* <td>Boolean</td>
* <td>true</td>
- * <td>Describes, if the parkbreak is active. The information about the park brake: - true, if active - false if not.</td>
+ * <td>Describes, if the park break is active. The information about the park brake: - true, if active - false if not.</td>
* <td>SmartDeviceLink 2.0</td>
* </tr>
* <tr>
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/Choice.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/Choice.java index aca5f86d5..819cb7c63 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/Choice.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/Choice.java @@ -225,7 +225,6 @@ public class Choice extends RPCStruct { * Get the image
* @return the image of the choice
*/
- @SuppressWarnings("unchecked")
public Image getImage() {
return (Image) getObject(Image.class, KEY_IMAGE);
}
@@ -253,7 +252,6 @@ public class Choice extends RPCStruct { return this;
}
- @SuppressWarnings("unchecked")
public Image getSecondaryImage() {
return (Image) getObject(Image.class, KEY_SECONDARY_IMAGE);
}
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/ClusterModeStatus.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/ClusterModeStatus.java index 94b3aed05..f3113de0b 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/ClusterModeStatus.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/ClusterModeStatus.java @@ -67,13 +67,13 @@ import java.util.Hashtable; * <td>carModeStatus</td>
* <td>CarModeStatus</td>
* <td></td>
- * <td>Describes the carmode the vehicle is in.</td>
+ * <td>Describes the car mode the vehicle is in.</td>
* </tr>
* <tr>
* <td>powerModeStatus</td>
* <td>PowerModeStatus</td>
* <td>true</td>
- * <td>Describes the different powermodes</td>
+ * <td>Describes the different power modes</td>
* </tr>
*
* </table>
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/DeleteInteractionChoiceSet.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/DeleteInteractionChoiceSet.java index 3bfc56e72..06c36e1de 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/DeleteInteractionChoiceSet.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/DeleteInteractionChoiceSet.java @@ -46,7 +46,7 @@ import java.util.Hashtable; *
* <p>Function Group: Base</p>
*
- * <p><b>HMILevel needs to be FULL, LIMITED or BACKGROUD</b></p>
+ * <p><b>HMILevel needs to be FULL, LIMITED or BACKGROUND</b></p>
*
* <p>AudioStreamingState: Any</p>
*
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/DeviceStatus.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/DeviceStatus.java index 78ff3a91b..e3459f002 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/DeviceStatus.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/DeviceStatus.java @@ -80,7 +80,7 @@ import java.util.Hashtable; * <tr>
* <td>textMsgAvailable</td>
* <td>Boolean</td>
- * <td>A textmessage is available
+ * <td>A text message is available
* </td>
* <td>SmartDeviceLink 2.0</td>
* </tr>
@@ -166,7 +166,7 @@ public class DeviceStatus extends RPCStruct { * @param btIconOn the bluetooth connection established
* @param callActive a call is being active
* @param phoneRoaming the phone is in roaming mode
- * @param textMsgAvailable a textmessage is available
+ * @param textMsgAvailable a text message is available
* @param battLevelStatus battery level status
* @param stereoAudioOutputMuted the status of the stereo audio output channel
* @param monoAudioOutputMuted the status of the mono audio output channel
@@ -263,8 +263,8 @@ public class DeviceStatus extends RPCStruct { }
/**
- * get a textmessage is available
- * @return a textmessage is available
+ * get a text message is available
+ * @return a text message is available
*/
public Boolean getTextMsgAvailable() {
return getBoolean(KEY_TEXT_MSG_AVAILABLE);
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/DisplayCapabilities.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/DisplayCapabilities.java index 15d9c5f39..4fdc65560 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/DisplayCapabilities.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/DisplayCapabilities.java @@ -227,7 +227,7 @@ public class DisplayCapabilities extends RPCStruct { /**
* Get an array of MediaClockFormat elements, defining the valid string formats used in specifying the contents of the media clock field
- * @return the Veotor of mediaClockFormat
+ * @return the Vector of mediaClockFormat
*/
@SuppressWarnings("unchecked")
public List<MediaClockFormat> getMediaClockFormats() {
@@ -276,7 +276,6 @@ public class DisplayCapabilities extends RPCStruct { return this;
}
- @SuppressWarnings("unchecked")
public ScreenParams getScreenParams() {
return (ScreenParams) getObject(ScreenParams.class, KEY_SCREEN_PARAMS);
}
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/DisplayCapability.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/DisplayCapability.java index a071d915f..10b740cae 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/DisplayCapability.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/DisplayCapability.java @@ -72,7 +72,7 @@ public class DisplayCapability extends RPCStruct { * After registration, only windows with capabilities changed will be included. * Following cases will cause only affected windows to be included: * 1. App creates a new window. After the window is created, a system capability notification will be sent related only to the created window. - * 2. App sets a new template to the window. The new template changes window capabilties. The notification will reflect those changes to the single window. + * 2. App sets a new template to the window. The new template changes window capabilities. The notification will reflect those changes to the single window. */ public DisplayCapability setWindowCapabilities( List<WindowCapability> windowCapabilities) { setValue(KEY_WINDOW_CAPABILITIES, windowCapabilities); diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/DynamicUpdateCapabilities.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/DynamicUpdateCapabilities.java index d70523356..2468d369a 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/DynamicUpdateCapabilities.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/DynamicUpdateCapabilities.java @@ -52,14 +52,14 @@ import java.util.List; * <tr> * <td>supportedDynamicImageFieldNames</td> * <td>List<ImageFieldName></td> - * <td>An array of ImageFieldName values for which the system supports sending OnFileUpdatenotifications. If you send an Image struct for that image field with a name without havinguploaded the image data using PutFile that matches that name, the system will request thatyou upload the data with PutFile at a later point when the HMI needs it. The HMI will thendisplay the image in the appropriate field. If not sent, assume false.</td> + * <td>An array of ImageFieldName values for which the system supports sending OnFileUpdateNotifications. If you send an Image struct for that image field with a name without having uploaded the image data using PutFile that matches that name, the system will request that you upload the data with PutFile at a later point when the HMI needs it. The HMI will then display the image in the appropriate field. If not sent, assume false.</td> * <td>N</td> * <td></td> * </tr> * <tr> * <td>supportsDynamicSubMenus</td> * <td>Boolean</td> - * <td>If true, the head unit supports dynamic sub-menus by sending OnUpdateSubMenunotifications. If true, you should not send AddCommands that attach to a parentID for anAddSubMenu until OnUpdateSubMenu is received with the menuID. At that point, you shouldsend all AddCommands with a parentID that match the menuID. If not set, assume false.</td> + * <td>If true, the head unit supports dynamic sub-menus by sending OnUpdateSubMenuNotifications. If true, you should not send AddCommands that attach to a parentID for anAddSubMenu until OnUpdateSubMenu is received with the menuID. At that point, you should send all AddCommands with a parentID that match the menuID. If not set, assume false.</td> * <td>N</td> * <td></td> * </tr> diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/ECallInfo.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/ECallInfo.java index c1bd8d476..e4f6fbd38 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/ECallInfo.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/ECallInfo.java @@ -62,7 +62,7 @@ import java.util.Hashtable; * <tr>
* <td>auxECallNotificationStatus</td>
* <td>VehicleDataNotificationStatus</td>
- * <td>References signal "eCallNotification". This is an alternative signal available on some carlines replacing the eCallNotificationStatus, but showing the same values.</td>
+ * <td>References signal "eCallNotification". This is an alternative signal available on some car lines replacing the eCallNotificationStatus, but showing the same values.</td>
* <td></td>
* <td></td>
* <td>SmartDeviceLink 2.0</td>
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/EqualizerSettings.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/EqualizerSettings.java index 509545143..430341342 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/EqualizerSettings.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/EqualizerSettings.java @@ -94,7 +94,7 @@ public class EqualizerSettings extends RPCStruct { /** * Sets the channelName portion of the EqualizerSettings class * - * @param channelName Read-only channel / frequency name (e.i. "Treble, Midrange, Bass" or "125 Hz"). + * @param channelName Read-only channel / frequency name (e.i. "Treble, MidRange, Bass" or "125 Hz"). */ public EqualizerSettings setChannelName( String channelName) { setValue(KEY_CHANNEL_NAME, channelName); @@ -104,7 +104,7 @@ public class EqualizerSettings extends RPCStruct { /** * Gets the channelName portion of the EqualizerSettings class * - * @return String - Read-only channel / frequency name (e.i. "Treble, Midrange, Bass" or "125 Hz"). + * @return String - Read-only channel / frequency name (e.i. "Treble, MidRange, Bass" or "125 Hz"). */ public String getChannelName() { return getString(KEY_CHANNEL_NAME); diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/FuelRange.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/FuelRange.java index 549ce6862..1c6885649 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/FuelRange.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/FuelRange.java @@ -95,7 +95,7 @@ import java.util.Hashtable; * <tr> * <td>capacityUnit</td> * <td>CapacityUnit</td> - * <td>The unit of the capacity of this fuel type such as liters for gasoline or kWh forbatteries.</td> + * <td>The unit of the capacity of this fuel type such as liters for gasoline or kWh for batteries.</td> * <td>N</td> * <td></td> * <td>SmartDeviceLink 7.0.0</td> diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/GPSData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/GPSData.java index 98d85a739..e259636e6 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/GPSData.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/GPSData.java @@ -41,7 +41,7 @@ import com.smartdevicelink.util.SdlDataTypeConverter; import java.util.Hashtable;
/**
- * Describes the GPS data. Not all data will be available on all carlines.
+ * Describes the GPS data. Not all data will be available on all car lines.
* <p><b>Parameter List</b></p>
* <table border="1" rules="all">
* <tr>
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/GearStatus.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/GearStatus.java index dbae57a2a..b1dac965c 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/GearStatus.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/GearStatus.java @@ -95,7 +95,7 @@ public class GearStatus extends RPCStruct { /** * Sets the userSelectedGear. * - * @param userSelectedGear Gear position selected by the user i.e. Park, Drive, Reverse + * @param selectedGear Gear position selected by the user i.e. Park, Drive, Reverse */ public GearStatus setUserSelectedGear( PRNDL selectedGear) { setValue(KEY_USER_SELECTED_GEAR, selectedGear); @@ -107,7 +107,6 @@ public class GearStatus extends RPCStruct { * * @return PRNDL Gear position selected by the user i.e. Park, Drive, Reverse */ - @SuppressWarnings("unchecked") public PRNDL getUserSelectedGear(){ return (PRNDL)getObject(PRNDL.class, KEY_USER_SELECTED_GEAR); } @@ -127,7 +126,6 @@ public class GearStatus extends RPCStruct { * * @return PRNDL Actual Gear in use by the transmission */ - @SuppressWarnings("unchecked") public PRNDL getActualGear(){ return (PRNDL)getObject(PRNDL.class, KEY_ACTUAL_GEAR); } diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/GetInteriorVehicleData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetInteriorVehicleData.java index 3b2a5098b..f5bc028ff 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/GetInteriorVehicleData.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetInteriorVehicleData.java @@ -104,8 +104,8 @@ public class GetInteriorVehicleData extends RPCRequest { * Sets subscribe parameter * * @param subscribe - * If subscribe is true, the head unit will register onInteriorVehicleData notifications for the requested moduelType. - * If subscribe is false, the head unit will unregister onInteriorVehicleData notifications for the requested moduelType. + * If subscribe is true, the head unit will register onInteriorVehicleData notifications for the requested moduleType. + * If subscribe is false, the head unit will unregister onInteriorVehicleData notifications for the requested moduleType. */ public GetInteriorVehicleData setSubscribe( Boolean subscribe) { setParameters(KEY_SUBSCRIBE, subscribe); 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 e5480b584..654089853 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleData.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleData.java @@ -84,7 +84,7 @@ import java.util.Hashtable; * <tr>
* <td>fuelLevel_State</td>
* <td>Boolean</td>
- * <td>The fuel level state. This parameter is deprecated starting RPC Spec 7.0, please seefuelRange.</td>
+ * <td>The fuel level state. This parameter is deprecated starting RPC Spec 7.0, please see fuelRange.</td>
* <td>N</td>
* <td>Subscribable</td>
* <td>SmartDeviceLink 7.0.0</td>
@@ -92,7 +92,7 @@ import java.util.Hashtable; * <tr>
* <td>fuelRange</td>
* <td>Boolean</td>
- * <td>The fuel type, estimated range in KM, fuel level/capacity and fuel level state for thevehicle. See struct FuelRange for details.</td>
+ * <td>The fuel type, estimated range in KM, fuel level/capacity and fuel level state for the vehicle. See struct FuelRange for details.</td>
* <td>N</td>
* <td>Subscribable</td>
* <td>SmartDeviceLink 5.0.0</td>
@@ -100,7 +100,7 @@ import java.util.Hashtable; * <tr>
* <td>instantFuelConsumption</td>
* <td>Boolean</td>
- * <td>The instantaneous fuel consumption in microlitres</td>
+ * <td>The instantaneous fuel consumption in micro litres</td>
* <td>N</td>
* <td>Subscribable</td>
* <td>SmartDeviceLink 2.0</td>
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 fd1636edb..fc1abcf53 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleDataResponse.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleDataResponse.java @@ -121,7 +121,6 @@ public class GetVehicleDataResponse extends RPCResponse { setParameters(KEY_GPS, gps);
return this;
}
- @SuppressWarnings("unchecked")
public GPSData getGps() {
return (GPSData) getObject(GPSData.class, KEY_GPS);
}
@@ -155,7 +154,6 @@ public class GetVehicleDataResponse extends RPCResponse { * @return a ComponentVolumeStatus related to FuelLevel State
*/
@Deprecated
- @SuppressWarnings("unchecked")
public ComponentVolumeStatus getFuelLevelState() {
return (ComponentVolumeStatus) getObject(ComponentVolumeStatus.class, KEY_FUEL_LEVEL_STATE);
}
@@ -235,7 +233,6 @@ public class GetVehicleDataResponse extends RPCResponse { setParameters(KEY_TIRE_PRESSURE, tirePressure);
return this;
}
- @SuppressWarnings("unchecked")
public TireStatus getTirePressure() {
return (TireStatus) getObject(TireStatus.class, KEY_TIRE_PRESSURE);
}
@@ -250,7 +247,6 @@ public class GetVehicleDataResponse extends RPCResponse { setParameters(KEY_BELT_STATUS, beltStatus);
return this;
}
- @SuppressWarnings("unchecked")
public BeltStatus getBeltStatus() {
return (BeltStatus) getObject(BeltStatus.class, KEY_BELT_STATUS);
}
@@ -258,7 +254,6 @@ public class GetVehicleDataResponse extends RPCResponse { setParameters(KEY_BODY_INFORMATION, bodyInformation);
return this;
}
- @SuppressWarnings("unchecked")
public BodyInformation getBodyInformation() {
return (BodyInformation) getObject(BodyInformation.class, KEY_BODY_INFORMATION);
}
@@ -266,7 +261,6 @@ public class GetVehicleDataResponse extends RPCResponse { setParameters(KEY_DEVICE_STATUS, deviceStatus);
return this;
}
- @SuppressWarnings("unchecked")
public DeviceStatus getDeviceStatus() {
return (DeviceStatus) getObject(DeviceStatus.class, KEY_DEVICE_STATUS);
}
@@ -289,7 +283,6 @@ public class GetVehicleDataResponse extends RPCResponse { setParameters(KEY_HEAD_LAMP_STATUS, headLampStatus);
return this;
}
- @SuppressWarnings("unchecked")
public HeadLampStatus getHeadLampStatus() {
return (HeadLampStatus) getObject(HeadLampStatus.class, KEY_HEAD_LAMP_STATUS);
}
@@ -332,7 +325,6 @@ public class GetVehicleDataResponse extends RPCResponse { setParameters(KEY_E_CALL_INFO, eCallInfo);
return this;
}
- @SuppressWarnings("unchecked")
public ECallInfo getECallInfo() {
return (ECallInfo) getObject(ECallInfo.class, KEY_E_CALL_INFO);
}
@@ -341,7 +333,6 @@ public class GetVehicleDataResponse extends RPCResponse { setParameters(KEY_AIRBAG_STATUS, airbagStatus);
return this;
}
- @SuppressWarnings("unchecked")
public AirbagStatus getAirbagStatus() {
return (AirbagStatus) getObject(AirbagStatus.class, KEY_AIRBAG_STATUS);
}
@@ -350,7 +341,6 @@ public class GetVehicleDataResponse extends RPCResponse { setParameters(KEY_EMERGENCY_EVENT, emergencyEvent);
return this;
}
- @SuppressWarnings("unchecked")
public EmergencyEvent getEmergencyEvent() {
return (EmergencyEvent) getObject(EmergencyEvent.class, KEY_EMERGENCY_EVENT);
}
@@ -358,7 +348,6 @@ public class GetVehicleDataResponse extends RPCResponse { setParameters(KEY_CLUSTER_MODE_STATUS, clusterModeStatus);
return this;
}
- @SuppressWarnings("unchecked")
public ClusterModeStatus getClusterModeStatus() {
return (ClusterModeStatus) getObject(ClusterModeStatus.class, KEY_CLUSTER_MODE_STATUS);
}
@@ -366,7 +355,6 @@ public class GetVehicleDataResponse extends RPCResponse { setParameters(KEY_MY_KEY, myKey);
return this;
}
- @SuppressWarnings("unchecked")
public MyKey getMyKey() {
return (MyKey) getObject(MyKey.class, KEY_MY_KEY);
}
@@ -410,7 +398,6 @@ public class GetVehicleDataResponse extends RPCResponse { *
* @see com.smartdevicelink.proxy.rpc.enums.TurnSignal
*/
- @SuppressWarnings("unchecked")
public TurnSignal getTurnSignal() {
return (TurnSignal) getObject(TurnSignal.class, KEY_TURN_SIGNAL);
}
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/Headers.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/Headers.java index 6226dc991..f8eed013b 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/Headers.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/Headers.java @@ -67,8 +67,8 @@ public class Headers extends RPCStruct { super(hash);
}
- public Headers setContentType( String contenttype) {
- setValue(KEY_CONTENT_TYPE, contenttype);
+ public Headers setContentType( String contentType) {
+ setValue(KEY_CONTENT_TYPE, contentType);
return this;
}
@@ -76,8 +76,8 @@ public class Headers extends RPCStruct { return getString(KEY_CONTENT_TYPE);
}
- public Headers setConnectTimeout( Integer connectiontimeout) {
- setValue(KEY_CONNECT_TIMEOUT, connectiontimeout);
+ public Headers setConnectTimeout( Integer connectionTimeout) {
+ setValue(KEY_CONNECT_TIMEOUT, connectionTimeout);
return this;
}
@@ -85,8 +85,8 @@ public class Headers extends RPCStruct { return getInteger(KEY_CONNECT_TIMEOUT);
}
- public Headers setDoOutput( Boolean dooutput) {
- setValue(KEY_DO_OUTPUT, dooutput);
+ public Headers setDoOutput( Boolean doOutput) {
+ setValue(KEY_DO_OUTPUT, doOutput);
return this;
}
@@ -94,8 +94,8 @@ public class Headers extends RPCStruct { return getBoolean(KEY_DO_OUTPUT);
}
- public Headers setDoInput( Boolean doinput) {
- setValue(KEY_DO_INPUT, doinput);
+ public Headers setDoInput( Boolean doInput) {
+ setValue(KEY_DO_INPUT, doInput);
return this;
}
@@ -103,8 +103,8 @@ public class Headers extends RPCStruct { return getBoolean(KEY_DO_INPUT);
}
- public Headers setUseCaches( Boolean usescaches) {
- setValue(KEY_USE_CACHES, usescaches);
+ public Headers setUseCaches( Boolean usesCaches) {
+ setValue(KEY_USE_CACHES, usesCaches);
return this;
}
@@ -112,8 +112,8 @@ public class Headers extends RPCStruct { return getBoolean(KEY_USE_CACHES);
}
- public Headers setRequestMethod( String requestmethod) {
- setValue(KEY_REQUEST_METHOD, requestmethod);
+ public Headers setRequestMethod( String requestMethod) {
+ setValue(KEY_REQUEST_METHOD, requestMethod);
return this;
}
@@ -122,8 +122,8 @@ public class Headers extends RPCStruct { }
- public Headers setReadTimeout( Integer readtimeout) {
- setValue(KEY_READ_TIMEOUT, readtimeout);
+ public Headers setReadTimeout( Integer readTimeout) {
+ setValue(KEY_READ_TIMEOUT, readTimeout);
return this;
}
@@ -131,8 +131,8 @@ public class Headers extends RPCStruct { return getInteger(KEY_READ_TIMEOUT);
}
- public Headers setInstanceFollowRedirects( Boolean instancefollowredirects) {
- setValue(KEY_INSTANCE_FOLLOW_REDIRECTS, instancefollowredirects);
+ public Headers setInstanceFollowRedirects( Boolean instanceFollowRedirects) {
+ setValue(KEY_INSTANCE_FOLLOW_REDIRECTS, instanceFollowRedirects);
return this;
}
@@ -149,8 +149,8 @@ public class Headers extends RPCStruct { return getString(KEY_CHARSET);
}
- public Headers setContentLength( Integer contentlength) {
- setValue(KEY_CONTENT_LENGTH, contentlength);
+ public Headers setContentLength( Integer contentLength) {
+ setValue(KEY_CONTENT_LENGTH, contentLength);
return this;
}
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/Image.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/Image.java index 1d5b57e26..0cf1ef12a 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/Image.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/Image.java @@ -39,7 +39,7 @@ import com.smartdevicelink.proxy.rpc.enums.ImageType; import java.util.Hashtable;
/**
- *Specifies, which image shall be used, e.g. in Alerts or on Softbuttons provided the display supports it.
+ *Specifies, which image shall be used, e.g. in Alerts or on SoftButtons provided the display supports it.
*<p><b>Parameter List</b></p>
* <table border="1" rules="all">
* <tr>
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/ImageField.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/ImageField.java index 0e4748072..6fa2e3651 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/ImageField.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/ImageField.java @@ -120,7 +120,6 @@ public class ImageField extends RPCStruct { setValue(KEY_IMAGE_TYPE_SUPPORTED, imageTypeSupported);
return this;
}
- @SuppressWarnings("unchecked")
public ImageResolution getImageResolution() {
return (ImageResolution) getObject(ImageResolution.class, KEY_IMAGE_RESOLUTION);
}
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/ImageResolution.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/ImageResolution.java index 151075bab..ab326ed06 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/ImageResolution.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/ImageResolution.java @@ -132,7 +132,7 @@ public class ImageResolution extends RPCStruct { @Override
public String toString() {
- return "width=" + String.valueOf(getResolutionWidth()) +
- ", height=" + String.valueOf(getResolutionHeight());
+ return "width=" + getResolutionWidth() +
+ ", height=" + getResolutionHeight();
}
}
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 3687cd05e..1a182e732 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/KeyboardProperties.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/KeyboardProperties.java @@ -69,7 +69,7 @@ import java.util.List; * <td>Boolean</td>
* <td>false</td>
* <td></td>
- * <td>In this mode, all keypresses will be sent as they occur. If disabled, entire string of text will be returned only once submitted by user.If omitted, this value will be set to FALSE.</td>
+ * <td>In this mode, all key presses will be sent as they occur. If disabled, entire string of text will be returned only once submitted by user.If omitted, this value will be set to FALSE.</td>
* </tr>
* <tr>
* <td>keypressMode</td>
@@ -82,7 +82,7 @@ import java.util.List; * <td>limitedCharacterList</td>
* <td>String</td>
* <td>false</td>
- * <td>Array = true maxlength = 1 minsize = 1 maxsize = 100</td>
+ * <td>Array = true maxLength = 1 minsize = 1 maxsize = 100</td>
* <td>Array of keyboard characters to enable. All omitted characters will be greyed out (disabled) on the keyboard. If omitted, the entire keyboard will be enabled.</td>
* </tr>
*
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/LightState.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/LightState.java index 749d43039..17ba11742 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/LightState.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/LightState.java @@ -143,7 +143,6 @@ public class LightState extends RPCStruct { * * @see com.smartdevicelink.proxy.rpc.RGBColor */ - @SuppressWarnings("unchecked") public RGBColor getColor() { return (RGBColor) getObject(RGBColor.class, KEY_COLOR); } diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/LocationDetails.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/LocationDetails.java index 574d16912..70e29ec77 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/LocationDetails.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/LocationDetails.java @@ -52,7 +52,6 @@ public class LocationDetails extends RPCStruct{ super(hash); } - @SuppressWarnings("unchecked") public Coordinate getCoordinate() { return (Coordinate) getObject(Coordinate.class, KEY_COORDINATE); } @@ -98,7 +97,6 @@ public class LocationDetails extends RPCStruct{ return this; } - @SuppressWarnings("unchecked") public Image getLocationImage() { return (Image) getObject(Image.class, KEY_LOCATION_IMAGE); } @@ -108,7 +106,6 @@ public class LocationDetails extends RPCStruct{ return this; } - @SuppressWarnings("unchecked") public OasisAddress getSearchAddress() { return (OasisAddress) getObject(OasisAddress.class, KEY_SEARCH_ADDRESS); } diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnButtonEvent.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnButtonEvent.java index ca408c580..3bdd9670a 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnButtonEvent.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnButtonEvent.java @@ -91,7 +91,7 @@ import java.util.Hashtable; * <tr>
* <td>buttonEventMode</td>
* <td>{@linkplain ButtonEventMode}</td>
- * <td>Indicats button was depressed (DOWN) or released (UP)</td>
+ * <td>Indicates button was depressed (DOWN) or released (UP)</td>
* <td></td>
* <td></td>
* <td>SmartDeviceLink 1.0</td>
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnCommand.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnCommand.java index 12695323d..93fd96dce 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnCommand.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnCommand.java @@ -73,7 +73,7 @@ import java.util.Hashtable; * <tr>
* <td>triggerSource</td>
* <td>{@linkplain TriggerSource}</td>
- * <td>Indicates whether command was selected via VR or via a menu selection (using the OKbutton).</td>
+ * <td>Indicates whether command was selected via VR or via a menu selection (using the OK button).</td>
* <td></td>
* <td>SmartDeviceLink 1.0</td>
* </tr>
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnKeyboardInput.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnKeyboardInput.java index 3b2f71269..c2906fbce 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnKeyboardInput.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnKeyboardInput.java @@ -40,7 +40,7 @@ import com.smartdevicelink.proxy.rpc.enums.KeyboardEvent; import java.util.Hashtable;
/**
- * On-screen keyboard event. Can be full string or individual keypresses depending on keyboard mode.
+ * On-screen keyboard event. Can be full string or individual key presses depending on keyboard mode.
* <p></p>
* <p><b>Parameter List</b></p>
* <table border="1" rules="all">
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnUpdateSubMenu.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnUpdateSubMenu.java index e430aa71d..1b12dd76a 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnUpdateSubMenu.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnUpdateSubMenu.java @@ -62,7 +62,7 @@ import java.util.Hashtable; * <tr> * <td>updateSubCells</td> * <td>Boolean</td> - * <td>If not set, assume false. If true, the app should send AddCommands with parentIDs matchingthe menuID. These AddCommands will then be attached to the submenu and displayed if thesubmenu is selected.</td> + * <td>If not set, assume false. If true, the app should send AddCommands with parentIDs matching the menuID. These AddCommands will then be attached to the submenu and displayed if the submenu is selected.</td> * <td>N</td> * <td></td> * </tr> 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 c134eba57..b18fd2c50 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java @@ -102,7 +102,7 @@ import java.util.List; * <tr>
* <td>fuelLevel_State</td>
* <td>Boolean</td>
- * <td>The fuel level state. This parameter is deprecated starting RPC Spec 7.0, please seefuelRange.</td>
+ * <td>The fuel level state. This parameter is deprecated starting RPC Spec 7.0, please see fuelRange.</td>
* <td>N</td>
* <td>Subscribable</td>
* <td>SmartDeviceLink 7.0.0</td>
@@ -110,7 +110,7 @@ import java.util.List; * <tr>
* <td>fuelRange</td>
* <td>Boolean</td>
- * <td>The fuel type, estimated range in KM, fuel level/capacity and fuel level state for thevehicle. See struct FuelRange for details.</td>
+ * <td>The fuel type, estimated range in KM, fuel level/capacity and fuel level state for the vehicle. See struct FuelRange for details.</td>
* <td>N</td>
* <td>{"array_min_size": 0, "array_max_size": 100}</td>
* <td>SmartDeviceLink 5.0.0</td>
@@ -118,7 +118,7 @@ import java.util.List; * <tr>
* <td>instantFuelConsumption</td>
* <td>Float</td>
- * <td>The instantaneous fuel consumption in microlitres</td>
+ * <td>The instantaneous fuel consumption in micro litres</td>
* <td>N</td>
* <td>Subscribable </td>
* <td>SmartDeviceLink 2.0</td>
@@ -218,7 +218,7 @@ import java.util.List; * </tr>
* <tr>
* <td>emergencyEvent</td>
- * <td>EmergencyEvernt</td>
+ * <td>EmergencyEvent</td>
* <td>Information related to an emergency event (and if it occurred).</td>
* <td>N</td>
* <td>Subscribable</td>
@@ -390,7 +390,6 @@ public class OnVehicleData extends RPCNotification { setParameters(KEY_GPS, gps);
return this;
}
- @SuppressWarnings("unchecked")
public GPSData getGps() {
return (GPSData) getObject(GPSData.class, KEY_GPS);
}
@@ -498,7 +497,6 @@ public class OnVehicleData extends RPCNotification { setParameters(KEY_TIRE_PRESSURE, tirePressure);
return this;
}
- @SuppressWarnings("unchecked")
public TireStatus getTirePressure() {
return (TireStatus) getObject(TireStatus.class, KEY_TIRE_PRESSURE);
}
@@ -513,7 +511,6 @@ public class OnVehicleData extends RPCNotification { setParameters(KEY_BELT_STATUS, beltStatus);
return this;
}
- @SuppressWarnings("unchecked")
public BeltStatus getBeltStatus() {
return (BeltStatus) getObject(BeltStatus.class, KEY_BELT_STATUS);
}
@@ -521,7 +518,6 @@ public class OnVehicleData extends RPCNotification { setParameters(KEY_BODY_INFORMATION, bodyInformation);
return this;
}
- @SuppressWarnings("unchecked")
public BodyInformation getBodyInformation() {
return (BodyInformation) getObject(BodyInformation.class, KEY_BODY_INFORMATION);
}
@@ -529,7 +525,6 @@ public class OnVehicleData extends RPCNotification { setParameters(KEY_DEVICE_STATUS, deviceStatus);
return this;
}
- @SuppressWarnings("unchecked")
public DeviceStatus getDeviceStatus() {
return (DeviceStatus) getObject(DeviceStatus.class, KEY_DEVICE_STATUS);
}
@@ -551,7 +546,6 @@ public class OnVehicleData extends RPCNotification { setParameters(KEY_HEAD_LAMP_STATUS, headLampStatus);
return this;
}
- @SuppressWarnings("unchecked")
public HeadLampStatus getHeadLampStatus() {
return (HeadLampStatus) getObject(HeadLampStatus.class, KEY_HEAD_LAMP_STATUS);
}
@@ -591,7 +585,6 @@ public class OnVehicleData extends RPCNotification { setParameters(KEY_E_CALL_INFO, eCallInfo);
return this;
}
- @SuppressWarnings("unchecked")
public ECallInfo getECallInfo() {
return (ECallInfo) getObject(ECallInfo.class, KEY_E_CALL_INFO);
}
@@ -599,7 +592,6 @@ public class OnVehicleData extends RPCNotification { setParameters(KEY_AIRBAG_STATUS, airbagStatus);
return this;
}
- @SuppressWarnings("unchecked")
public AirbagStatus getAirbagStatus() {
return (AirbagStatus) getObject(AirbagStatus.class, KEY_AIRBAG_STATUS);
}
@@ -607,7 +599,6 @@ public class OnVehicleData extends RPCNotification { setParameters(KEY_EMERGENCY_EVENT, emergencyEvent);
return this;
}
- @SuppressWarnings("unchecked")
public EmergencyEvent getEmergencyEvent() {
return (EmergencyEvent) getObject(EmergencyEvent.class, KEY_EMERGENCY_EVENT);
}
@@ -615,7 +606,6 @@ public class OnVehicleData extends RPCNotification { setParameters(KEY_CLUSTER_MODE_STATUS, clusterModeStatus);
return this;
}
- @SuppressWarnings("unchecked")
public ClusterModeStatus getClusterModeStatus() {
return (ClusterModeStatus) getObject(ClusterModeStatus.class, KEY_CLUSTER_MODE_STATUS);
}
@@ -623,7 +613,6 @@ public class OnVehicleData extends RPCNotification { setParameters(KEY_MY_KEY, myKey);
return this;
}
- @SuppressWarnings("unchecked")
public MyKey getMyKey() {
return (MyKey) getObject(MyKey.class, KEY_MY_KEY);
}
@@ -668,7 +657,6 @@ public class OnVehicleData extends RPCNotification { * Gets turnSignal
* @return TurnSignal
*/
- @SuppressWarnings("unchecked")
public TurnSignal getTurnSignal() {
return (TurnSignal) getObject(TurnSignal.class, KEY_TURN_SIGNAL);
}
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/ParameterPermissions.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/ParameterPermissions.java index e102f56c0..be856f93b 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/ParameterPermissions.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/ParameterPermissions.java @@ -63,7 +63,7 @@ import java.util.List; * <tr>
* <td>userDisallowed</td>
* <td>String</td>
- * <td>A set of all parameters that are prohibated for this given RPC.
+ * <td>A set of all parameters that are prohibited for this given RPC.
* <ul>
* <li>Min size: 0</li>
* <li>Max size: 100</li>
@@ -132,7 +132,7 @@ public class ParameterPermissions extends RPCStruct { /**
* set a set of all parameters that are prohibited for this given RPC.
- * @param userDisallowed paramter that is prohibited for this given RPC
+ * @param userDisallowed parameter that is prohibited for this given RPC
*/
public ParameterPermissions setUserDisallowed(@NonNull List<String> userDisallowed) {
setValue(KEY_USER_DISALLOWED, userDisallowed);
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/PermissionItem.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/PermissionItem.java index 237fe84cc..830e27930 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/PermissionItem.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/PermissionItem.java @@ -113,7 +113,6 @@ public class PermissionItem extends RPCStruct { setValue(KEY_RPC_NAME, rpcName);
return this;
}
- @SuppressWarnings("unchecked")
public HMIPermissions getHMIPermissions() {
return (HMIPermissions) getObject(HMIPermissions.class, KEY_HMI_PERMISSIONS);
}
@@ -121,7 +120,6 @@ public class PermissionItem extends RPCStruct { setValue(KEY_HMI_PERMISSIONS, hmiPermissions);
return this;
}
- @SuppressWarnings("unchecked")
public ParameterPermissions getParameterPermissions() {
return (ParameterPermissions) getObject(ParameterPermissions.class, KEY_PARAMETER_PERMISSIONS);
}
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/RegisterAppInterface.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/RegisterAppInterface.java index ae4c0e874..ca2bc9d47 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/RegisterAppInterface.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/RegisterAppInterface.java @@ -195,13 +195,13 @@ import java.util.List; * <td>String</td>
* <td>ID used to uniquely identify current state of all app data that can persist through connection cycles (e.g. ignition cycles).This registered data (commands, submenus, choice sets, etc.) can be reestablished without needing to explicitly reregister each piece. If omitted, then the previous state of an app's commands, etc. will not be restored.When sending hashID, all RegisterAppInterface parameters should still be provided (e.g. ttsName, etc.). </td>
* <td>N</td>
- * <td>maxlength:100</td>
+ * <td>maxLength:100</td>
* <td>SmartDeviceLink 2.3.1 </td>
* </tr>
* <tr>
* <td>deviceInfo</td>
* <td>DeviceInfo</td>
- * <td>Various information abount connecting device.</td>
+ * <td>Various information about connecting device.</td>
* <td>N</td>
* <td></td>
* <td>SmartDeviceLink 2.3.1 </td>
@@ -211,7 +211,7 @@ import java.util.List; * <td>String</td>
* <td>ID used to validate app with policy table entries</td>
* <td>Y</td>
- * <td>Maxlength: 100</td>
+ * <td>maxLength: 100</td>
* <td>SmartDeviceLink 2.0 </td>
* </tr>
* <tr>
@@ -334,7 +334,7 @@ public class RegisterAppInterface extends RPCRequest { * @param languageDesired a Language Enumeration
* @param hmiDisplayLanguageDesired the requested language to be used on the HMI/Display
* @param fullAppID a String value representing a unique ID, which an app will be given when approved <br>
- * <b>Notes: </b>Maxlength = 100
+ * <b>Notes: </b>maxLength = 100
*/
public RegisterAppInterface(@NonNull SdlMsgVersion syncMsgVersion, @NonNull String appName, @NonNull Boolean isMediaApplication,
@NonNull Language languageDesired, @NonNull Language hmiDisplayLanguageDesired, @NonNull String fullAppID) {
@@ -352,7 +352,6 @@ public class RegisterAppInterface extends RPCRequest { * @return SdlMsgVersion -a SdlMsgVersion object representing version of
* the SDL® SmartDeviceLink interface
*/
- @SuppressWarnings("unchecked")
public SdlMsgVersion getSdlMsgVersion() {
return (SdlMsgVersion) getObject(SdlMsgVersion.class, KEY_SDL_MSG_VERSION);
}
@@ -381,7 +380,6 @@ public class RegisterAppInterface extends RPCRequest { return this;
}
- @SuppressWarnings("unchecked")
public DeviceInfo getDeviceInfo() {
return (DeviceInfo) getObject(DeviceInfo.class, KEY_DEVICE_INFO);
}
@@ -433,7 +431,7 @@ public class RegisterAppInterface extends RPCRequest { /**
*
* @param ttsName
- * a List<TTSChunk> value represeting the TTS Name
+ * a List<TTSChunk> value representing the TTS Name
* <p></p>
* <b>Notes: </b>
* <ul>
@@ -454,23 +452,23 @@ public class RegisterAppInterface extends RPCRequest { }
/**
* Gets a String representing an abbreviated version of the mobile
- * applincation's name (if necessary) that will be displayed on the NGN
+ * application's name (if necessary) that will be displayed on the NGN
* media screen
*
* @return String -a String value representing an abbreviated version of the
- * mobile applincation's name
+ * mobile application's name
*/
public String getNgnMediaScreenAppName() {
return getString(KEY_NGN_MEDIA_SCREEN_APP_NAME);
}
/**
* Sets a String representing an abbreviated version of the mobile
- * applincation's name (if necessary) that will be displayed on the NGN
+ * application's name (if necessary) that will be displayed on the NGN
* media screen
*
* @param ngnMediaScreenAppName
* a String value representing an abbreviated version of the
- * mobile applincation's name
+ * mobile application's name
* <p></p>
* <b>Notes: </b>
* <ul>
@@ -592,7 +590,7 @@ public class RegisterAppInterface extends RPCRequest { * @return List<AppHMIType> - a List value representing a list of all
* applicable app types stating which classifications to be given to
* the app
- * @since SmartDeviceLinke 2.0
+ * @since SmartDeviceLink 2.0
*/
@SuppressWarnings("unchecked")
public List<AppHMIType> getAppHMIType() {
@@ -663,7 +661,7 @@ public class RegisterAppInterface extends RPCRequest { * a String value representing a unique ID, which an app will be
* given when approved
* <p></p>
- * <b>Notes: </b>Maxlength = 100
+ * <b>Notes: </b>maxLength = 100
* @since SmartDeviceLink 2.0
*/
public RegisterAppInterface setAppID(@NonNull String appID) {
@@ -693,7 +691,7 @@ public class RegisterAppInterface extends RPCRequest { * a String value representing a unique ID, which an app will be
* given when approved
* <p></p>
- * <b>Notes: </b>Maxlength = 100
+ * <b>Notes: </b>maxLength = 100
* @since SmartDeviceLink 5.0
*/
public RegisterAppInterface setFullAppID( String fullAppID) {
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 967737c85..7bb247e2b 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/RegisterAppInterfaceResponse.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/RegisterAppInterfaceResponse.java @@ -136,7 +136,6 @@ public class RegisterAppInterfaceResponse extends RPCResponse { * @return SdlMsgVersion -a SdlMsgVersion object representing version of
* the SDL® SmartDeviceLink interface
*/
- @SuppressWarnings("unchecked")
public SdlMsgVersion getSdlMsgVersion() {
return (SdlMsgVersion) getObject(SdlMsgVersion.class, KEY_SDL_MSG_VERSION);
}
@@ -220,7 +219,6 @@ public class RegisterAppInterfaceResponse extends RPCResponse { * @return DisplayCapabilities
*/
@Deprecated
- @SuppressWarnings("unchecked")
public DisplayCapabilities getDisplayCapabilities() {
return (DisplayCapabilities) getObject(DisplayCapabilities.class, KEY_DISPLAY_CAPABILITIES);
}
@@ -279,7 +277,6 @@ public class RegisterAppInterfaceResponse extends RPCResponse { * @return PresetBankCapabilities
*/
@Deprecated
- @SuppressWarnings("unchecked")
public PresetBankCapabilities getPresetBankCapabilities() {
return (PresetBankCapabilities) getObject(PresetBankCapabilities.class, KEY_PRESET_BANK_CAPABILITIES);
}
@@ -373,7 +370,6 @@ public class RegisterAppInterfaceResponse extends RPCResponse { *
* @return vehicleType
*/
- @SuppressWarnings("unchecked")
public VehicleType getVehicleType() {
return (VehicleType) getObject(VehicleType.class, KEY_VEHICLE_TYPE);
}
@@ -409,7 +405,6 @@ public class RegisterAppInterfaceResponse extends RPCResponse { *
* @return pcmStreamingCapabilities
*/
- @SuppressWarnings("unchecked")
public AudioPassThruCapabilities getPcmStreamingCapabilities() {
return (AudioPassThruCapabilities) getObject(AudioPassThruCapabilities.class, KEY_PCM_STREAM_CAPABILITIES);
}
@@ -437,7 +432,6 @@ public class RegisterAppInterfaceResponse extends RPCResponse { return this;
}
- @SuppressWarnings("unchecked")
public HMICapabilities getHmiCapabilities() {
return (HMICapabilities) getObject(HMICapabilities.class, KEY_HMI_CAPABILITIES);
}
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/ScreenParams.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/ScreenParams.java index fd644cb40..bf42b7079 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/ScreenParams.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/ScreenParams.java @@ -80,7 +80,7 @@ public class ScreenParams extends RPCStruct { public ScreenParams() { }
/**
* <p>
- * Constructs a new ScreenParamst object indicated by the Hashtable
+ * Constructs a new ScreenParams object indicated by the Hashtable
* parameter
* </p>
*
@@ -101,7 +101,6 @@ public class ScreenParams extends RPCStruct { setImageResolution(resolution);
}
- @SuppressWarnings("unchecked")
public ImageResolution getImageResolution() {
return (ImageResolution) getObject(ImageResolution.class, KEY_RESOLUTION);
}
@@ -109,7 +108,6 @@ public class ScreenParams extends RPCStruct { setValue(KEY_RESOLUTION, resolution);
return this;
}
- @SuppressWarnings("unchecked")
public TouchEventCapabilities getTouchEventAvailable() {
return (TouchEventCapabilities) getObject(TouchEventCapabilities.class, KEY_TOUCH_EVENT_AVAILABLE);
}
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/ScrollableMessage.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/ScrollableMessage.java index cb331914a..5e1080182 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/ScrollableMessage.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/ScrollableMessage.java @@ -72,7 +72,7 @@ import java.util.List; * <td>Integer</td>
* <td>App defined timeout. Indicates how long of a timeout from the last action (i.e. scrolling message resets timeout).</td>
* <td>N</td>
- * <td>minvalue=1000; maxvalue=65535; defvalue=30000</td>
+ * <td>minValue=1000; maxValue=65535; defValue=30000</td>
* <td>SmartDevice Link 1.0 </td>
* </tr>
* <tr>
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/SeatControlData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SeatControlData.java index 8f63ff39e..ad883e310 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/SeatControlData.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SeatControlData.java @@ -387,7 +387,6 @@ public class SeatControlData extends RPCStruct { * * @return SeatMemoryAction. */ - @SuppressWarnings("unchecked") public SeatMemoryAction getMemory() { return (SeatMemoryAction) getObject(SeatMemoryAction.class, KEY_MEMORY); } diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/SendLocation.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SendLocation.java index 1ed6cfb10..02cff3664 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/SendLocation.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SendLocation.java @@ -199,7 +199,6 @@ public class SendLocation extends RPCRequest{ * Getter for image of the location to send. * @return The image of the location to send */ - @SuppressWarnings("unchecked") public Image getLocationImage(){ return (Image) getObject(Image.class, KEY_LOCATION_IMAGE); } @@ -222,8 +221,7 @@ public class SendLocation extends RPCRequest{ return this; } - @SuppressWarnings("unchecked") - public DateTime getTimeStamp() { + public DateTime getTimeStamp() { return (DateTime) getObject(DateTime.class, KEY_TIME_STAMP); } @@ -232,8 +230,7 @@ public class SendLocation extends RPCRequest{ return this; } - @SuppressWarnings("unchecked") - public OasisAddress getAddress() { + public OasisAddress getAddress() { return (OasisAddress) getObject(OasisAddress.class, KEY_ADDRESS); } diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/SetDisplayLayoutResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SetDisplayLayoutResponse.java index eb4e641d9..de955a5d0 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/SetDisplayLayoutResponse.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SetDisplayLayoutResponse.java @@ -82,7 +82,6 @@ public class SetDisplayLayoutResponse extends RPCResponse { setResultCode(resultCode);
}
- @SuppressWarnings("unchecked")
public DisplayCapabilities getDisplayCapabilities() {
return (DisplayCapabilities) getObject(DisplayCapabilities.class, KEY_DISPLAY_CAPABILITIES);
}
@@ -112,7 +111,6 @@ public class SetDisplayLayoutResponse extends RPCResponse { return this;
}
- @SuppressWarnings("unchecked")
public PresetBankCapabilities getPresetBankCapabilities() {
return (PresetBankCapabilities) getObject(PresetBankCapabilities.class, KEY_PRESET_BANK_CAPABILITIES);
}
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/SetGlobalProperties.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SetGlobalProperties.java index 28050a867..e38b38e10 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/SetGlobalProperties.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SetGlobalProperties.java @@ -83,7 +83,7 @@ import java.util.List; * <td>string</td>
* <td>Text, which is shown as title of the VR help screen used in an interaction started by PTT.</td>
* <td>N</td>
- * <td>If omitted on supported displays, the default SDL help title will be used. <p>If omitted and one or more vrHelp items are provided, the request will be rejected.</p>maxlength: 500</td>
+ * <td>If omitted on supported displays, the default SDL help title will be used. <p>If omitted and one or more vrHelp items are provided, the request will be rejected.</p>maxLength: 500</td>
* <td>SmartDeviceLink 1.0</td>
* </tr>
* <tr>
@@ -91,7 +91,7 @@ import java.util.List; * <td>VrHelp</td>
* <td>Items listed in the VR help screen used in an interaction started by PTT.</td>
* <td>N</td>
- * <td>If omitted on supported displays, the default SDL VR help / What Can I Say? screen will be used<p>If the list of VR Help Items contains nonsequential positions (e.g. [1,2,4]), the RPC will be rejected.</p><p>If omitted and a vrHelpTitle is provided, the request will be rejected.</p>minsize:1; maxsize: 100 </td>
+ * <td>If omitted on supported displays, the default SDL VR help / What Can I Say? screen will be used<p>If the list of VR Help Items contains non-sequential positions (e.g. [1,2,4]), the RPC will be rejected.</p><p>If omitted and a vrHelpTitle is provided, the request will be rejected.</p>minsize:1; maxsize: 100 </td>
* <td>SmartDeviceLink 1.0</td>
* </tr>
* <tr>
@@ -282,7 +282,7 @@ public class SetGlobalProperties extends RPCRequest { * <ul>
* <li>If omitted on supported displays, the default SmartDeviceLink VR
* help / What Can I Say? screen will be used</li>
- * <li>If the list of VR Help Items contains nonsequential
+ * <li>If the list of VR Help Items contains non-sequential
* positions (e.g. [1,2,4]), the RPC will be rejected</li>
* <li>If omitted and a vrHelpTitle is provided, the request
* will be rejected</li>
@@ -310,7 +310,6 @@ public class SetGlobalProperties extends RPCRequest { return this;
}
- @SuppressWarnings("unchecked")
public Image getMenuIcon() {
return (Image) getObject(Image.class, KEY_MENU_ICON);
}
@@ -337,7 +336,6 @@ public class SetGlobalProperties extends RPCRequest { return (SeatLocation) getObject(SeatLocation.class, KEY_USER_LOCATION);
}
- @SuppressWarnings("unchecked")
public KeyboardProperties getKeyboardProperties() {
return (KeyboardProperties) getObject(KeyboardProperties.class, KEY_KEYBOARD_PROPERTIES);
}
@@ -357,7 +355,6 @@ public class SetGlobalProperties extends RPCRequest { * the head unit will change the display to the new layout type.
* @return the MenuLayout
*/
- @SuppressWarnings("unchecked")
public MenuLayout getMenuLayout() {
return (MenuLayout) getObject(MenuLayout.class, KEY_MENU_LAYOUT);
}
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 05a97cc62..af8ad974a 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/SetMediaClockTimer.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SetMediaClockTimer.java @@ -46,7 +46,7 @@ import java.util.Hashtable; * count-down, etc.)
*
* <p>Function Group: Base </p>
- * <p><b>HMILevel needs to be FULL, LIMITIED or BACKGROUND</b></p>
+ * <p><b>HMILevel needs to be FULL, LIMITED or BACKGROUND</b></p>
*
* <p><b>Parameter List</b></p>
*
@@ -262,7 +262,6 @@ public class SetMediaClockTimer extends RPCRequest { * @return StartTime -a StartTime object specifying hour, minute, second
* values
*/
- @SuppressWarnings("unchecked")
public StartTime getStartTime() {
return (StartTime) getObject(StartTime.class, KEY_START_TIME);
}
@@ -284,7 +283,6 @@ public class SetMediaClockTimer extends RPCRequest { return this;
}
- @SuppressWarnings("unchecked")
public StartTime getEndTime() {
return (StartTime) getObject(StartTime.class, KEY_END_TIME);
}
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 dceae1a3b..f49b3ec0e 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/Show.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/Show.java @@ -430,7 +430,7 @@ public class Show extends RPCRequest { * MediaClockFormat enumeration
*
* @param mediaClock
- * a String value for the MdaiaClock
+ * a String value for the MediaClock
* <p></p>
* <b>Notes: </b>
* <ul>
@@ -494,7 +494,6 @@ public class Show extends RPCRequest { * displays
* @since SmartDeviceLink 2.0
*/
- @SuppressWarnings("unchecked")
public Image getGraphic() {
return (Image) getObject(Image.class, KEY_GRAPHIC);
}
@@ -506,7 +505,6 @@ public class Show extends RPCRequest { }
- @SuppressWarnings("unchecked")
public Image getSecondaryGraphic() {
return (Image) getObject(Image.class, KEY_SECONDARY_GRAPHIC);
}
@@ -528,7 +526,7 @@ public class Show extends RPCRequest { * Sets the the Soft buttons defined by the App
*
* @param softButtons
- * a List value represemting the Soft buttons defined by the
+ * a List value representing the Soft buttons defined by the
* App
* <p></p>
* <b>Notes: </b>
@@ -633,7 +631,6 @@ public class Show extends RPCRequest { *
* @since 6.0
*/
- @SuppressWarnings("unchecked")
public TemplateConfiguration getTemplateConfiguration() {
return (TemplateConfiguration) getObject(TemplateConfiguration.class, KEY_TEMPLATE_CONFIGURATION);
}
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 a8e375b8f..b6c050739 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/ShowConstantTbt.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/ShowConstantTbt.java @@ -171,7 +171,7 @@ public class ShowConstantTbt extends RPCRequest{ } /** - * Sets an Image for turnicon + * Sets an Image for turn icon * * @param turnIcon * an Image value @@ -182,11 +182,10 @@ public class ShowConstantTbt extends RPCRequest{ } /** - * Gets an Image for turnicon + * Gets an Image for turn icon * * @return Image -an Image value representing an Image for turnicon */ - @SuppressWarnings("unchecked") public Image getTurnIcon(){ return (Image) getObject(Image.class, KEY_MANEUVER_IMAGE); } @@ -207,7 +206,6 @@ public class ShowConstantTbt extends RPCRequest{ * * @return Image -an Image value representing an Image for nextTurnIcon */ - @SuppressWarnings("unchecked") public Image getNextTurnIcon(){ return (Image) getObject(Image.class, KEY_NEXT_MANEUVER_IMAGE); } diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/SisData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SisData.java index e25ac69b9..0862ccc5e 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/SisData.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SisData.java @@ -92,7 +92,6 @@ public class SisData extends RPCStruct { * * @return StationIDNumber. */ - @SuppressWarnings("unchecked") public StationIDNumber getStationIDNumber() { return (StationIDNumber) getObject(StationIDNumber.class, KEY_STATION_ID_NUMBER); } @@ -131,7 +130,6 @@ public class SisData extends RPCStruct { * * @return GPSData - Provides the 3-dimensional geographic station location. */ - @SuppressWarnings("unchecked") public GPSData getStationLocation() { return (GPSData) getObject(GPSData.class, KEY_STATION_LOCATION); } diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/SoftButton.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SoftButton.java index ef25006da..8ff2868a6 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/SoftButton.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SoftButton.java @@ -154,7 +154,6 @@ public class SoftButton extends RPCStruct { setValue(KEY_IMAGE, image);
return this;
}
- @SuppressWarnings("unchecked")
public Image getImage() {
return (Image) getObject(Image.class, KEY_IMAGE);
}
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 7dbbbc247..437b42de7 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleData.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleData.java @@ -92,7 +92,7 @@ import java.util.Hashtable; * <tr>
* <td>fuelLevel_State</td>
* <td>Boolean</td>
- * <td>The fuel level state. This parameter is deprecated starting RPC Spec 7.0, please seefuelRange.</td>
+ * <td>The fuel level state. This parameter is deprecated starting RPC Spec 7.0, please see fuelRange.</td>
* <td>N</td>
* <td>Subscribable</td>
* <td>SmartDeviceLink 7.0.0</td>
@@ -100,7 +100,7 @@ import java.util.Hashtable; * <tr>
* <td>fuelRange</td>
* <td>Boolean</td>
- * <td>The fuel type, estimated range in KM, fuel level/capacity and fuel level state for thevehicle. See struct FuelRange for details.</td>
+ * <td>The fuel type, estimated range in KM, fuel level/capacity and fuel level state for the vehicle. See struct FuelRange for details.</td>
* <td>N</td>
* <td>Subscribable</td>
* <td>SmartDeviceLink 5.0.0</td>
@@ -108,7 +108,7 @@ import java.util.Hashtable; * <tr>
* <td>instantFuelConsumption</td>
* <td>Boolean</td>
- * <td>The instantaneous fuel consumption in microlitres</td>
+ * <td>The instantaneous fuel consumption in micro litres</td>
* <td>N</td>
* <td>Subscribable</td>
* <td>SmartDeviceLink 2.0 </td>
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 dfe668f66..a32b7d5ed 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleDataResponse.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleDataResponse.java @@ -126,7 +126,6 @@ public class SubscribeVehicleDataResponse extends RPCResponse { * Gets Gps
* @return a VehicleDataResult related to GPS
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getGps() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_GPS);
}
@@ -142,7 +141,6 @@ public class SubscribeVehicleDataResponse extends RPCResponse { * Gets Speed
* @return a VehicleDataResult related to speed
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getSpeed() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_SPEED);
}
@@ -158,7 +156,6 @@ public class SubscribeVehicleDataResponse extends RPCResponse { * Gets rpm
* @return a VehicleDataResult related to RPM
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getRpm() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_RPM);
}
@@ -179,7 +176,6 @@ public class SubscribeVehicleDataResponse extends RPCResponse { * @return VehicleDataResult The fuel level in the tank (percentage). This parameter is deprecated starting RPC Spec
* 7.0, please see fuelRange.
*/
- @SuppressWarnings("unchecked")
@Deprecated
public VehicleDataResult getFuelLevel() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_FUEL_LEVEL);
@@ -198,7 +194,6 @@ public class SubscribeVehicleDataResponse extends RPCResponse { * @return a VehicleDataResult related to FuelLevel State
*/
@Deprecated
- @SuppressWarnings("unchecked")
public VehicleDataResult getFuelLevelState() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_FUEL_LEVEL_STATE);
}
@@ -214,7 +209,6 @@ public class SubscribeVehicleDataResponse extends RPCResponse { * Gets Instant Fuel Consumption
* @return a VehicleDataResult related to instant fuel consumption
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getInstantFuelConsumption() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_INSTANT_FUEL_CONSUMPTION);
}
@@ -230,7 +224,6 @@ public class SubscribeVehicleDataResponse extends RPCResponse { * Gets External Temperature
* @return a VehicleDataResult related to external temperature
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getExternalTemperature() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_EXTERNAL_TEMPERATURE);
}
@@ -252,7 +245,6 @@ public class SubscribeVehicleDataResponse extends RPCResponse { * @deprecated in SmartDeviceLink 7.0.0
*/
@Deprecated
- @SuppressWarnings("unchecked")
public VehicleDataResult getPrndl() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_PRNDL);
}
@@ -268,7 +260,6 @@ public class SubscribeVehicleDataResponse extends RPCResponse { * Gets Tire Pressure
* @return a VehicleDataResult related to tire pressure
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getTirePressure() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_TIRE_PRESSURE);
}
@@ -284,7 +275,6 @@ public class SubscribeVehicleDataResponse extends RPCResponse { * Gets Odometer
* @return a VehicleDataResult related to the odometer
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getOdometer() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_ODOMETER);
}
@@ -300,7 +290,6 @@ public class SubscribeVehicleDataResponse extends RPCResponse { * Gets Belt Status
* @return a VehicleDataResult related to the seat belt status
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getBeltStatus() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_BELT_STATUS);
}
@@ -316,7 +305,6 @@ public class SubscribeVehicleDataResponse extends RPCResponse { * Gets Body Information
* @return a VehicleDataResult related to the body info
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getBodyInformation() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_BODY_INFORMATION);
}
@@ -332,7 +320,6 @@ public class SubscribeVehicleDataResponse extends RPCResponse { * Gets Device Status
* @return a VehicleDataResult related to the device status of the connected device
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getDeviceStatus() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_DEVICE_STATUS);
}
@@ -348,7 +335,6 @@ public class SubscribeVehicleDataResponse extends RPCResponse { * Gets Driver Braking
* @return a VehicleDataResult related to the driver breaking status
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getDriverBraking() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_DRIVER_BRAKING);
}
@@ -364,7 +350,6 @@ public class SubscribeVehicleDataResponse extends RPCResponse { * Gets Wiper Status
* @return a VehicleDataResult related to the wiper status
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getWiperStatus() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_WIPER_STATUS);
}
@@ -380,7 +365,6 @@ public class SubscribeVehicleDataResponse extends RPCResponse { * Gets Head Lamp Status
* @return a VehicleDataResult related to the headlamp status
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getHeadLampStatus() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_HEAD_LAMP_STATUS);
}
@@ -396,7 +380,6 @@ public class SubscribeVehicleDataResponse extends RPCResponse { * Gets Engine Torque
* @return a VehicleDataResult related to the engine's torque
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getEngineTorque() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_ENGINE_TORQUE);
}
@@ -412,7 +395,6 @@ public class SubscribeVehicleDataResponse extends RPCResponse { * Gets Engine Oil Life
* @return a VehicleDataResult related to the engine's oil life
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getEngineOilLife() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_ENGINE_OIL_LIFE);
}
@@ -428,7 +410,6 @@ public class SubscribeVehicleDataResponse extends RPCResponse { * Gets AccPedal Position
* @return a VehicleDataResult related to the accelerator pedal's position
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getAccPedalPosition() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_ACC_PEDAL_POSITION);
}
@@ -438,7 +419,6 @@ public class SubscribeVehicleDataResponse extends RPCResponse { return this;
}
- @SuppressWarnings("unchecked")
public VehicleDataResult getSteeringWheelAngle() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_STEERING_WHEEL_ANGLE);
}
@@ -447,7 +427,6 @@ public class SubscribeVehicleDataResponse extends RPCResponse { setParameters(KEY_E_CALL_INFO, eCallInfo);
return this;
}
- @SuppressWarnings("unchecked")
public VehicleDataResult getECallInfo() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_E_CALL_INFO);
}
@@ -455,7 +434,6 @@ public class SubscribeVehicleDataResponse extends RPCResponse { setParameters(KEY_AIRBAG_STATUS, airbagStatus);
return this;
}
- @SuppressWarnings("unchecked")
public VehicleDataResult getAirbagStatus() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_AIRBAG_STATUS);
}
@@ -463,7 +441,6 @@ public class SubscribeVehicleDataResponse extends RPCResponse { setParameters(KEY_EMERGENCY_EVENT, emergencyEvent);
return this;
}
- @SuppressWarnings("unchecked")
public VehicleDataResult getEmergencyEvent() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_EMERGENCY_EVENT);
}
@@ -471,7 +448,6 @@ public class SubscribeVehicleDataResponse extends RPCResponse { setParameters(KEY_CLUSTER_MODE_STATUS, clusterModeStatus);
return this;
}
- @SuppressWarnings("unchecked")
public VehicleDataResult getClusterModeStatus() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_CLUSTER_MODE_STATUS);
}
@@ -479,7 +455,6 @@ public class SubscribeVehicleDataResponse extends RPCResponse { setParameters(KEY_MY_KEY, myKey);
return this;
}
- @SuppressWarnings("unchecked")
public VehicleDataResult getMyKey() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_MY_KEY);
}
@@ -503,7 +478,6 @@ public class SubscribeVehicleDataResponse extends RPCResponse { * vehicle. See struct FuelRange for details.
* @since SmartDeviceLink 5.0.0
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getFuelRange() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_FUEL_RANGE);
}
@@ -521,7 +495,6 @@ public class SubscribeVehicleDataResponse extends RPCResponse { * Gets turnSignal
* @return a VehicleDataResult related to the turn signal status
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getTurnSignal() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_TURN_SIGNAL);
}
@@ -615,7 +588,6 @@ public class SubscribeVehicleDataResponse extends RPCResponse { * @return VehicleDataResult See GearStatus
* @since SmartDeviceLink 7.0.0
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getGearStatus(){
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_GEAR_STATUS);
}
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/SubtleAlert.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SubtleAlert.java index a3b96e4ec..cc0908f58 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/SubtleAlert.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SubtleAlert.java @@ -79,7 +79,7 @@ import java.util.List; * <tr> * <td>ttsChunks</td> * <td>List<TTSChunk></td> - * <td>An array of text chunks of type TTSChunk. See TTSChunk. The array must have at least oneitem.</td> + * <td>An array of text chunks of type TTSChunk. See TTSChunk. The array must have at least one item.</td> * <td>N</td> * <td>Min Value: 1; Max Value: 100</td> * <td></td> @@ -95,7 +95,7 @@ import java.util.List; * <tr> * <td>softButtons</td> * <td>List<SoftButton></td> - * <td>App defined SoftButtons. If omitted on supported displays, the displayed alert shall nothave any SoftButtons.</td> + * <td>App defined SoftButtons. If omitted on supported displays, the displayed alert shall not have any SoftButtons.</td> * <td>N</td> * <td>Min Value: 0; Max Value: 2</td> * <td></td> diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/TTSChunk.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/TTSChunk.java index 9eed92f3f..438757bd1 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/TTSChunk.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/TTSChunk.java @@ -43,9 +43,9 @@ import java.util.Hashtable; * It can also be phonemes from either the Microsoft SAPI phoneme set, or from the LHPLUS phoneme set.
* It can also be a pre-recorded sound in WAV format (either developer-defined, or provided by the SDL platform).</p>
*
- * <p>In SDL, words, and therefore sentences, can be built up from phonemes and are used to explicitly provide the proper pronounciation to the TTS engine.
+ * <p>In SDL, words, and therefore sentences, can be built up from phonemes and are used to explicitly provide the proper pronunciation to the TTS engine.
* For example, to have SDL pronounce the word "read" as "red", rather than as when it is pronounced like "reed",
- * the developer would use phonemes to express this desired pronounciation.</p>
+ * the developer would use phonemes to express this desired pronunciation.</p>
* <p>For more information about phonemes, see <a href="http://en.wikipedia.org/wiki/Phoneme">http://en.wikipedia.org/wiki/Phoneme</a></p>.
* <p><b> Parameter List</b></p>
* <table border="1" rules="all">
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/TemplateConfiguration.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/TemplateConfiguration.java index edaf224e5..fdde09f13 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/TemplateConfiguration.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/TemplateConfiguration.java @@ -65,7 +65,6 @@ public class TemplateConfiguration extends RPCStruct { *
* @return TemplateColorScheme
*/
- @SuppressWarnings("unchecked")
public TemplateColorScheme getDayColorScheme() {
return (TemplateColorScheme) getObject(TemplateColorScheme.class, KEY_DAY_COLOR_SCHEME);
}
@@ -85,7 +84,6 @@ public class TemplateConfiguration extends RPCStruct { *
* @return TemplateColorScheme
*/
- @SuppressWarnings("unchecked")
public TemplateColorScheme getNightColorScheme() {
return (TemplateColorScheme) getObject(TemplateColorScheme.class, KEY_NIGHT_COLOR_SCHEME);
}
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 92c524b79..e3cef24a8 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/TireStatus.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/TireStatus.java @@ -152,7 +152,6 @@ public class TireStatus extends RPCStruct { setValue(KEY_LEFT_FRONT, leftFront);
return this;
}
- @SuppressWarnings("unchecked")
public SingleTireStatus getLeftFront() {
return (SingleTireStatus) getObject(SingleTireStatus.class, KEY_LEFT_FRONT);
}
@@ -160,7 +159,6 @@ public class TireStatus extends RPCStruct { setValue(KEY_RIGHT_FRONT, rightFront);
return this;
}
- @SuppressWarnings("unchecked")
public SingleTireStatus getRightFront() {
return (SingleTireStatus) getObject(SingleTireStatus.class, KEY_RIGHT_FRONT);
}
@@ -168,7 +166,6 @@ public class TireStatus extends RPCStruct { setValue(KEY_LEFT_REAR, leftRear);
return this;
}
- @SuppressWarnings("unchecked")
public SingleTireStatus getLeftRear() {
return (SingleTireStatus) getObject(SingleTireStatus.class, KEY_LEFT_REAR);
}
@@ -176,7 +173,6 @@ public class TireStatus extends RPCStruct { setValue(KEY_RIGHT_REAR, rightRear);
return this;
}
- @SuppressWarnings("unchecked")
public SingleTireStatus getRightRear() {
return (SingleTireStatus) getObject(SingleTireStatus.class, KEY_RIGHT_REAR);
}
@@ -184,7 +180,6 @@ public class TireStatus extends RPCStruct { setValue(KEY_INNER_LEFT_REAR, innerLeftRear);
return this;
}
- @SuppressWarnings("unchecked")
public SingleTireStatus getInnerLeftRear() {
return (SingleTireStatus) getObject(SingleTireStatus.class, KEY_INNER_LEFT_REAR);
}
@@ -192,7 +187,6 @@ public class TireStatus extends RPCStruct { setValue(KEY_INNER_RIGHT_REAR, innerRightRear);
return this;
}
- @SuppressWarnings("unchecked")
public SingleTireStatus getInnerRightRear() {
return (SingleTireStatus) getObject(SingleTireStatus.class, KEY_INNER_RIGHT_REAR);
}
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/TouchEvent.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/TouchEvent.java index 55bb75249..86171a5da 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/TouchEvent.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/TouchEvent.java @@ -144,11 +144,11 @@ public class TouchEvent extends RPCStruct { if(obj instanceof Integer){ //Backwards case
int size = list.size();
List<Integer> listOfInt = (List<Integer>) list;
- List<Long> listofLongs = new ArrayList<Long>(size);
+ List<Long> listOfLongs = new ArrayList<>(size);
for(int i = 0; i<size;i++){
- listofLongs.add(listOfInt.get(i).longValue());
+ listOfLongs.add(listOfInt.get(i).longValue());
}
- return listofLongs;
+ return listOfLongs;
}else if(obj instanceof Long){
return (List<Long>) list;
}
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/Turn.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/Turn.java index d282e6200..bdfb7d4b4 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/Turn.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/Turn.java @@ -49,7 +49,7 @@ import java.util.Hashtable; * <tr> * <td>navigationText</td> * <td>String</td> - * <td>Text to describe the turn (e.g. streetname) + * <td>Text to describe the turn (e.g. street name) * <ul> * <li>Maxlength = 500</li> * </ul> @@ -76,10 +76,10 @@ public class Turn extends RPCStruct{ } /** - * set the text to describe the turn (e.g. streetname) + * set the text to describe the turn (e.g. street name) * * @param navigationText - * the text to describe the turn (e.g. streetname) + * the text to describe the turn (e.g. street name) */ public Turn setNavigationText( String navigationText) { setValue(KEY_NAVIGATION_TEXT, navigationText); @@ -87,9 +87,9 @@ public class Turn extends RPCStruct{ } /** - * get the text to describe the turn (e.g. streetname) + * get the text to describe the turn (e.g. street name) * - * @return the text to describe the turn (e.g. streetname) + * @return the text to describe the turn (e.g. street name) */ public String getNavigationText(){ return getString(KEY_NAVIGATION_TEXT); @@ -111,7 +111,6 @@ public class Turn extends RPCStruct{ * * @return the image to be shown for a turn */ - @SuppressWarnings("unchecked") public Image getTurnIcon(){ return (Image) getObject(Image.class, KEY_TURN_IMAGE); } 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 8e7adb2d2..751f9621f 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleData.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleData.java @@ -87,7 +87,7 @@ import java.util.Hashtable; * <tr>
* <td>fuelLevel_State</td>
* <td>Boolean</td>
- * <td>The fuel level state. This parameter is deprecated starting RPC Spec 7.0, please seefuelRange.</td>
+ * <td>The fuel level state. This parameter is deprecated starting RPC Spec 7.0, please see fuelRange.</td>
* <td>N</td>
* <td>Subscribable</td>
* <td>SmartDeviceLink 7.0.0</td>
@@ -95,7 +95,7 @@ import java.util.Hashtable; * <tr>
* <td>fuelRange</td>
* <td>Boolean</td>
- * <td>The fuel type, estimated range in KM, fuel level/capacity and fuel level state for thevehicle. See struct FuelRange for details.</td>
+ * <td>The fuel type, estimated range in KM, fuel level/capacity and fuel level state for the vehicle. See struct FuelRange for details.</td>
* <td>N</td>
* <td>Subscribable</td>
* <td>SmartDeviceLink 5.0.0</td>
@@ -103,7 +103,7 @@ import java.util.Hashtable; * <tr>
* <td>instantFuelConsumption</td>
* <td>Boolean</td>
- * <td>The instantaneous fuel consumption in microlitres</td>
+ * <td>The instantaneous fuel consumption in micro litres</td>
* <td>N</td>
* <td>Subscribable</td>
* <td>SmartDeviceLink 2.0 </td>
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 4f3abd5b7..3e4609f2b 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleDataResponse.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleDataResponse.java @@ -128,7 +128,6 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { * Gets Gps
* @return a VehicleDataResult related to GPS
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getGps() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_GPS);
}
@@ -144,7 +143,6 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { * Gets Speed
* @return a VehicleDataResult related to speed
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getSpeed() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_SPEED);
}
@@ -160,7 +158,6 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { * Gets rpm
* @return a VehicleDataResult related to RPM
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getRpm() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_RPM);
}
@@ -181,7 +178,6 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { * @return VehicleDataResult The fuel level in the tank (percentage). This parameter is deprecated starting RPC Spec
* 7.0, please see fuelRange.
*/
- @SuppressWarnings("unchecked")
@Deprecated
public VehicleDataResult getFuelLevel() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_FUEL_LEVEL);
@@ -200,7 +196,6 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { * @return a VehicleDataResult related to FuelLevel State
*/
@Deprecated
- @SuppressWarnings("unchecked")
public VehicleDataResult getFuelLevelState() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_FUEL_LEVEL_STATE);
}
@@ -216,7 +211,6 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { * Gets Instant Fuel Consumption
* @return a VehicleDataResult related to instant fuel consumption
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getInstantFuelConsumption() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_INSTANT_FUEL_CONSUMPTION);
}
@@ -232,7 +226,6 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { * Gets External Temperature
* @return a VehicleDataResult related to external temperature
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getExternalTemperature() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_EXTERNAL_TEMPERATURE);
}
@@ -254,7 +247,6 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { * @deprecated in SmartDeviceLink 7.0.0
*/
@Deprecated
- @SuppressWarnings("unchecked")
public VehicleDataResult getPrndl() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_PRNDL);
}
@@ -270,7 +262,6 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { * Gets Tire Pressure
* @return a VehicleDataResult related to tire pressure
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getTirePressure() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_TIRE_PRESSURE);
}
@@ -286,7 +277,6 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { * Gets Odometer
* @return a VehicleDataResult related to the odometer
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getOdometer() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_ODOMETER);
}
@@ -302,7 +292,6 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { * Gets Belt Status
* @return a VehicleDataResult related to the seat belt status
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getBeltStatus() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_BELT_STATUS);
}
@@ -318,7 +307,6 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { * Gets Body Information
* @return a VehicleDataResult related to the body info
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getBodyInformation() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_BODY_INFORMATION);
}
@@ -334,7 +322,6 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { * Gets Device Status
* @return a VehicleDataResult related to the device status of the connected device
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getDeviceStatus() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_DEVICE_STATUS);
}
@@ -350,7 +337,6 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { * Gets Driver Braking
* @return a VehicleDataResult related to the driver breaking status
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getDriverBraking() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_DRIVER_BRAKING);
}
@@ -366,7 +352,6 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { * Gets Wiper Status
* @return a VehicleDataResult related to the wiper status
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getWiperStatus() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_WIPER_STATUS);
}
@@ -382,7 +367,6 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { * Gets Head Lamp Status
* @return a VehicleDataResult related to the headlamp status
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getHeadLampStatus() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_HEAD_LAMP_STATUS);
}
@@ -396,9 +380,8 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { }
/**
* Gets Engine Torque
- * @return a VehicleDataResult related to the enginer's torque
+ * @return a VehicleDataResult related to the engine's torque
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getEngineTorque() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_ENGINE_TORQUE);
}
@@ -414,7 +397,6 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { * Gets Engine Oil Life
* @return a VehicleDataResult related to the engine's oil life
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getEngineOilLife() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_ENGINE_OIL_LIFE);
}
@@ -430,7 +412,6 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { * Gets AccPedal Position
* @return a VehicleDataResult related to the accelerator pedal's position
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getAccPedalPosition() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_ACC_PEDAL_POSITION);
}
@@ -440,7 +421,6 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { return this;
}
- @SuppressWarnings("unchecked")
public VehicleDataResult getSteeringWheelAngle() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_STEERING_WHEEL_ANGLE);
}
@@ -449,7 +429,6 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { setParameters(KEY_E_CALL_INFO, eCallInfo);
return this;
}
- @SuppressWarnings("unchecked")
public VehicleDataResult getECallInfo() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_E_CALL_INFO);
}
@@ -457,7 +436,6 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { setParameters(KEY_AIRBAG_STATUS, airbagStatus);
return this;
}
- @SuppressWarnings("unchecked")
public VehicleDataResult getAirbagStatus() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_AIRBAG_STATUS);
}
@@ -465,7 +443,6 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { setParameters(KEY_EMERGENCY_EVENT, emergencyEvent);
return this;
}
- @SuppressWarnings("unchecked")
public VehicleDataResult getEmergencyEvent() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_EMERGENCY_EVENT);
}
@@ -473,7 +450,6 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { setParameters(KEY_CLUSTER_MODE_STATUS, clusterModeStatus);
return this;
}
- @SuppressWarnings("unchecked")
public VehicleDataResult getClusterModeStatus() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_CLUSTER_MODE_STATUS);
}
@@ -481,7 +457,6 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { setParameters(KEY_MY_KEY, myKey);
return this;
}
- @SuppressWarnings("unchecked")
public VehicleDataResult getMyKey() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_MY_KEY);
}
@@ -522,7 +497,6 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { * Gets turnSignal
* @return a VehicleDataResult related to the turn signal status
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getTurnSignal() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_TURN_SIGNAL);
}
@@ -638,7 +612,6 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { * @return VehicleDataResult See GearStatus
* @since SmartDeviceLink 7.0.0
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getGearStatus(){
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_GEAR_STATUS);
}
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/UpdateTurnList.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/UpdateTurnList.java index a19a9c2ea..8782b120c 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/UpdateTurnList.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/UpdateTurnList.java @@ -38,8 +38,8 @@ import java.util.Hashtable; import java.util.List; /** - * Updates the list of next maneuvers, which can be requested by the user pressing the softbutton "Turns" on the - * Navigation base screen. Three softbuttons are predefined by the system: Up, Down, Close + * Updates the list of next maneuvers, which can be requested by the user pressing the soft button "Turns" on the + * Navigation base screen. Three soft buttons are predefined by the system: Up, Down, Close * * <p>Function Group: Navigation</p> * diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/VideoStreamingFormat.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/VideoStreamingFormat.java index 0fac119f2..ba3f6a9f9 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/VideoStreamingFormat.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/VideoStreamingFormat.java @@ -90,7 +90,7 @@ public class VideoStreamingFormat extends RPCStruct { @Override public String toString() { - return "codec=" + String.valueOf(getCodec()) + - ", protocol=" + String.valueOf(getProtocol()); + return "codec=" + getCodec() + + ", protocol=" + getProtocol(); } } diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/VrHelpItem.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/VrHelpItem.java index 2ba56c4db..7b0c9b7ec 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/VrHelpItem.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/VrHelpItem.java @@ -118,7 +118,6 @@ public class VrHelpItem extends RPCStruct { setValue(KEY_IMAGE, image);
return this;
}
- @SuppressWarnings("unchecked")
public Image getImage() {
return (Image) getObject(Image.class, KEY_IMAGE);
}
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/WindowState.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/WindowState.java index 9011f3865..4c61c69a5 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/WindowState.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/WindowState.java @@ -52,7 +52,7 @@ import java.util.Hashtable; * <tr> * <td>approximatePosition</td> * <td>Integer</td> - * <td>The approximate percentage that the window is open - 0 being fully closed, 100 being fullyopen</td> + * <td>The approximate percentage that the window is open - 0 being fully closed, 100 being fully open</td> * <td>Y</td> * <td></td> * </tr> diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/ButtonName.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/ButtonName.java index d58a048a5..79b1174dd 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/ButtonName.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/ButtonName.java @@ -54,12 +54,12 @@ package com.smartdevicelink.proxy.rpc.enums; */
public enum ButtonName{
/**
- * <br><b>THIS ENUM VALUE WILL CHANGE IN FUNCITONALITY DURING THE NEXT MAJOR RELEASE!</b>
+ * <br><b>THIS ENUM VALUE WILL CHANGE IN FUNCTIONALITY DURING THE NEXT MAJOR RELEASE!</b>
* <br><br>
* This ButtonName value originally was used for both the OK button and PLAY_PAUSE button. As of
* SmartDeviceLink 5.0.0, the functionality was broken out into the OK and PLAY_PAUSE buttons.
* <br><br> For this version of the library OK will be received for both OK and PLAY_PAUSE to
- * mitigate a potential break in functionliaty. If the desire is only for the OK functionality,
+ * mitigate a potential break in functionality. If the desire is only for the OK functionality,
* this button should still be used. If the desired functionality was actually for the play/pause
* toggle, then the new PLAY_PAUSE should be used.
* <br><br>
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/CarModeStatus.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/CarModeStatus.java index 22bfe6c9e..e4a5cdff1 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/CarModeStatus.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/CarModeStatus.java @@ -1,53 +1,53 @@ -/* - * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following - * disclaimer in the documentation and/or other materials provided with the - * distribution. - * - * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its - * contributors may be used to endorse or promote products derived from this - * software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ +/*
+ * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
package com.smartdevicelink.proxy.rpc.enums;
/** Describes the carmode the vehicle is in.
* @since SmartDeviceLink 2.0
*/
public enum CarModeStatus {
- /** Provides carmode NORMAL to each module.
+ /** Provides car mode NORMAL to each module.
*/
NORMAL,
- /** Provides carmode FACTORY to each module.
+ /** Provides car mode FACTORY to each module.
*/
FACTORY,
- /** Provides carmode TRANSPORT to each module.
+ /** Provides car mode TRANSPORT to each module.
*/
TRANSPORT,
- /** Provides carmode CRASH to each module.
+ /** Provides car mode CRASH to each module.
*/
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/DisplayType.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/DisplayType.java index 0c7c4f7e3..44b654a78 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/DisplayType.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/DisplayType.java @@ -1,39 +1,39 @@ -/* - * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following - * disclaimer in the documentation and/or other materials provided with the - * distribution. - * - * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its - * contributors may be used to endorse or promote products derived from this - * software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ +/*
+ * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
package com.smartdevicelink.proxy.rpc.enums;
/** The type of the display.
*
*
- * @since SmartDevcieLink 1.0
+ * @since SmartDeviceLink 1.0
*
*/
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/HMILevel.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/HMILevel.java index d8a720914..5f5eca430 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/HMILevel.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/HMILevel.java @@ -1,34 +1,34 @@ -/* - * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following - * disclaimer in the documentation and/or other materials provided with the - * distribution. - * - * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its - * contributors may be used to endorse or promote products derived from this - * software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ +/*
+ * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
package com.smartdevicelink.proxy.rpc.enums;
import java.util.EnumSet;
@@ -67,7 +67,7 @@ public enum HMILevel { HMI_BACKGROUND("BACKGROUND"),
/**
* Application has been discovered by SDL, but application cannot send any requests or receive any notifications
- * An HMILevel of NONE can also mean that the user has exited the application by saying "exit appname" or selecting "exit" from the application's menu. When this happens, the application still has an active interface registration with SDL and all SDL resources the application has created (e.g. Choice Sets, subscriptions, etc.) still exist. But while the HMILevel is NONE, the application cannot send any messages to SDL, except <i>{@linkplain com.smartdevicelink.proxy.rpc.UnregisterAppInterface}</li>
+ * An HMILevel of NONE can also mean that the user has exited the application by saying "exit appName" or selecting "exit" from the application's menu. When this happens, the application still has an active interface registration with SDL and all SDL resources the application has created (e.g. Choice Sets, subscriptions, etc.) still exist. But while the HMILevel is NONE, the application cannot send any messages to SDL, except <i>{@linkplain com.smartdevicelink.proxy.rpc.UnregisterAppInterface}</li>
*/
HMI_NONE("NONE");
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/KeypressMode.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/KeypressMode.java index 432b8f150..1b40ca8e5 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/KeypressMode.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/KeypressMode.java @@ -29,31 +29,31 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package com.smartdevicelink.proxy.rpc.enums;
-/**
- * Enumeration listing possible keyboard events.
- *
- *
- */
-public enum KeypressMode {
- /**
- * Each keypress is individually sent as the user presses the keyboard keys.
- */
- SINGLE_KEYPRESS,
- /**
- * The keypresses are queued and a string is eventually sent once the user chooses to submit their entry.
- */
- QUEUE_KEYPRESSES,
- /**
- * The keypresses are queue and a string is sent each time the user presses a keyboard key; the string contains the entire current entry.
- */
- RESEND_CURRENT_ENTRY;
-
- public static KeypressMode valueForString(String value) {
- try{
- return valueOf(value);
- }catch(Exception e){
- return null;
- }
- }
+package com.smartdevicelink.proxy.rpc.enums; +/** + * Enumeration listing possible keyboard events. + * + * + */ +public enum KeypressMode { + /** + * Each keypress is individually sent as the user presses the keyboard keys. + */ + SINGLE_KEYPRESS, + /** + * The key presses are queued and a string is eventually sent once the user chooses to submit their entry. + */ + QUEUE_KEYPRESSES, + /** + * The key presses are queue and a string is sent each time the user presses a keyboard key; the string contains the entire current entry. + */ + RESEND_CURRENT_ENTRY; + + public static KeypressMode valueForString(String value) { + try{ + return valueOf(value); + }catch(Exception e){ + return null; + } + } }
\ No newline at end of file diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/MediaClockFormat.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/MediaClockFormat.java index d4a512088..55d9c6791 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/MediaClockFormat.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/MediaClockFormat.java @@ -1,34 +1,34 @@ -/* - * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following - * disclaimer in the documentation and/or other materials provided with the - * distribution. - * - * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its - * contributors may be used to endorse or promote products derived from this - * software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ +/*
+ * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
package com.smartdevicelink.proxy.rpc.enums;
/**
@@ -88,7 +88,7 @@ public enum MediaClockFormat { * <li>c : character out of following character set: sp|0-9|[letters, see
* TypeII column in XLS.</li>
* <li>:|sp : colon or space</li>
- * <li>used for Type II headunit</li>
+ * <li>used for Type II head unit</li>
* </ul>
*
* @since SmartDeviceLink 1.0
@@ -104,7 +104,7 @@ public enum MediaClockFormat { * <li>c : character out of following character set: sp|0-9|[letters, see
* CID column in XLS.</li>
* <li>:|sp : colon or space</li>
- * <li>used for CID headunit</li>
+ * <li>used for CID head unit</li>
* </ul>
* difference between CLOCKTEXT1 and CLOCKTEXT2 is the supported character
* set
@@ -122,7 +122,7 @@ public enum MediaClockFormat { * <li>c : character out of following character set: sp|0-9|[letters, see
* Type 5 column in XLS].</li>
* <li>:|sp : colon or space</li>
- * <li>used for Type V headunit</li>
+ * <li>used for Type V head unit</li>
* </ul>
* difference between CLOCKTEXT1 and CLOCKTEXT2 is the supported character
* set
@@ -139,7 +139,7 @@ public enum MediaClockFormat { * <li>Format: c :|sp c c : c c</li>
* <li>:|sp : colon or space</li>
* <li>c : character out of following character set: sp|0-9|[letters]</li>
- * <li>used for MFD3/4/5 headunits</li>
+ * <li>used for MFD3/4/5 head units</li>
* </ul>
*
*
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/PowerModeStatus.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/PowerModeStatus.java index a16399201..2f708b63f 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/PowerModeStatus.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/PowerModeStatus.java @@ -1,34 +1,34 @@ -/* - * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following - * disclaimer in the documentation and/or other materials provided with the - * distribution. - * - * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its - * contributors may be used to endorse or promote products derived from this - * software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ +/*
+ * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
package com.smartdevicelink.proxy.rpc.enums;
/** Reflects the status of the current power mode.
*
@@ -47,7 +47,7 @@ public enum PowerModeStatus { KEY_APPROVED_0,
POST_ACCESORY_0,
- /** Key is in accessory positon
+ /** Key is in accessory position
*
*/
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/PredefinedLayout.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/PredefinedLayout.java index ca130d38c..dcec89019 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/PredefinedLayout.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/PredefinedLayout.java @@ -84,7 +84,7 @@ public enum PredefinedLayout { TEXT_WITH_GRAPHIC("TEXT_WITH_GRAPHIC"), /** - A layout with only softbuttons placed in a tile layout + A layout with only soft buttons placed in a tile layout */ TILES_ONLY("TILES_ONLY"), diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/SdlInterfaceAvailability.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/SdlInterfaceAvailability.java index 40fbc59a9..18c342f64 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/SdlInterfaceAvailability.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/SdlInterfaceAvailability.java @@ -29,9 +29,9 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package com.smartdevicelink.proxy.rpc.enums;
-
-public enum SdlInterfaceAvailability {
- SDL_INTERFACE_AVAILABLE,
- SDL_INTERFACE_UNAVAILABLE;
-}
+package com.smartdevicelink.proxy.rpc.enums; + +public enum SdlInterfaceAvailability { + SDL_INTERFACE_AVAILABLE, + SDL_INTERFACE_UNAVAILABLE +} diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/SystemCapabilityType.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/SystemCapabilityType.java index 775781000..8b6c9a591 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/SystemCapabilityType.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/SystemCapabilityType.java @@ -579,9 +579,9 @@ public enum SystemCapabilityType { */ DRIVER_DISTRACTION(true); - ; - boolean IS_QUERYABLE; + + final boolean IS_QUERYABLE; SystemCapabilityType(boolean isQueryable) { this.IS_QUERYABLE = isQueryable; diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/TextFieldName.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/TextFieldName.java index cf33b73e0..22e367871 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/TextFieldName.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/TextFieldName.java @@ -204,7 +204,7 @@ public enum TextFieldName { * @since SmartDeviceLink 7.0.0
*/
subtleAlertSoftButtonText;
- ;
+
/**
* Convert String to TextFieldName
* @param value String
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/WarningLightStatus.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/WarningLightStatus.java index 1c5296510..2139c74bd 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/WarningLightStatus.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/WarningLightStatus.java @@ -1,34 +1,34 @@ -/* - * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following - * disclaimer in the documentation and/or other materials provided with the - * distribution. - * - * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its - * contributors may be used to endorse or promote products derived from this - * software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ +/*
+ * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
package com.smartdevicelink.proxy.rpc.enums;
/**
@@ -37,15 +37,15 @@ package com.smartdevicelink.proxy.rpc.enums; */
public enum WarningLightStatus {
/**
- * Warninglight Off
+ * Warning light Off
*/
OFF,
/**
- * Warninglight On
+ * Warning light On
*/
ON,
/**
- * Warninglight is flashing
+ * Warning light is flashing
*/
FLASH,
NOT_USED;
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnMultipleRequestListener.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnMultipleRequestListener.java index 9e63827fa..8f07d4320 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnMultipleRequestListener.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnMultipleRequestListener.java @@ -41,7 +41,7 @@ import java.util.Vector; public abstract class OnMultipleRequestListener extends OnRPCResponseListener { final Vector<Integer> correlationIds; - OnRPCResponseListener rpcResponseListener; + final OnRPCResponseListener rpcResponseListener; public OnMultipleRequestListener(){ setListenerType(UPDATE_LISTENER_TYPE_MULTIPLE_REQUESTS); @@ -60,8 +60,8 @@ public abstract class OnMultipleRequestListener extends OnRPCResponseListener { }; } - public void addCorrelationId(int correlationid){ - correlationIds.add(correlationid); + public void addCorrelationId(int correlationId){ + correlationIds.add(correlationId); } /** * onUpdate is called during multiple stream request diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCListener.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCListener.java index 87f3968eb..237c5efe6 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCListener.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCListener.java @@ -36,7 +36,7 @@ import com.smartdevicelink.proxy.RPCMessage; public abstract class OnRPCListener { /** - * Generic listener for all RPCs including Requests, response, and notificaiton + * Generic listener for all RPCs including Requests, response, and notification */ public final static int UPDATE_LISTENER_TYPE_ALL_RPCS = -1; diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCResponseListener.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCResponseListener.java index e664b05e8..d32a70f7e 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCResponseListener.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCResponseListener.java @@ -57,7 +57,7 @@ public abstract class OnRPCResponseListener extends OnRPCListener { */
public void onStart(int correlationId){
- };
+ }
/**
* This is the only method that must be extended. Other methods that are able to be extended are
|