Changes for Xylem Nanjing, ver. 3.1.1676

TBF/UI/Bench/Components/ComponentsManagerDlg.cs

@@ -1,6 +1,5 @@
 ///
-/// Copyright (c) 2013-2017 Sensus Metering Systems
-/// Author: Milan Hanajík
+/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -8,6 +7,7 @@ using System.IO;
 using System.Windows.Forms;
 using log4net;
 using NHibernate;
+using Common;
 using Config.Entities;
 using Results.Forms;
 using TBF.Rig;
@@ -24,9 +24,9 @@ namespace TBF.UI.Bench.Components
 		/// <summary>
 		/// List of components (=component configuration instances)
 		/// </summary>
-		IList<Component> cmpntEntities;
+        IList<Config.Entities.Component> cmpntEntities;
 
-		IList<Component> toBeDeletedEntities;
+        IList<Config.Entities.Component> toBeDeletedEntities;
 
 		ISession session;
 
@@ -60,7 +60,7 @@ namespace TBF.UI.Bench.Components
 
 		public ComponentsManagerDlg()
 		{
-			toBeDeletedEntities = new List<Component>();
+			toBeDeletedEntities = new List<Config.Entities.Component>();
 
 			InitializeComponent();
 
@@ -69,7 +69,7 @@ namespace TBF.UI.Bench.Components
 			selectComponentTypeDlg = new SelectComponentClassDlg();
 
 			/// SharedDlgButtons configuration
-			sharedButtons.RequiredGroupMembership = new Users.Entities.GID[] { Users.Entities.GID.Metrologists };
+			sharedButtons.RequiredGroupMembership = new GID[] { GID.Metrologists };
 
             sharedButtons.OptionalButtons = SharedButtons.Buttons.Add |
                                             SharedButtons.Buttons.Remove |
@@ -120,7 +120,7 @@ namespace TBF.UI.Bench.Components
 
 			sharedButtons.DisableButtons(SharedButtons.Buttons.Remove | SharedButtons.Buttons.Edit);
 
-			session = Config.FluentCommon.CreateSession(Users.Entities.DBKind.Config);
+			session = Config.FluentCommon.CreateSession(DBKind.Config);
 			cmpntEntities = session.QueryOver<Component>()
                                    .OrderBy(x => x.ItemNr).Asc
                 				   .List<Component>();