Quellcode durchsuchen

Did BaseObject deserialisation

Kenric Nugteren vor 1 Woche
Ursprung
Commit
b26a5eacb0
2 geänderte Dateien mit 4 neuen und 7 gelöschten Zeilen
  1. 3 6
      InABox.Core/Objects/BaseObject.cs
  2. 1 1
      InABox.Core/Serialization.cs

+ 3 - 6
InABox.Core/Objects/BaseObject.cs

@@ -8,7 +8,6 @@ using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
 using System.Runtime.CompilerServices;
-using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 
 namespace InABox.Core
@@ -120,7 +119,7 @@ namespace InABox.Core
     /// <summary>
     ///     Observable object with INotifyPropertyChanged implemented
     /// </summary>
-    public abstract class BaseObject : INotifyPropertyChanged, IBaseObject
+    public abstract class BaseObject : INotifyPropertyChanged, IBaseObject, IJsonOnDeserializing, IJsonOnDeserialized
     {
         public BaseObject()
         {
@@ -171,15 +170,13 @@ namespace InABox.Core
             field = newValue;
         }
 
-        [OnDeserializing]
-        internal void OnDeserializingMethod(StreamingContext context)
+        public void OnDeserializing()
         {
             if (_observing)
                 SetObserving(false);
         }
 
-        [OnDeserialized]
-        internal void OnDeserializedMethod(StreamingContext context)
+        public void OnDeserialized()
         {
             if (!_observing)
                 SetObserving(true);

+ 1 - 1
InABox.Core/Serialization.cs

@@ -55,7 +55,7 @@ namespace InABox.Core
             settings.Converters.Add(new ColumnJsonConverter());
             settings.Converters.Add(new SortOrderJsonConverter());
             settings.Converters.Add(new UserPropertiesJsonConverter());
-            settings.Converters.Add(new BaseObjectJSONConverter());
+            // settings.Converters.Add(new BaseObjectJSONConverter());
 
             settings.WriteIndented = indented; // ? Formatting.Indented : Formatting.None;
             return settings;