Browse Source

Fixed some bugs

Kenric Nugteren 2 years ago
parent
commit
6b2383960e

+ 1 - 1
InABox.Core/Dimensions/DimensionUnitLink.cs

@@ -8,7 +8,7 @@ namespace InABox.Core
         {
         }
 
-        protected DimensionUnitLink(Func<Entity>? entity) : base(entity)
+        protected DimensionUnitLink(Func<BaseObject>? entity) : base(entity)
         {
         }
 

+ 2 - 2
InABox.Core/Dimensions/Dimensions.cs

@@ -11,7 +11,7 @@ namespace InABox.Core
 
         public Dimensions() : base() { }
         
-        public Dimensions(Func<Entity> entity) : base(entity) { }
+        public Dimensions(Func<BaseObject> entity) : base(entity) { }
 
         [EditorSequence(1)]
         [RequiredColumn]
@@ -65,7 +65,7 @@ namespace InABox.Core
         protected override void Init()
         {
             base.Init();
-            Unit = Activator.CreateInstance(typeof(TLink), new object[] { new Func<Entity>(LinkedEntity) }) as TLink;
+            Unit = Activator.CreateInstance(typeof(TLink), new object[] { new Func<BaseObject>(LinkedEntity) }) as TLink;
             Unit.PropertyChanged += (s, e) =>
             {
                 if(e.PropertyName == "ID")

+ 3 - 3
InABox.Core/EnclosedEntity.cs

@@ -11,17 +11,17 @@ namespace InABox.Core
     public abstract class EnclosedEntity : BaseObject, IEnclosedEntity
     {
         
-        private Func<Entity>? _linkedentity;
+        private Func<BaseObject>? _linkedentity;
         
         [DoNotSerialize]
-        protected Entity? LinkedEntity() => _linkedentity?.Invoke();
+        protected BaseObject? LinkedEntity() => _linkedentity?.Invoke();
 
         //[Obsolete("Please supply linked Entity")]
         public EnclosedEntity()
         {
         }
 
-        public EnclosedEntity(Func<Entity>? entity) 
+        public EnclosedEntity(Func<BaseObject>? entity) 
         {
             _linkedentity = entity;
         }