Components Initialize() rewritten, double StartChangeHandler() calls avoided, ToString() methods are equl, use ClassName.

2021-04-08 12:03:18 +02:00
parent 331803e51d
commit 1d50b7206d
178 changed files with 2003 additions and 2151 deletions
@@ -9,40 +9,35 @@ namespace TBF.BenchControl.Network.Adapter
 	public class Netadapter : ComponentBase, GenericDevices.INetworkAdapter
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Netadapter));
-		public override string ToString()
-		{
-			return string.Format("Component={0} IPAddress={1} NetMask={2} Description={3}", Cfg.Name, IPAddress, NetMask, (Cfg as NetadapterCfg).Description);
-		}
-
-		public bool Running { get { return running; }  }
-		bool running;
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }

 		readonly NetadapterCfg netadapterCfg;
-		readonly IPAddress ipAddress;
-		readonly IPAddress netMask;
-		readonly IPAddress broadcastAddress;

+		IPAddress ipAddress;
+		IPAddress netMask;
+		IPAddress broadcastAddress;
 		public IPAddress IPAddress { get { return ipAddress; } }
 		public IPAddress NetMask { get { return netMask; } }
 		public IPAddress BroadcastAddress { get { return broadcastAddress; } }

-		public Netadapter()
-		{
-		}
+
+		public Netadapter() { }

 		public Netadapter(Generic.IComponentCfg cfg)
            : base(cfg)
        {
 			netadapterCfg = cfg as NetadapterCfg;
-			AdapterInfo.RefreshNetAdaptersInfo();
-			AdapterInfo netadapter = AdapterInfo.GetNetAdapter(netadapterCfg.Description);
-			ipAddress = netadapter.IPAddress;
-			netMask = netadapter.NetMask;
-			broadcastAddress = netadapter.GetBroadcastAddress();
-
-			running = false;
-
-			log.Warn(this.ToString());
 		}
-	}
+
+        public override void Initialize()
+        {
+            AdapterInfo.RefreshNetAdaptersInfo();
+            AdapterInfo netadapter = AdapterInfo.GetNetAdapter(netadapterCfg.Description);
+            ipAddress = netadapter.IPAddress;
+            netMask = netadapter.NetMask;
+            broadcastAddress = netadapter.GetBroadcastAddress();
+
+            log.FatalFormat("{0} initialized: {1}", Name, this);
+        }
+    }
 }