From 4f00292638f779871aa907cda821ed7a752a9de9 Mon Sep 17 00:00:00 2001
From: jpbruyere <jp.bruyere@hotmail.com>
Date: Sat, 5 Nov 2016 09:17:30 +0100
Subject: [PATCH] IML namespace for Reader

---
 Crow.csproj                         |  3 ++-
 src/{IMLReader.cs => IML/Reader.cs} | 18 +++++++++---------
 src/Instantiator.cs                 |  4 ++--
 3 files changed, 13 insertions(+), 12 deletions(-)
 rename src/{IMLReader.cs => IML/Reader.cs} (97%)

diff --git a/Crow.csproj b/Crow.csproj
index 6c44395e..a4b6a0c6 100644
--- a/Crow.csproj
+++ b/Crow.csproj
@@ -135,7 +135,6 @@
     <Compile Include="src\StyleReader.cs" />
     <Compile Include="src\GraphicObjects\DirectoryView.cs" />
     <Compile Include="src\Instantiator.cs" />
-    <Compile Include="src\IMLReader.cs" />
     <Compile Include="src\ItemTemplate.cs" />
     <Compile Include="src\Style.cs" />
     <Compile Include="src\GraphicObjects\Wrapper.cs" />
@@ -144,6 +143,7 @@
     <Compile Include="src\GraphicObjects\Menu.cs" />
     <Compile Include="src\Command.cs" />
     <Compile Include="src\GraphicObjects\DataSourceChangeEventArgs.cs" />
+    <Compile Include="src\IML\Reader.cs"/>
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -183,6 +183,7 @@
     <Folder Include="src\Fill\" />
     <Folder Include="src\Input\" />
     <Folder Include="src\rsvg\" />
+    <Folder Include="src\IML\" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Images\Icons\updown.svg" />
diff --git a/src/IMLReader.cs b/src/IML/Reader.cs
similarity index 97%
rename from src/IMLReader.cs
rename to src/IML/Reader.cs
index 55317aba..eeed4176 100644
--- a/src/IMLReader.cs
+++ b/src/IML/Reader.cs
@@ -26,9 +26,9 @@ using System.Reflection.Emit;
 using System.Linq;
 using System.Collections.Generic;
 
-namespace Crow
+namespace Crow.IML
 {
-	public class IMLReader : XmlTextReader
+	public class Reader : XmlTextReader
 	{
 		static MethodInfo[] miAddChild = new MethodInfo[]{			
 			typeof(Container).GetMethod ("SetChild"),
@@ -165,10 +165,10 @@ namespace Crow
 		//protected Stack<int> curTemplateDepth = new Stack<int>(new int[] {0});	//current template root depth
 
 		#region CTOR
-		public IMLReader (string path)
+		public Reader (string path)
 			: this(Interface.GetStreamFromPath (path)){
 		}
-		public IMLReader (Stream stream)
+		public Reader (Stream stream)
 			: base(stream)
 		{
 			createInstantiator ();
@@ -177,7 +177,7 @@ namespace Crow
 		/// Used to parse xmlFrament with same code generator linked
 		/// If ilGen=null, a new Code Generator will be created.
 		/// </summary>
-		public IMLReader (IMLContext ctx, string xmlFragment)
+		public Reader (IMLContext ctx, string xmlFragment)
 			: base(xmlFragment, XmlNodeType.Element,null){
 
 			IMLCtx = ctx;
@@ -243,7 +243,7 @@ namespace Crow
 			#region Template and ItemTemplates loading
 			if (IMLCtx.curSubNodeType >= SubNodeType.Template) {
 				//if its a template, first read template elements
-				using (IMLReader reader = new IMLReader (IMLCtx, tmpXml)) {
+				using (Reader reader = new Reader (IMLCtx, tmpXml)) {
 
 					string templatePath = reader.GetAttribute ("Template");
 
@@ -275,7 +275,7 @@ namespace Crow
 							string itemTmpID;
 
 							if (string.IsNullOrEmpty (path)) {
-								using (IMLReader iTmp = new IMLReader (null, reader.ReadInnerXml ())) {
+								using (Reader iTmp = new Reader (null, reader.ReadInnerXml ())) {
 									itemTmpID = Guid.NewGuid ().ToString ();
 									Interface.Instantiators [itemTmpID] =
 										new ItemTemplate (iTmp.RootType, iTmp.GetLoader (), dataType, datas);
@@ -330,7 +330,7 @@ namespace Crow
 			}
 			#endregion
 
-			using (IMLReader reader = new IMLReader(IMLCtx,tmpXml)){
+			using (Reader reader = new Reader(IMLCtx,tmpXml)){
 				reader.Read ();
 
 				#region Styling and default values loading
@@ -472,7 +472,7 @@ namespace Crow
 		/// <summary>
 		/// Parse child node an generate corresponding msil
 		/// </summary>
-		void readChildren(IMLReader reader){
+		void readChildren(Reader reader){
 			bool endTagReached = false;
 			while (reader.Read()){
 				switch (reader.NodeType) {
diff --git a/src/Instantiator.cs b/src/Instantiator.cs
index 5903f4f1..2fde4fba 100644
--- a/src/Instantiator.cs
+++ b/src/Instantiator.cs
@@ -45,7 +45,7 @@ namespace Crow
 			loadingTime.Start ();
 			#endif
 			try {
-				using (IMLReader itr = new IMLReader (path)){
+				using (IML.Reader itr = new IML.Reader (path)){
 					loader = itr.GetLoader ();
 					RootType = itr.RootType;
 				}
@@ -73,7 +73,7 @@ namespace Crow
 			Stopwatch loadingTime = new Stopwatch ();
 			loadingTime.Start ();
 			#endif
-			using (IMLReader itr = new IMLReader (stream)){
+			using (IML.Reader itr = new IML.Reader (stream)){
 				loader = itr.GetLoader ();
 				RootType = itr.RootType;
 			}
-- 
2.47.3