From 0468add53d1457ab9354b1cf7e616b62206a06af Mon Sep 17 00:00:00 2001
From: sebas77 <ssense@tiscali.it>
Date: Sun, 5 May 2019 19:57:13 +0100
Subject: [PATCH] clean up code

---
 ...yDescriptorInfo.cs => DynamicEntityDescriptor.cs} |  8 ++++----
 Svelto.ECS/EntityBuilder.cs                          |  1 -
 Svelto.ECS/EntityDescriptorInfo.cs                   | 12 +-----------
 Svelto.ECS/ExtendibleEntityDescriptor.cs             |  6 +++---
 Svelto.ECS/StaticEntityDescriptorInfo.cs             |  4 ++--
 5 files changed, 10 insertions(+), 21 deletions(-)
 rename Svelto.ECS/{DynamicEntityDescriptorInfo.cs => DynamicEntityDescriptor.cs} (74%)

diff --git a/Svelto.ECS/DynamicEntityDescriptorInfo.cs b/Svelto.ECS/DynamicEntityDescriptor.cs
similarity index 74%
rename from Svelto.ECS/DynamicEntityDescriptorInfo.cs
rename to Svelto.ECS/DynamicEntityDescriptor.cs
index 8cf3ee1..7ed086e 100644
--- a/Svelto.ECS/DynamicEntityDescriptorInfo.cs
+++ b/Svelto.ECS/DynamicEntityDescriptor.cs
@@ -2,9 +2,9 @@ using System;
 
 namespace Svelto.ECS
 {
-    public struct DynamicEntityDescriptorInfo<TType>:IEntityDescriptor where TType : IEntityDescriptor, new()
+    public struct DynamicEntityDescriptor<TType>:IEntityDescriptor where TType : IEntityDescriptor, new()
     {
-        public DynamicEntityDescriptorInfo(IEntityBuilder[] extraEntities)
+        public DynamicEntityDescriptor(IEntityBuilder[] extraEntities)
         {
             DBC.ECS.Check.Require(extraEntities.Length > 0,
                                   "don't use a DynamicEntityDescriptorInfo if you don't need to use extra EntityViews");
@@ -17,7 +17,7 @@ namespace Svelto.ECS
             Array.Copy(defaultEntities, 0, entitiesToBuild, 0, length);
             Array.Copy(extraEntities, 0, entitiesToBuild, length, extraEntities.Length);
 
-            var _builder = new EntityBuilder<EntityStructInfoView>
+            var builder = new EntityBuilder<EntityStructInfoView>
             {
                 _initializer = new EntityStructInfoView 
                 { 
@@ -25,7 +25,7 @@ namespace Svelto.ECS
                     type = typeof(TType)
                 }
             };
-            entitiesToBuild[entitiesToBuild.Length - 1] = _builder;
+            entitiesToBuild[entitiesToBuild.Length - 1] = builder;
         }
 
         public IEntityBuilder[] entitiesToBuild { get; }
diff --git a/Svelto.ECS/EntityBuilder.cs b/Svelto.ECS/EntityBuilder.cs
index d8cec9e..b0de643 100644
--- a/Svelto.ECS/EntityBuilder.cs
+++ b/Svelto.ECS/EntityBuilder.cs
@@ -78,7 +78,6 @@ namespace Svelto.ECS
 
         internal static readonly Type   ENTITY_VIEW_TYPE    = typeof(T);
         static readonly T      DEFAULT_IT          = default;
-        static readonly Type   ENTITYINFOVIEW_TYPE = typeof(EntityStructInfoView);
         static readonly bool   NEEDS_REFLECTION    = typeof(IEntityViewStruct).IsAssignableFrom(typeof(T));
         static readonly string ENTITY_VIEW_NAME    = ENTITY_VIEW_TYPE.ToString();
         internal static readonly bool HAS_EGID = typeof(INeedEGID).IsAssignableFrom(ENTITY_VIEW_TYPE);
diff --git a/Svelto.ECS/EntityDescriptorInfo.cs b/Svelto.ECS/EntityDescriptorInfo.cs
index 781f85d..72000aa 100644
--- a/Svelto.ECS/EntityDescriptorInfo.cs
+++ b/Svelto.ECS/EntityDescriptorInfo.cs
@@ -5,19 +5,9 @@ namespace Svelto.ECS
         IEntityBuilder[] entitiesToBuild { get; }
     }
 
-    public class EntityDescriptor : IEntityDescriptor
-    {
-        protected EntityDescriptor(IEntityBuilder[] entityToBuild)
-        {
-            entitiesToBuild = entityToBuild;
-        }
-        
-        public IEntityBuilder[] entitiesToBuild { get; }
-    }
-
     static class EntityDescriptorTemplate<TType> where TType : IEntityDescriptor, new()
     {
-        public static readonly StaticEntityDescriptorInfo<TType> descriptor 
+        internal static readonly StaticEntityDescriptorInfo<TType> descriptor 
             = new StaticEntityDescriptorInfo<TType>(new TType());
     }
 }
diff --git a/Svelto.ECS/ExtendibleEntityDescriptor.cs b/Svelto.ECS/ExtendibleEntityDescriptor.cs
index 28178a1..eb93499 100644
--- a/Svelto.ECS/ExtendibleEntityDescriptor.cs
+++ b/Svelto.ECS/ExtendibleEntityDescriptor.cs
@@ -1,14 +1,14 @@
 namespace Svelto.ECS
 {
-    public class ExtendibleEntityDescriptor<TType>:IEntityDescriptor where TType : IEntityDescriptor, new()
+    public abstract class ExtendibleEntityDescriptor<TType>:IEntityDescriptor where TType : IEntityDescriptor, new()
     {
         protected ExtendibleEntityDescriptor(IEntityBuilder[] extraEntities)
         {
-            _dynamicDescriptor = new  DynamicEntityDescriptorInfo<TType>(extraEntities);
+            _dynamicDescriptor = new DynamicEntityDescriptor<TType>(extraEntities);
         }
 
         public IEntityBuilder[] entitiesToBuild { get { return _dynamicDescriptor.entitiesToBuild; } }
 
-        readonly DynamicEntityDescriptorInfo<TType> _dynamicDescriptor;
+        readonly DynamicEntityDescriptor<TType> _dynamicDescriptor;
     }
 }
\ No newline at end of file
diff --git a/Svelto.ECS/StaticEntityDescriptorInfo.cs b/Svelto.ECS/StaticEntityDescriptorInfo.cs
index f63f41e..3acc6df 100644
--- a/Svelto.ECS/StaticEntityDescriptorInfo.cs
+++ b/Svelto.ECS/StaticEntityDescriptorInfo.cs
@@ -1,13 +1,13 @@
 namespace Svelto.ECS
 {
-    public class StaticEntityDescriptorInfo<TType>: IEntityDescriptor where TType : IEntityDescriptor
+    class StaticEntityDescriptorInfo<TType>: IEntityDescriptor where TType : IEntityDescriptor
     {
         internal StaticEntityDescriptorInfo(TType descriptor)
         {
             entitiesToBuild = descriptor.entitiesToBuild;
         }
 
-        public IEntityBuilder[] entitiesToBuild { get; private set; }
+        public IEntityBuilder[] entitiesToBuild { get; }
     }
 }