From 059d3ffb090d71a01f90a8b750529a92f35b212e Mon Sep 17 00:00:00 2001
From: walon <taojingjian@gmail.com>
Date: Tue, 29 Jun 2021 20:14:54 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=87=8D=E6=9E=84=E3=80=91=20TType=20?=
 =?UTF-8?q?->=20TData=20Creator=E7=B1=BB=E4=BB=8ETypeVisitors=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95=E7=A7=BB=E5=88=B0DataCreators=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Luban.Job.Cfg/Luban.Job.Cfg.csproj                        | 4 ----
 .../Source/{TypeVisitors => DataCreators}/ExcelDataCreator.cs | 2 +-
 .../ExcelNamedRowDataCreator.cs                               | 2 +-
 .../Source/{TypeVisitors => DataCreators}/JsonDataCreator.cs  | 2 +-
 .../Source/{TypeVisitors => DataCreators}/LuaDataCreator.cs   | 2 +-
 .../MultiRowExcelDataCreator.cs                               | 2 +-
 .../{TypeVisitors => DataCreators}/StringDataCreator.cs       | 2 +-
 .../Source/{TypeVisitors => DataCreators}/XmlDataCreator.cs   | 2 +-
 src/Luban.Job.Cfg/Source/DataSources/Excel/Sheet.cs           | 1 +
 src/Luban.Job.Cfg/Source/DataSources/Json/JsonDataSource.cs   | 1 +
 src/Luban.Job.Cfg/Source/DataSources/Lua/LuaDataSource.cs     | 1 +
 src/Luban.Job.Cfg/Source/DataSources/Xml/XmlDataSource.cs     | 1 +
 12 files changed, 11 insertions(+), 11 deletions(-)
 rename src/Luban.Job.Cfg/Source/{TypeVisitors => DataCreators}/ExcelDataCreator.cs (99%)
 rename src/Luban.Job.Cfg/Source/{TypeVisitors => DataCreators}/ExcelNamedRowDataCreator.cs (99%)
 rename src/Luban.Job.Cfg/Source/{TypeVisitors => DataCreators}/JsonDataCreator.cs (99%)
 rename src/Luban.Job.Cfg/Source/{TypeVisitors => DataCreators}/LuaDataCreator.cs (99%)
 rename src/Luban.Job.Cfg/Source/{TypeVisitors => DataCreators}/MultiRowExcelDataCreator.cs (99%)
 rename src/Luban.Job.Cfg/Source/{TypeVisitors => DataCreators}/StringDataCreator.cs (99%)
 rename src/Luban.Job.Cfg/Source/{TypeVisitors => DataCreators}/XmlDataCreator.cs (99%)

diff --git a/src/Luban.Job.Cfg/Luban.Job.Cfg.csproj b/src/Luban.Job.Cfg/Luban.Job.Cfg.csproj
index edfff9c..b269046 100644
--- a/src/Luban.Job.Cfg/Luban.Job.Cfg.csproj
+++ b/src/Luban.Job.Cfg/Luban.Job.Cfg.csproj
@@ -20,8 +20,4 @@
     <ProjectReference Include="..\Luban.Job.Common\Luban.Job.Common.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Source\DataCreators\" />
-  </ItemGroup>
-
 </Project>
diff --git a/src/Luban.Job.Cfg/Source/TypeVisitors/ExcelDataCreator.cs b/src/Luban.Job.Cfg/Source/DataCreators/ExcelDataCreator.cs
similarity index 99%
rename from src/Luban.Job.Cfg/Source/TypeVisitors/ExcelDataCreator.cs
rename to src/Luban.Job.Cfg/Source/DataCreators/ExcelDataCreator.cs
index 2a53971..769afe8 100644
--- a/src/Luban.Job.Cfg/Source/TypeVisitors/ExcelDataCreator.cs
+++ b/src/Luban.Job.Cfg/Source/DataCreators/ExcelDataCreator.cs
@@ -9,7 +9,7 @@ using System;
 using System.Collections.Generic;
 using System.Runtime.Serialization;
 
-namespace Luban.Job.Cfg.TypeVisitors
+namespace Luban.Job.Cfg.DataCreators
 {
     enum EReadPolicy
     {
diff --git a/src/Luban.Job.Cfg/Source/TypeVisitors/ExcelNamedRowDataCreator.cs b/src/Luban.Job.Cfg/Source/DataCreators/ExcelNamedRowDataCreator.cs
similarity index 99%
rename from src/Luban.Job.Cfg/Source/TypeVisitors/ExcelNamedRowDataCreator.cs
rename to src/Luban.Job.Cfg/Source/DataCreators/ExcelNamedRowDataCreator.cs
index 2f4be6e..c8f93f0 100644
--- a/src/Luban.Job.Cfg/Source/TypeVisitors/ExcelNamedRowDataCreator.cs
+++ b/src/Luban.Job.Cfg/Source/DataCreators/ExcelNamedRowDataCreator.cs
@@ -8,7 +8,7 @@ using Luban.Job.Common.TypeVisitors;
 using System;
 using System.Collections.Generic;
 
-namespace Luban.Job.Cfg.TypeVisitors
+namespace Luban.Job.Cfg.DataCreators
 {
     class ExcelNamedRowDataCreator : ITypeFuncVisitor<Sheet.NamedRow, bool, bool, DType>
     {
diff --git a/src/Luban.Job.Cfg/Source/TypeVisitors/JsonDataCreator.cs b/src/Luban.Job.Cfg/Source/DataCreators/JsonDataCreator.cs
similarity index 99%
rename from src/Luban.Job.Cfg/Source/TypeVisitors/JsonDataCreator.cs
rename to src/Luban.Job.Cfg/Source/DataCreators/JsonDataCreator.cs
index ce6e9b4..35052f3 100644
--- a/src/Luban.Job.Cfg/Source/TypeVisitors/JsonDataCreator.cs
+++ b/src/Luban.Job.Cfg/Source/DataCreators/JsonDataCreator.cs
@@ -8,7 +8,7 @@ using System;
 using System.Collections.Generic;
 using System.Text.Json;
 
-namespace Luban.Job.Cfg.TypeVisitors
+namespace Luban.Job.Cfg.DataCreators
 {
     public class JsonDataCreator : ITypeFuncVisitor<JsonElement, DefAssembly, DType>
     {
diff --git a/src/Luban.Job.Cfg/Source/TypeVisitors/LuaDataCreator.cs b/src/Luban.Job.Cfg/Source/DataCreators/LuaDataCreator.cs
similarity index 99%
rename from src/Luban.Job.Cfg/Source/TypeVisitors/LuaDataCreator.cs
rename to src/Luban.Job.Cfg/Source/DataCreators/LuaDataCreator.cs
index 73cd942..75ba801 100644
--- a/src/Luban.Job.Cfg/Source/TypeVisitors/LuaDataCreator.cs
+++ b/src/Luban.Job.Cfg/Source/DataCreators/LuaDataCreator.cs
@@ -9,7 +9,7 @@ using System;
 using System.Collections.Generic;
 using System.Numerics;
 
-namespace Luban.Job.Cfg.TypeVisitors
+namespace Luban.Job.Cfg.DataCreators
 {
     class LuaDataCreator : ITypeFuncVisitor<object, DefAssembly, DType>
     {
diff --git a/src/Luban.Job.Cfg/Source/TypeVisitors/MultiRowExcelDataCreator.cs b/src/Luban.Job.Cfg/Source/DataCreators/MultiRowExcelDataCreator.cs
similarity index 99%
rename from src/Luban.Job.Cfg/Source/TypeVisitors/MultiRowExcelDataCreator.cs
rename to src/Luban.Job.Cfg/Source/DataCreators/MultiRowExcelDataCreator.cs
index 12611b2..b59edd5 100644
--- a/src/Luban.Job.Cfg/Source/TypeVisitors/MultiRowExcelDataCreator.cs
+++ b/src/Luban.Job.Cfg/Source/DataCreators/MultiRowExcelDataCreator.cs
@@ -6,7 +6,7 @@ using Luban.Job.Common.TypeVisitors;
 using System;
 using System.Collections.Generic;
 
-namespace Luban.Job.Cfg.TypeVisitors
+namespace Luban.Job.Cfg.DataCreators
 {
     class MultiRowExcelDataCreator : ITypeFuncVisitor<IEnumerable<ExcelStream>, bool, DefAssembly, DType>
     {
diff --git a/src/Luban.Job.Cfg/Source/TypeVisitors/StringDataCreator.cs b/src/Luban.Job.Cfg/Source/DataCreators/StringDataCreator.cs
similarity index 99%
rename from src/Luban.Job.Cfg/Source/TypeVisitors/StringDataCreator.cs
rename to src/Luban.Job.Cfg/Source/DataCreators/StringDataCreator.cs
index 1444f17..3505d3f 100644
--- a/src/Luban.Job.Cfg/Source/TypeVisitors/StringDataCreator.cs
+++ b/src/Luban.Job.Cfg/Source/DataCreators/StringDataCreator.cs
@@ -4,7 +4,7 @@ using Luban.Job.Common.Types;
 using Luban.Job.Common.TypeVisitors;
 using System;
 
-namespace Luban.Job.Cfg.TypeVisitors
+namespace Luban.Job.Cfg.DataCreators
 {
     class StringDataCreator : ITypeFuncVisitor<string, DType>
     {
diff --git a/src/Luban.Job.Cfg/Source/TypeVisitors/XmlDataCreator.cs b/src/Luban.Job.Cfg/Source/DataCreators/XmlDataCreator.cs
similarity index 99%
rename from src/Luban.Job.Cfg/Source/TypeVisitors/XmlDataCreator.cs
rename to src/Luban.Job.Cfg/Source/DataCreators/XmlDataCreator.cs
index 706a6f9..094c576 100644
--- a/src/Luban.Job.Cfg/Source/TypeVisitors/XmlDataCreator.cs
+++ b/src/Luban.Job.Cfg/Source/DataCreators/XmlDataCreator.cs
@@ -9,7 +9,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Xml.Linq;
 
-namespace Luban.Job.Cfg.TypeVisitors
+namespace Luban.Job.Cfg.DataCreators
 {
     class XmlDataCreator : ITypeFuncVisitor<XElement, DefAssembly, DType>
     {
diff --git a/src/Luban.Job.Cfg/Source/DataSources/Excel/Sheet.cs b/src/Luban.Job.Cfg/Source/DataSources/Excel/Sheet.cs
index c62bc25..a2c2536 100644
--- a/src/Luban.Job.Cfg/Source/DataSources/Excel/Sheet.cs
+++ b/src/Luban.Job.Cfg/Source/DataSources/Excel/Sheet.cs
@@ -1,4 +1,5 @@
 using ExcelDataReader;
+using Luban.Job.Cfg.DataCreators;
 using Luban.Job.Cfg.Datas;
 using Luban.Job.Cfg.TypeVisitors;
 using Luban.Job.Common.Types;
diff --git a/src/Luban.Job.Cfg/Source/DataSources/Json/JsonDataSource.cs b/src/Luban.Job.Cfg/Source/DataSources/Json/JsonDataSource.cs
index f0ca351..550e7ba 100644
--- a/src/Luban.Job.Cfg/Source/DataSources/Json/JsonDataSource.cs
+++ b/src/Luban.Job.Cfg/Source/DataSources/Json/JsonDataSource.cs
@@ -1,3 +1,4 @@
+using Luban.Job.Cfg.DataCreators;
 using Luban.Job.Cfg.Datas;
 using Luban.Job.Cfg.Defs;
 using Luban.Job.Cfg.TypeVisitors;
diff --git a/src/Luban.Job.Cfg/Source/DataSources/Lua/LuaDataSource.cs b/src/Luban.Job.Cfg/Source/DataSources/Lua/LuaDataSource.cs
index 4b293a6..a60c394 100644
--- a/src/Luban.Job.Cfg/Source/DataSources/Lua/LuaDataSource.cs
+++ b/src/Luban.Job.Cfg/Source/DataSources/Lua/LuaDataSource.cs
@@ -1,3 +1,4 @@
+using Luban.Job.Cfg.DataCreators;
 using Luban.Job.Cfg.Datas;
 using Luban.Job.Cfg.Defs;
 using Luban.Job.Cfg.TypeVisitors;
diff --git a/src/Luban.Job.Cfg/Source/DataSources/Xml/XmlDataSource.cs b/src/Luban.Job.Cfg/Source/DataSources/Xml/XmlDataSource.cs
index 0abf98c..bcd1cee 100644
--- a/src/Luban.Job.Cfg/Source/DataSources/Xml/XmlDataSource.cs
+++ b/src/Luban.Job.Cfg/Source/DataSources/Xml/XmlDataSource.cs
@@ -1,3 +1,4 @@
+using Luban.Job.Cfg.DataCreators;
 using Luban.Job.Cfg.Datas;
 using Luban.Job.Cfg.Defs;
 using Luban.Job.Cfg.TypeVisitors;