merge

1 files changed, 7 insertions, 38 deletions

diff --git a/Software/Visual_Studio/Tango.Transport/TransportAdapterBase.cs b/Software/Visual_Studio/Tango.Transport/TransportAdapterBase.cs
index 065b9dc41..d100628ac 100644
--- a/Software/Visual_Studio/Tango.Transport/TransportAdapterBase.cs
+++ b/Software/Visual_Studio/Tango.Transport/TransportAdapterBase.cs
@@ -17,7 +17,6 @@ namespace Tango.Transport
     public abstract class TransportAdapterBase : ExtendedObject, ITransportAdapter
     {
         protected long _totalBytes;
-        protected static long _component_counter = 1;
         private long _transferRateTotalBytes;
         private Timer _transferRateTimer;
 
@@ -39,11 +38,6 @@ namespace Tango.Transport
 
         #region Properties
 
-        /// <summary>
-        /// Gets or sets the name of the transport component.
-        /// </summary>
-        public String ComponentName { get; set; } = "Not Set";
-
         private long _totalBytesReceived;
         /// <summary>
         /// Gets the total bytes received.
@@ -77,20 +71,10 @@ namespace Tango.Transport
             protected set { _transferRate = value; RaisePropertyChanged(nameof(TransferRate)); }
         }
 
-        private String _address;
         /// <summary>
         /// Gets or sets the channel address.
         /// </summary>
-        public String Address
-        {
-            get { return _address; }
-            set { _address = value; RaisePropertyChangedAuto(); }
-        }
-
-        /// <summary>
-        /// Gets the last failed state exception/reason.
-        /// </summary>
-        public Exception FailedStateException { get; private set; }
+        public String Address { get; set; }
 
         private TransportComponentState _state;
         /// <summary>
@@ -101,24 +85,11 @@ namespace Tango.Transport
             get { return _state; }
             protected set
             {
-                if (_state != value)
-                {
-                    _state = value;
-                    OnStateChanged(_state);
-                }
+                _state = value;
+                OnStateChanged(_state);
             }
         }
 
-        private bool _enableCompression;
-        /// <summary>
-        /// Gets or sets a value indicating whether to enable compression/decompression of data.
-        /// </summary>
-        public bool EnableCompression
-        {
-            get { return _enableCompression; }
-            set { _enableCompression = value; RaisePropertyChangedAuto(); }
-        }
-
         #endregion
 
         #region Virtual Methods
@@ -129,10 +100,9 @@ namespace Tango.Transport
         /// <param name="ex">The ex.</param>
         protected virtual void OnFailed(Exception ex)
         {
-            FailedStateException = ex;
-            LogManager.Log(ex, $"{ComponentName}: Adapter failed.");
             Disconnect().Wait();
             State = TransportComponentState.Failed;
+            LogManager.Log(ex, "Adapter failed.");
         }
 
         /// <summary>
@@ -187,7 +157,7 @@ namespace Tango.Transport
         {
             if (State == TransportComponentState.Disposed)
             {
-                throw LogManager.Log(new ObjectDisposedException($"{ComponentName}: The adapter is in a " + State + " state."));
+                throw LogManager.Log(new ObjectDisposedException("The adapter is in a " + State + " state."));
             }
         }
 
@@ -214,7 +184,7 @@ namespace Tango.Transport
 
         #region Private Methods
 
-        protected void AppendTransferRateBytes(long dataLength)
+        private void AppendTransferRateBytes(long dataLength)
         {
             _transferRateTotalBytes += dataLength;
         }
@@ -240,8 +210,7 @@ namespace Tango.Transport
         /// Writes the specified data to the stream.
         /// </summary>
         /// <param name="data">The data.</param>
-        /// <param name="immidiate">Writes the data as soon as possible while ignoring any message queuing and batching.</param>
-        public abstract void Write(byte[] data, bool immidiate = false);
+        public abstract void Write(byte[] data);
 
         /// <summary>
         /// Connects the transport component.