From 6137433aefde1257fa42e0823242e66f5bd57e22 Mon Sep 17 00:00:00 2001
From: Sergey Chebotar <s.chebotar@gmail.com>
Date: Tue, 20 Dec 2022 12:41:46 +0300
Subject: [PATCH] Refactoring

---
 src/{ => AddIn}/AddIn.cs             | 3 +--
 src/{Services => AddIn}/Functions.cs | 4 ++--
 src/Controllers/RibbonController.cs  | 1 +
 src/Controllers/ToolBase.cs          | 1 +
 src/Models/StatusbarBase.cs          | 1 +
 src/RhSolutions.csproj               | 4 ++--
 src/Services/EventsUtil.cs           | 1 +
 src/Services/RhDatabaseClient.cs     | 1 +
 8 files changed, 10 insertions(+), 6 deletions(-)
 rename src/{ => AddIn}/AddIn.cs (93%)
 rename src/{Services => AddIn}/Functions.cs (93%)

diff --git a/src/AddIn.cs b/src/AddIn/AddIn.cs
similarity index 93%
rename from src/AddIn.cs
rename to src/AddIn/AddIn.cs
index 8c44821..b747264 100644
--- a/src/AddIn.cs
+++ b/src/AddIn/AddIn.cs
@@ -3,9 +3,8 @@ using ExcelDna.IntelliSense;
 using Microsoft.Office.Interop.Excel;
 using RhSolutions.Services;
 using System.Net.Http;
-using System.Runtime.Caching;
 
-namespace RhSolutions
+namespace RhSolutions.AddIn
 {
     class RhSolutionsAddIn : IExcelAddIn
     {
diff --git a/src/Services/Functions.cs b/src/AddIn/Functions.cs
similarity index 93%
rename from src/Services/Functions.cs
rename to src/AddIn/Functions.cs
index 22b67e0..2be19fa 100644
--- a/src/Services/Functions.cs
+++ b/src/AddIn/Functions.cs
@@ -1,7 +1,7 @@
 using ExcelDna.Integration;
-using System;
+using RhSolutions.Services;
 
-namespace RhSolutions.Services
+namespace RhSolutions.AddIn
 {
     public class Functions
     {
diff --git a/src/Controllers/RibbonController.cs b/src/Controllers/RibbonController.cs
index 87c62e1..1175e91 100644
--- a/src/Controllers/RibbonController.cs
+++ b/src/Controllers/RibbonController.cs
@@ -1,5 +1,6 @@
 using ExcelDna.Integration.CustomUI;
 using Microsoft.Office.Interop.Excel;
+using RhSolutions.AddIn;
 using RhSolutions.Services;
 using System;
 using System.IO;
diff --git a/src/Controllers/ToolBase.cs b/src/Controllers/ToolBase.cs
index 87eb9d9..72f480e 100644
--- a/src/Controllers/ToolBase.cs
+++ b/src/Controllers/ToolBase.cs
@@ -1,4 +1,5 @@
 using Microsoft.Office.Interop.Excel;
+using RhSolutions.AddIn;
 using RhSolutions.Models;
 using RhSolutions.Services;
 using System;
diff --git a/src/Models/StatusbarBase.cs b/src/Models/StatusbarBase.cs
index a1be5ed..361d5a9 100644
--- a/src/Models/StatusbarBase.cs
+++ b/src/Models/StatusbarBase.cs
@@ -1,5 +1,6 @@
 using ExcelDna.Integration;
 using Microsoft.Office.Interop.Excel;
+using RhSolutions.AddIn;
 using System;
 using System.Threading;
 using System.Threading.Tasks;
diff --git a/src/RhSolutions.csproj b/src/RhSolutions.csproj
index 31c90cb..6fb6587 100644
--- a/src/RhSolutions.csproj
+++ b/src/RhSolutions.csproj
@@ -97,8 +97,8 @@
     <Compile Include="Models\TargetPriceList.cs" />
     <Compile Include="Controllers\RibbonController.cs" />
     <Compile Include="Controllers\ExportTool.cs" />
-    <Compile Include="AddIn.cs" />
-    <Compile Include="Services\Functions.cs" />
+    <Compile Include="AddIn\AddIn.cs" />
+    <Compile Include="AddIn\Functions.cs" />
     <Compile Include="Models\WorksheetExtensions.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
diff --git a/src/Services/EventsUtil.cs b/src/Services/EventsUtil.cs
index 4b1d923..bb37125 100644
--- a/src/Services/EventsUtil.cs
+++ b/src/Services/EventsUtil.cs
@@ -1,4 +1,5 @@
 using Microsoft.Office.Interop.Excel;
+using RhSolutions.AddIn;
 using RhSolutions.Controllers;
 
 namespace RhSolutions.Services
diff --git a/src/Services/RhDatabaseClient.cs b/src/Services/RhDatabaseClient.cs
index c57d4d8..d71a6ba 100644
--- a/src/Services/RhDatabaseClient.cs
+++ b/src/Services/RhDatabaseClient.cs
@@ -1,4 +1,5 @@
 using Newtonsoft.Json;
+using RhSolutions.AddIn;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;