summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRHenigan <heniganr1@gmail.com>2020-06-26 16:45:11 -0400
committerRHenigan <heniganr1@gmail.com>2020-06-26 16:45:11 -0400
commite298cb9c16bed67481ae5c8a1bd029e1956e944c (patch)
tree924a05951e249c6e16c9cc98d623a59ab2ffa8de
parent05d262701ff3495da7470a925bf67a91b57ad163 (diff)
downloadsdl_android-e298cb9c16bed67481ae5c8a1bd029e1956e944c.tar.gz
Move JavaSE classes to use the new logError Apis
-rw-r--r--base/src/main/java/com/livio/BSON/BsonEncoder.java4
-rw-r--r--base/src/main/java/com/smartdevicelink/SdlConnection/SdlSession.java2
-rw-r--r--base/src/main/java/com/smartdevicelink/streaming/StreamPacketizer.java2
-rw-r--r--base/src/main/java/com/smartdevicelink/trace/SdlTrace.java2
-rw-r--r--base/src/main/java/com/smartdevicelink/transport/CustomTransport.java2
-rw-r--r--base/src/main/java/com/smartdevicelink/transport/TransportManager.java2
-rw-r--r--base/src/main/java/com/smartdevicelink/transport/WebSocketServer.java6
-rw-r--r--base/src/main/java/com/smartdevicelink/transport/utl/SSLWebSocketFactoryGenerator.java8
-rw-r--r--javaSE/src/main/java/com/smartdevicelink/managers/SdlManager.java4
9 files changed, 16 insertions, 16 deletions
diff --git a/base/src/main/java/com/livio/BSON/BsonEncoder.java b/base/src/main/java/com/livio/BSON/BsonEncoder.java
index c0e03f5cf..e09da9853 100644
--- a/base/src/main/java/com/livio/BSON/BsonEncoder.java
+++ b/base/src/main/java/com/livio/BSON/BsonEncoder.java
@@ -47,7 +47,7 @@ public class BsonEncoder {
return encoder.encode(bson);
}
- DebugTool.logError("Something went wrong encoding the map into BSON bytes");
+ DebugTool.logError(null, "Something went wrong encoding the map into BSON bytes");
return null;
}
@@ -63,7 +63,7 @@ public class BsonEncoder {
}
}
}
- DebugTool.logError("Something went wrong decoding bytes into BSON");
+ DebugTool.logError(null, "Something went wrong decoding bytes into BSON");
return null;
}
diff --git a/base/src/main/java/com/smartdevicelink/SdlConnection/SdlSession.java b/base/src/main/java/com/smartdevicelink/SdlConnection/SdlSession.java
index cb4dbfa5e..fb82bd8a2 100644
--- a/base/src/main/java/com/smartdevicelink/SdlConnection/SdlSession.java
+++ b/base/src/main/java/com/smartdevicelink/SdlConnection/SdlSession.java
@@ -295,7 +295,7 @@ public class SdlSession implements ISdlProtocol, ISdlConnectionListener, ISecuri
@Override
public void onProtocolError(String info, Exception e) {
this.sessionListener.onProtocolError(info, e);
- DebugTool.logError("on protocol error", e);
+ DebugTool.logError(TAG,"on protocol error", e);
}
diff --git a/base/src/main/java/com/smartdevicelink/streaming/StreamPacketizer.java b/base/src/main/java/com/smartdevicelink/streaming/StreamPacketizer.java
index 7c2a61090..a031defec 100644
--- a/base/src/main/java/com/smartdevicelink/streaming/StreamPacketizer.java
+++ b/base/src/main/java/com/smartdevicelink/streaming/StreamPacketizer.java
@@ -118,7 +118,7 @@ public class StreamPacketizer extends AbstractPacketizer implements IVideoStream
mPauseLock.wait();
}
catch (InterruptedException e) {
- DebugTool.logError("Streaming thread has been interrupted", e);
+ DebugTool.logError(TAG, "Streaming thread has been interrupted", e);
}
}
}
diff --git a/base/src/main/java/com/smartdevicelink/trace/SdlTrace.java b/base/src/main/java/com/smartdevicelink/trace/SdlTrace.java
index c02d5b8c8..8061bd674 100644
--- a/base/src/main/java/com/smartdevicelink/trace/SdlTrace.java
+++ b/base/src/main/java/com/smartdevicelink/trace/SdlTrace.java
@@ -419,7 +419,7 @@ public class SdlTrace {
try {
localTraceListener.logXmlMsg(msg, SDL_LIB_TRACE_KEY);
} catch (Exception ex) {
- DebugTool.logError("Failure calling ISTListener: " + ex.toString(), ex);
+ DebugTool.logError(null,"Failure calling ISTListener: " + ex.toString(), ex);
return false;
}
}
diff --git a/base/src/main/java/com/smartdevicelink/transport/CustomTransport.java b/base/src/main/java/com/smartdevicelink/transport/CustomTransport.java
index 4e604ecf9..ad02f96d2 100644
--- a/base/src/main/java/com/smartdevicelink/transport/CustomTransport.java
+++ b/base/src/main/java/com/smartdevicelink/transport/CustomTransport.java
@@ -138,7 +138,7 @@ public abstract class CustomTransport implements TransportInterface{
try {
onWrite(bytes, 0, bytes.length);
} catch (Exception exc) {
- DebugTool.logError("Error attempting to write packet", exc);
+ DebugTool.logError(TAG, "Error attempting to write packet", exc);
}
}
}
diff --git a/base/src/main/java/com/smartdevicelink/transport/TransportManager.java b/base/src/main/java/com/smartdevicelink/transport/TransportManager.java
index 5bffce318..c8a07a1cc 100644
--- a/base/src/main/java/com/smartdevicelink/transport/TransportManager.java
+++ b/base/src/main/java/com/smartdevicelink/transport/TransportManager.java
@@ -180,7 +180,7 @@ public class TransportManager extends TransportManagerBase{
@Override
public void onError() {
- DebugTool.logError("Error in the transport manager from the web socket server");
+ DebugTool.logError(TAG, "Error in the transport manager from the web socket server");
if(transportListener != null){
transportListener.onError("");
}
diff --git a/base/src/main/java/com/smartdevicelink/transport/WebSocketServer.java b/base/src/main/java/com/smartdevicelink/transport/WebSocketServer.java
index d03580955..8f5411ce0 100644
--- a/base/src/main/java/com/smartdevicelink/transport/WebSocketServer.java
+++ b/base/src/main/java/com/smartdevicelink/transport/WebSocketServer.java
@@ -66,7 +66,7 @@ public class WebSocketServer extends org.java_websocket.server.WebSocketServer i
if(factory!=null){
this.setWebSocketFactory(factory);
}else{
- DebugTool.logError("WebSocketServer: Unable to generate SSL Web Socket Server Factory");
+ DebugTool.logError(TAG, "WebSocketServer: Unable to generate SSL Web Socket Server Factory");
}
}
@@ -138,7 +138,7 @@ public class WebSocketServer extends org.java_websocket.server.WebSocketServer i
@Override
public void onMessage(WebSocket webSocket, String s) {
- DebugTool.logError("Incorrect message type received, dropping. - String: " + s);
+ DebugTool.logError(TAG, "Incorrect message type received, dropping. - String: " + s);
}
@Override
@@ -182,7 +182,7 @@ public class WebSocketServer extends org.java_websocket.server.WebSocketServer i
@Override
public void onError(WebSocket webSocket, Exception e) {
- DebugTool.logError("bad", e);
+ DebugTool.logError(TAG, "bad", e);
if(callback!=null) {
callback.onError();
}
diff --git a/base/src/main/java/com/smartdevicelink/transport/utl/SSLWebSocketFactoryGenerator.java b/base/src/main/java/com/smartdevicelink/transport/utl/SSLWebSocketFactoryGenerator.java
index a0bc592f6..d36569a78 100644
--- a/base/src/main/java/com/smartdevicelink/transport/utl/SSLWebSocketFactoryGenerator.java
+++ b/base/src/main/java/com/smartdevicelink/transport/utl/SSLWebSocketFactoryGenerator.java
@@ -70,13 +70,13 @@ public class SSLWebSocketFactoryGenerator {
context = getSSLContextFromPem(config);
break;
default:
- DebugTool.logError("Unable to generateWebSocketServer. Unsupported cert type.");
+ DebugTool.logError(null, "Unable to generateWebSocketServer. Unsupported cert type.");
return null;
}
if(context != null) {
return new DefaultSSLWebSocketServerFactory(context);
}else{
- DebugTool.logError("SSLWebSocketFactoryGenerator: Unable to create SSL Context");
+ DebugTool.logError(null, "SSLWebSocketFactoryGenerator: Unable to create SSL Context");
return null;
}
}
@@ -101,7 +101,7 @@ public class SSLWebSocketFactoryGenerator {
return sslContext;
}
catch(Exception e){
- DebugTool.logError("Issue creating SSLContext with JKS : " , e);
+ DebugTool.logError(null, "Issue creating SSLContext with JKS : " , e);
}
return null;
}
@@ -133,7 +133,7 @@ public class SSLWebSocketFactoryGenerator {
context.init( km, null, null );
} catch ( Exception e ) {
context = null;
- DebugTool.logError("Issue creating SSLContext with PEM Cert : " , e);
+ DebugTool.logError(null, "Issue creating SSLContext with PEM Cert : " , e);
}
return context;
}
diff --git a/javaSE/src/main/java/com/smartdevicelink/managers/SdlManager.java b/javaSE/src/main/java/com/smartdevicelink/managers/SdlManager.java
index 2fee7f52b..37c8ae14e 100644
--- a/javaSE/src/main/java/com/smartdevicelink/managers/SdlManager.java
+++ b/javaSE/src/main/java/com/smartdevicelink/managers/SdlManager.java
@@ -103,7 +103,7 @@ public class SdlManager extends BaseSdlManager {
onReady();
} else if (permissionManager.getState() == BaseSubManager.ERROR && fileManager.getState() == BaseSubManager.ERROR && screenManager.getState() == BaseSubManager.ERROR) {
String info = "ERROR starting sdl manager, all sub managers are in error state";
- DebugTool.logError(info);
+ DebugTool.logError(TAG, info);
transitionToState(BaseSubManager.ERROR);
notifyDevListener(info);
} else if (permissionManager.getState() == BaseSubManager.SETTING_UP || fileManager.getState() == BaseSubManager.SETTING_UP || screenManager.getState() == BaseSubManager.SETTING_UP) {
@@ -120,7 +120,7 @@ public class SdlManager extends BaseSdlManager {
} else {
// We should never be here, but somehow one of the sub-sub managers is null
String info = "ERROR one of the sdl sub managers is null";
- DebugTool.logError(info);
+ DebugTool.logError(TAG, info);
transitionToState(BaseSubManager.ERROR);
notifyDevListener(info);
}