ParamValues() retval IList->ICollection, GetControl() arg. is a list of components, ver. 3.1.1598

TBF/BenchControl/TestMethods/CombinedWithDetection/TestMethodCfg.cs

@@ -15,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
 		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(TestMethodCfg) })[0];
         public override XmlSerializer GetSerializer() { return Serializer; }
 
-		public IComponentCfgCtrl GetControl() { return new TestMethodCfgCtrl(); }
+		public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new TestMethodCfgCtrl(); }
 
 		/// <summary> Test parameters </summary>
 		[XmlIgnore]

TBF/BenchControl/TestMethods/DiverterTest/TestMethodCfg.cs

@@ -15,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.DiverterTest
 		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(TestMethodCfg) })[0];
         public override XmlSerializer GetSerializer() { return Serializer; }
 
-		public IComponentCfgCtrl GetControl() { return new TestMethodCfgCtrl(); }
+		public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new TestMethodCfgCtrl(); }
 
 		/// <summary> Test parameters </summary>
 		[XmlIgnore]

TBF/BenchControl/TestMethods/Endurance/TestMethodCfg.cs

@@ -15,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.Endurance
 		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(TestMethodCfg) })[0];
 		public override XmlSerializer GetSerializer() { return Serializer; }
 
-		public IComponentCfgCtrl GetControl() { return new TestMethodCfgCtrl(); }
+		public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new TestMethodCfgCtrl(); }
 
 		public string Cycle;
 

TBF/BenchControl/TestMethods/FixedStart/HeatMeters/TestMethodCfg.cs

@@ -15,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.FixedStart.HeatMeters
 		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(TestMethodCfg) })[0];
         public override XmlSerializer GetSerializer() { return Serializer; }
 
-		public IComponentCfgCtrl GetControl() { return new TestMethodCfgCtrl(); }
+		public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new TestMethodCfgCtrl(); }
 
 		/// <summary> Test parameters </summary>
 		[XmlIgnore]

TBF/BenchControl/TestMethods/FixedStartDeferredEval/HeatMeters/TestMethodCfg.cs

@@ -15,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartDeferredEval.HeatMeters
 		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(TestMethodCfg) })[0];
         public override XmlSerializer GetSerializer() { return Serializer; }
 
-		public IComponentCfgCtrl GetControl() { return new TestMethodCfgCtrl(); }
+		public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new TestMethodCfgCtrl(); }
 
 		/// <summary> Test parameters </summary>
 		[XmlIgnore]

TBF/BenchControl/TestMethods/FixedStartMassCollAdvanced/HeatMeters/TestMethodCfg.cs

@@ -18,7 +18,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollAdvanced.HeatMeters
         public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(TestMethodCfg) })[0];
         public override XmlSerializer GetSerializer() { return Serializer; }
 
-        public IComponentCfgCtrl GetControl() { return new Configs.ParamsProvider.ComponentCfgCtrl(this, null); }
+        public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new Configs.ParamsProvider.ComponentCfgCtrl(this, null); }
 
 
         /// <summary> Test parameters </summary>
@@ -63,11 +63,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollAdvanced.HeatMeters
         };
         public string ParamName(int i) { return paramNames[i]; }
         public int ParamsCount() { return paramNames.Length; }
-
-        public IList<string> ParamValues(int i)
-        {
-            return null;
-        }
+        public ICollection<string> ParamValues(int i) { return null; }
 
         public string ToString(int i)
         {

TBF/BenchControl/TestMethods/FixedStartMassCollAdvanced/TestMethodCfg.cs

@@ -18,7 +18,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollAdvanced
 		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(TestMethodCfg) })[0];
         public override XmlSerializer GetSerializer() { return Serializer; }
 
-		public IComponentCfgCtrl GetControl() { return new Configs.ParamsProvider.ComponentCfgCtrl(this, null); }
+		public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new Configs.ParamsProvider.ComponentCfgCtrl(this, null); }
 
 		///
 		/// Serialized parameters 
@@ -51,11 +51,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollAdvanced
         };
         public string ParamName(int i) { return paramNames[i]; }
         public int ParamsCount() { return paramNames.Length; }
-
-        public IList<string> ParamValues(int i)
-        {
-            return null;
-        }
+        public ICollection<string> ParamValues(int i) { return null; }
 
         public string ToString(int i)
         {

TBF/BenchControl/TestMethods/FixedStartMassCollDeferredEval/HeatMeters/TestMethodCfg.cs

@@ -15,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollDeferredEval.HeatMeters
 		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(TestMethodCfg) })[0];
         public override XmlSerializer GetSerializer() { return Serializer; }
 
-		public IComponentCfgCtrl GetControl() { return new TestMethodCfgCtrl(); }
+		public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new TestMethodCfgCtrl(); }
 
 		/// <summary> Test parameters </summary>
 		[XmlIgnore]

TBF/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/TestMethodCfg.cs

@@ -15,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection.HeatMeters
 		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(TestMethodCfg) })[0];
         public override XmlSerializer GetSerializer() { return Serializer; }
 
-		public IComponentCfgCtrl GetControl() { return new TestMethodCfgCtrl(); }
+		public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new TestMethodCfgCtrl(); }
 
 		/// <summary> Test parameters </summary>
 		[XmlIgnore]

TBF/BenchControl/TestMethods/FixedStartTankCollection/Compound/TestMethodCfg.cs

@@ -15,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartTankCollection.Compound
 		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(TestMethodCfg) })[0];
         public override XmlSerializer GetSerializer() { return Serializer; }
 
-		public IComponentCfgCtrl GetControl() { return new TestMethodCfgCtrl(); }
+		public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new TestMethodCfgCtrl(); }
 
 		/// <summary> Test parameters </summary>
 		[XmlIgnore]

TBF/BenchControl/TestMethods/FixedStartTankCollection/Single/TestMethodCfg.cs

@@ -15,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartTankCollection.Single
 		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(TestMethodCfg) })[0];
         public override XmlSerializer GetSerializer() { return Serializer; }
 
-		public IComponentCfgCtrl GetControl() { return new TestMethodCfgCtrl(); }
+		public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new TestMethodCfgCtrl(); }
 
 		/// <summary> Test parameters </summary>
 		[XmlIgnore]

TBF/BenchControl/TestMethods/FlyingStart/Compound/TestMethodCfg.cs

@@ -15,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStart.Compound
 		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(TestMethodCfg) })[0];
         public override XmlSerializer GetSerializer() { return Serializer; }
 
-		public IComponentCfgCtrl GetControl() { return new TestMethodCfgCtrl(); }
+		public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new TestMethodCfgCtrl(); }
 
 		/// <summary> Test parameters </summary>
 		[XmlIgnore]

TBF/BenchControl/TestMethods/FlyingStart/HeatMeters/TestMethodCfg.cs

@@ -15,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStart.HeatMeters
 		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(TestMethodCfg) })[0];
         public override XmlSerializer GetSerializer() { return Serializer; }
 
-		public IComponentCfgCtrl GetControl() { return new TestMethodCfgCtrl(); }
+		public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new TestMethodCfgCtrl(); }
 
 		/// <summary> Test parameters </summary>
 		[XmlIgnore]

TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Compound/TestMethodCfg.cs

@@ -15,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl.Compoun
 		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(TestMethodCfg) })[0];
         public override XmlSerializer GetSerializer() { return Serializer; }
 
-		public IComponentCfgCtrl GetControl() { return new TestMethodCfgCtrl(); }
+		public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new TestMethodCfgCtrl(); }
 
 		/// <summary> Test parameters </summary>
 		[XmlIgnore]

TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/HeatMeters/TestMethodCfg.cs

@@ -15,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl.HeatMet
 		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(TestMethodCfg) })[0];
         public override XmlSerializer GetSerializer() { return Serializer; }
 
-		public IComponentCfgCtrl GetControl() { return new TestMethodCfgCtrl(); }
+		public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new TestMethodCfgCtrl(); }
 
 		/// <summary> Test parameters </summary>
 		[XmlIgnore]

TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Single/TestMethodCfg.cs

@@ -15,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl.Single
 		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(TestMethodCfg) })[0];
         public override XmlSerializer GetSerializer() { return Serializer; }
 
-		public IComponentCfgCtrl GetControl() { return new TestMethodCfgCtrl(); }
+		public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new TestMethodCfgCtrl(); }
 
 		/// <summary> Test parameters </summary>
 		[XmlIgnore]

TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/Compound/TestMethodCfg.cs

@@ -15,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollComparative.Compound
 		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(TestMethodCfg) })[0];
         public override XmlSerializer GetSerializer() { return Serializer; }
 
-		public IComponentCfgCtrl GetControl() { return new TestMethodCfgCtrl(); }
+		public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new TestMethodCfgCtrl(); }
 
 		/// <summary> Test parameters </summary>
 		[XmlIgnore]

TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/HeatMeters/TestMethodCfg.cs

@@ -15,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollComparative.HeatMeters
 		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(TestMethodCfg) })[0];
         public override XmlSerializer GetSerializer() { return Serializer; }
 
-		public IComponentCfgCtrl GetControl() { return new TestMethodCfgCtrl(); }
+		public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new TestMethodCfgCtrl(); }
 
 		/// <summary> Test parameters </summary>
 		[XmlIgnore]

TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/Single/TestMethodCfg.cs

@@ -15,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollComparative.Single
 		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(TestMethodCfg) })[0];
         public override XmlSerializer GetSerializer() { return Serializer; }
 
-		public IComponentCfgCtrl GetControl() { return new TestMethodCfgCtrl(); }
+		public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new TestMethodCfgCtrl(); }
 
 		/// <summary> Test parameters </summary>
 		[XmlIgnore]

TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Compound/TestMethodCfg.cs

@@ -15,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged.Compound
 		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(TestMethodCfg) })[0];
         public override XmlSerializer GetSerializer() { return Serializer; }
 
-		public IComponentCfgCtrl GetControl() { return new TestMethodCfgCtrl(); }
+		public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new TestMethodCfgCtrl(); }
 
 		/// <summary> Test parameters </summary>
 		[XmlIgnore]

TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/HeatMeters/TestMethodCfg.cs

@@ -15,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged.HeatMeters
 		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(TestMethodCfg) })[0];
         public override XmlSerializer GetSerializer() { return Serializer; }
 
-		public IComponentCfgCtrl GetControl() { return new TestMethodCfgCtrl(); }
+		public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new TestMethodCfgCtrl(); }
 
 		/// <summary> Test parameters </summary>
 		[XmlIgnore]

TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Single/TestMethodCfg.cs

@@ -15,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged.Single
 		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(TestMethodCfg) })[0];
         public override XmlSerializer GetSerializer() { return Serializer; }
 
-		public IComponentCfgCtrl GetControl() { return new TestMethodCfgCtrl(); }
+		public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new TestMethodCfgCtrl(); }
 
 		/// <summary> Test parameters </summary>
 		[XmlIgnore]

TBF/BenchControl/TestMethods/FlyingStartMassCollection/Compound/TestMethodCfg.cs

@@ -15,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection.Compound
 		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(TestMethodCfg) })[0];
         public override XmlSerializer GetSerializer() { return Serializer; }
 
-		public IComponentCfgCtrl GetControl() { return new TestMethodCfgCtrl(); }
+		public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new TestMethodCfgCtrl(); }
 
 		/// <summary> Test parameters </summary>
 		[XmlIgnore]

TBF/BenchControl/TestMethods/FlyingStartMassCollection/HeatMeters/TestMethodCfg.cs

@@ -15,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection.HeatMeters
 		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(TestMethodCfg) })[0];
         public override XmlSerializer GetSerializer() { return Serializer; }
 
-		public IComponentCfgCtrl GetControl() { return new TestMethodCfgCtrl(); }
+		public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new TestMethodCfgCtrl(); }
 
 		/// <summary> Test parameters </summary>
 		[XmlIgnore]

TBF/BenchControl/TestMethods/FlyingStartTankCollection/Compound/TestMethodCfg.cs

@@ -15,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartTankCollection.Compound
 		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(TestMethodCfg) })[0];
         public override XmlSerializer GetSerializer() { return Serializer; }
 
-		public IComponentCfgCtrl GetControl() { return new TestMethodCfgCtrl(); }
+		public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new TestMethodCfgCtrl(); }
 
 		/// <summary> Test parameters </summary>
 		[XmlIgnore]

TBF/BenchControl/TestMethods/FlyingStartTankCollection/Single/TestMethodCfg.cs

@@ -15,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartTankCollection.Single
 		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(TestMethodCfg) })[0];
         public override XmlSerializer GetSerializer() { return Serializer; }
 
-		public IComponentCfgCtrl GetControl() { return new TestMethodCfgCtrl(); }
+		public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new TestMethodCfgCtrl(); }
 
 		/// <summary> Test parameters </summary>
 		[XmlIgnore]

TBF/BenchControl/TestMethods/GrabImage/GrabImageCfg.cs

@@ -16,7 +16,7 @@ namespace TBF.BenchControl.TestMethods.GrabImage
 		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(GrabImageCfg) })[0];
 		public override XmlSerializer GetSerializer() { return Serializer; }
 
-		public IComponentCfgCtrl GetControl() { return new GrabImageCfgCtrl(); }
+		public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new GrabImageCfgCtrl(); }
 
 
 		public string ImageFileName;

TBF/BenchControl/TestMethods/LeakTest/TestMethodCfg.cs

@@ -15,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.LeakTest
 		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(TestMethodCfg) })[0];
         public override XmlSerializer GetSerializer() { return Serializer; }
 
-		public IComponentCfgCtrl GetControl() { return new TestMethodCfgCtrl(); }
+		public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new TestMethodCfgCtrl(); }
 
 		/// <summary> Test parameters </summary>
 		[XmlIgnore]

TBF/BenchControl/TestMethods/LiveStream/LiveStreamCfg.cs

@@ -15,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.LiveStream
 		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(LiveStreamCfg) })[0];
 		public override XmlSerializer GetSerializer() { return Serializer; }
 
-		public IComponentCfgCtrl GetControl() { return new CfgCtrl(); }
+		public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new CfgCtrl(); }
 
 
 		public bool HiResolution;

TBF/BenchControl/TestMethods/ManualEntry/ManualEntryCfg.cs

@@ -2,6 +2,7 @@
 /// Copyright (c) 2019 Sensus Slovensko a.s.
 ///
 using System;
+using System.Collections.Generic;
 using System.Xml.Serialization;
 using TBF.BenchControl.Generic;
 using TBF.BenchControl.Output;
@@ -14,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.ManualEntry
 		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(ManualEntryCfg) })[0];
 		public override XmlSerializer GetSerializer() { return Serializer; }
 
-		public IComponentCfgCtrl GetControl() { return new ManualEntryCfgCtrl(); }
+		public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new ManualEntryCfgCtrl(); }
 
 		public Culture Culture;
 		public string Prompt;

TBF/BenchControl/TestMethods/PMaxTest/TestMethodCfg.cs

@@ -15,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.PMaxTest
 		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(TestMethodCfg) })[0];
         public override XmlSerializer GetSerializer() { return Serializer; }
 
-		public IComponentCfgCtrl GetControl() { return new TestMethodCfgCtrl(); }
+		public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new TestMethodCfgCtrl(); }
 
 		/// <summary> Test parameters </summary>
 		[XmlIgnore]

TBF/BenchControl/TestMethods/PulsesTest/TestMethodCfg.cs

@@ -16,7 +16,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTest
 		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(TestMethodCfg) })[0];
         public override XmlSerializer GetSerializer() { return Serializer; }
 
-		public IComponentCfgCtrl GetControl() { return new TestMethodCfgCtrl(); }
+		public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new TestMethodCfgCtrl(); }
 
 		/// <summary> Test parameters </summary>
 		[XmlIgnore]

TBF/BenchControl/TestMethods/Q2CorrectionFromHistory/FromHistoryCfg.cs

@@ -2,6 +2,7 @@
 /// Copyright (c) 2019 Sensus Slovensko a.s.
 ///
 using System;
+using System.Collections.Generic;
 using System.Xml.Serialization;
 using TBF.BenchControl.Generic;
 
@@ -12,7 +13,7 @@ namespace TBF.BenchControl.TestMethods.Q2CorrectionFromHistory
 		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(FromHistoryCfg) })[0];
 		public override XmlSerializer GetSerializer() { return Serializer; }
 
-		public IComponentCfgCtrl GetControl() { return new FromHistoryCfgCtrl(); }
+		public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new FromHistoryCfgCtrl(); }
 
 
         public bool UseWebService;

TBF/BenchControl/TestMethods/RoiDetection/RoiDetectionCfg.cs

@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Xml.Serialization;
+using Config.Entities;
 using TBF.BenchControl.Generic;
 
 namespace TBF.BenchControl.TestMethods.RoiDetection
@@ -14,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.RoiDetection
 		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(RoiDetectionCfg) })[0];
 		public override XmlSerializer GetSerializer() { return Serializer; }
 
-		public IComponentCfgCtrl GetControl() { return new RoiDetectionCfgCtrl(); }
+		public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new RoiDetectionCfgCtrl(); }
 
 		/// Private parameterless constructor invoked by all other (public) constructors
 		RoiDetectionCfg()

TBF/BenchControl/TestMethods/SensitivityTest/TestMethodCfg.cs

@@ -15,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.SensitivityTest
 		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(TestMethodCfg) })[0];
         public override XmlSerializer GetSerializer() { return Serializer; }
 
-		public IComponentCfgCtrl GetControl() { return new TestMethodCfgCtrl(); }
+		public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new TestMethodCfgCtrl(); }
 
 		/// <summary> Test parameters </summary>
 		[XmlIgnore]

TBF/BenchControl/TestMethods/iPerlCommunication/TestMethodCfg.cs

@@ -15,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication
 		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(TestMethodCfg) })[0];
         public override XmlSerializer GetSerializer() { return Serializer; }
 
-		public IComponentCfgCtrl GetControl() { return new TestMethodCfgCtrl(); }
+		public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new TestMethodCfgCtrl(); }
 
 		///
 		/// Serialized parameters 

TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationParams.cs

@@ -38,12 +38,11 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication
 		public override string ParamName(int i) { return paramNames[i]; }
 		public override int ParamsCount() { return paramNames.Length; }
 
-        public override IList<string> ParamValues(int i)
+        public override ICollection<string> ParamValues(int i)
         {
-            IList<string> retVal = new List<string>();
-
             if (i == 0)
             {
+                List<string> retVal = new List<string>();
                 retVal.Add(iPerlCommunicationForm.ReadConfigurationStr);
                 retVal.Add(string.Format("{0} A0", iPerlCommunicationForm.SetTestModeStr));
                 retVal.Add(string.Format("{0} A4", iPerlCommunicationForm.SetTestModeStr));
@@ -74,14 +73,12 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication
                 retVal.Add(string.Format("{0} if enabled", iPerlCommunicationForm.ReadConfigurationStr));
                 retVal.Add(string.Format("{0} 80", iPerlCommunicationForm.SetTestModeStr));
                 retVal.Add("iPerl_check prevWorkStep direction q2factors");
+                return retVal;
             }
             else
             {
-                retVal.Add(Strings.yes);
-                retVal.Add(Strings.no);
+                return new string[] { Strings.yes, Strings.no };
             }
-
-            return retVal;
         }
 
 		public override string ToString(int i)

TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/IperlHeadCfg.cs

@@ -18,7 +18,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication.iPerlHead
 		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(IperlHeadCfg) })[0];
         public override XmlSerializer GetSerializer() { return Serializer; }
 
-		public IComponentCfgCtrl GetControl() { return new IperlHeadCfgCtrl(); }
+		public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new IperlHeadCfgCtrl(); }
 
 		///
 		/// Serialized parameters 

TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/ProcParams.cs

@@ -54,17 +54,17 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication.iPerlHead
 		public override string ParamName(int i) { return paramNames[i]; }
         public override int ParamsCount() { return paramNames.Length; }
 
-        public override IList<string> ParamValues(int i)
+        public override ICollection<string> ParamValues(int i)
         {
             if (i == 0)
             {
-                IList<string> retVal = new List<string>();
+                List<string> retVal = new List<string>();
                 for (MeterType mt = 0; mt < MeterType.Count; mt++) retVal.Add(mt.ToString());
                 return retVal;
             }
             else if (i == 5)
             {
-                IList<string> retVal = new List<string>();
+                List<string> retVal = new List<string>();
                 for (Counting c = 0; c < Counting.Count; c++) retVal.Add(c.ToString());
                 return retVal;
             }