From 5a46383da4b8dfbfdb80e0ec9fc085d0ff1de84a Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 27 Apr 2023 14:45:57 +0200
Subject: [PATCH] Fix area IobNet

---
 IOB-WIN-NEXT/AdapterForm.cs                        | 6 +++---
 IOB-WIN-NEXT/IOB-WIN-NEXT.csproj                   | 7 ++++---
 IOB-WIN-NEXT/{Iob => IobNet}/IcoelSoap.cs          | 2 +-
 IOB-WIN-NEXT/{IobPing.cs => IobNet/Ping.cs}        | 6 +++---
 IOB-WIN-NEXT/{IobWPS.cs => IobNet/WebPageScrap.cs} | 6 +++---
 5 files changed, 14 insertions(+), 13 deletions(-)
 rename IOB-WIN-NEXT/{Iob => IobNet}/IcoelSoap.cs (99%)
 rename IOB-WIN-NEXT/{IobPing.cs => IobNet/Ping.cs} (96%)
 rename IOB-WIN-NEXT/{IobWPS.cs => IobNet/WebPageScrap.cs} (98%)

diff --git a/IOB-WIN-NEXT/AdapterForm.cs b/IOB-WIN-NEXT/AdapterForm.cs
index 4416af09..20d4b922 100644
--- a/IOB-WIN-NEXT/AdapterForm.cs
+++ b/IOB-WIN-NEXT/AdapterForm.cs
@@ -1668,7 +1668,7 @@ namespace IOB_WIN_NEXT
                         break;
 
                     case tipoAdapter.IcoelSoap:
-                        iobObj = new Iob.IcoelSoap(this, IOBConf);
+                        iobObj = new IobNet.IcoelSoap(this, IOBConf);
                         start.Enabled = true;
                         break;
 
@@ -1804,7 +1804,7 @@ namespace IOB_WIN_NEXT
                         break;
 
                     case tipoAdapter.PingWatchdog:
-                        iobObj = new IobPing(this, IOBConf);
+                        iobObj = new IobNet.Ping(this, IOBConf);
                         start.Enabled = true;
                         break;
 
@@ -1902,7 +1902,7 @@ namespace IOB_WIN_NEXT
                         break;
 
                     case tipoAdapter.WPS:
-                        iobObj = new IobWPS(this, IOBConf);
+                        iobObj = new IobNet.WebPageScrap(this, IOBConf);
                         start.Enabled = true;
                         break;
 
diff --git a/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj b/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj
index 57509e04..962ba7ab 100644
--- a/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj
+++ b/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj
@@ -238,7 +238,7 @@
     <Compile Include="IobSql\SqlServLantek.cs" />
     <Compile Include="IobSql\SqlServPama.cs" />
     <Compile Include="IobSql\IcoelDb.cs" />
-    <Compile Include="Iob\IcoelSoap.cs" />
+    <Compile Include="IobNet\IcoelSoap.cs" />
     <Compile Include="IobModbusTCP\ModbusTCPFimat.cs" />
     <Compile Include="IobModbusTCP\ModbusTCPRimor.cs" />
     <Compile Include="IobModbusTCP\ModbusTCPSaim.cs" />
@@ -273,7 +273,7 @@
     <Compile Include="IobOpc\OpcUaCMS.cs" />
     <Compile Include="IobOpc\OpcUaEwon.cs" />
     <Compile Include="IobBeckhoff\Beckhoff.cs" />
-    <Compile Include="IobPing.cs" />
+    <Compile Include="IobNet\Ping.cs" />
     <Compile Include="IobSiemens\SiemensAt2001.cs" />
     <Compile Include="IobSiemens\SiemensComeca.cs" />
     <Compile Include="IobSiemens\SiemensRobotService.cs" />
@@ -285,7 +285,7 @@
     <Compile Include="IobSiemens\SiemensComur.cs" />
     <Compile Include="IobSiemens\SiemensSaet.cs" />
     <Compile Include="IobFile\FileGen.cs" />
-    <Compile Include="IobWPS.cs" />
+    <Compile Include="IobNet\WebPageScrap.cs" />
     <Compile Include="IobOSAI.cs" />
     <Compile Include="IobKawasaki.cs" />
     <Compile Include="IobSiemens\SiemensAprochim.cs" />
@@ -810,6 +810,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <Folder Include="Iob\" />
     <Folder Include="prog\" />
   </ItemGroup>
   <ItemGroup>
diff --git a/IOB-WIN-NEXT/Iob/IcoelSoap.cs b/IOB-WIN-NEXT/IobNet/IcoelSoap.cs
similarity index 99%
rename from IOB-WIN-NEXT/Iob/IcoelSoap.cs
rename to IOB-WIN-NEXT/IobNet/IcoelSoap.cs
index e25163e6..bed99801 100644
--- a/IOB-WIN-NEXT/Iob/IcoelSoap.cs
+++ b/IOB-WIN-NEXT/IobNet/IcoelSoap.cs
@@ -6,7 +6,7 @@ using System;
 using System.Collections.Generic;
 using System.Net.NetworkInformation;
 
-namespace IOB_WIN_NEXT.Iob
+namespace IOB_WIN_NEXT.IobNet
 {
     /// <summary>
     /// Adapter specializzato per ICOEL e le chiamate tramite WS Soap al Sizer, con libreria EgwProxy.Icoel
diff --git a/IOB-WIN-NEXT/IobPing.cs b/IOB-WIN-NEXT/IobNet/Ping.cs
similarity index 96%
rename from IOB-WIN-NEXT/IobPing.cs
rename to IOB-WIN-NEXT/IobNet/Ping.cs
index c0582621..3297e440 100644
--- a/IOB-WIN-NEXT/IobPing.cs
+++ b/IOB-WIN-NEXT/IobNet/Ping.cs
@@ -3,9 +3,9 @@ using MapoSDK;
 using System;
 using System.Net.NetworkInformation;
 
-namespace IOB_WIN_NEXT
+namespace IOB_WIN_NEXT.IobNet
 {
-    public class IobPing : IobGeneric
+    public class Ping : IobGeneric
     {
         #region Public Constructors
 
@@ -13,7 +13,7 @@ namespace IOB_WIN_NEXT
         /// Estende l'init della classe base
         /// <param name="caller"></param>
         /// <param name="IOBConf"></param>
-        public IobPing(AdapterForm caller, IobConfiguration IOBConf) : base(caller, IOBConf)
+        public Ping(AdapterForm caller, IobConfiguration IOBConf) : base(caller, IOBConf)
         {
             lgInfo("NEW IobPing (WatchDog)");
             // init datetime counters
diff --git a/IOB-WIN-NEXT/IobWPS.cs b/IOB-WIN-NEXT/IobNet/WebPageScrap.cs
similarity index 98%
rename from IOB-WIN-NEXT/IobWPS.cs
rename to IOB-WIN-NEXT/IobNet/WebPageScrap.cs
index 89c2be45..ea91bc2f 100644
--- a/IOB-WIN-NEXT/IobWPS.cs
+++ b/IOB-WIN-NEXT/IobNet/WebPageScrap.cs
@@ -12,13 +12,13 @@ using System.Net.NetworkInformation;
 using System.Threading;
 using System.Windows.Forms;
 
-namespace IOB_WIN_NEXT
+namespace IOB_WIN_NEXT.IobNet
 {
     /// <summary>
     /// Generica classe per implementare WebPageScraping (scaricamento web pages anche js-based x
     /// recupero informazioni)
     /// </summary>
-    public class IobWPS : IobGeneric, IDisposable
+    public class WebPageScrap : IobGeneric, IDisposable
     {
         /* --------------------------------------------------------------------------------
          * Controlli dotati di GENERICA pagina WEB in cui cercare e recuperare informazioni
@@ -35,7 +35,7 @@ namespace IOB_WIN_NEXT
         /// </summary>
         /// <param name="caller"></param>
         /// <param name="adpConf"></param>
-        public IobWPS(AdapterForm caller, IobConfiguration IOBConf) : base(caller, IOBConf)
+        public WebPageScrap(AdapterForm caller, IobConfiguration IOBConf) : base(caller, IOBConf)
         {
             lgInfo("INIT IobWPS");
             //reloadAdapterConf();