diff --git a/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs b/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs index b7b1ce901b5ed5b55925d18d425cd0b63361532d..50fb3cd68129d91a66f7c423dcd43dff27a6f864 100644 --- a/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs +++ b/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs @@ -16,7 +16,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl /// <summary> /// Component for a combustion engine. /// </summary> - public class CombustionEngine : VectoSimulationComponent, ICombustionEngine, ITnOutPort, IMemento + public class CombustionEngine : VectoSimulationComponent, ICombustionEngine, ITnOutPort { public enum EngineOperationMode { @@ -404,24 +404,5 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl } #endregion - - #region IMemento - - public string Serialize() - { - var mem = new { Data = _data, PreviousState = _previousState }; - return Memento.Serialize(mem); - } - - public void Deserialize(string data) - { - var mem = new { Data = _data, PreviousState = _previousState }; - mem = Memento.Deserialize(data, mem); - - _data = mem.Data; - _previousState = mem.PreviousState; - } - - #endregion } } \ No newline at end of file diff --git a/VectoCore/Utils/IMemento.cs b/VectoCore/Utils/IMemento.cs deleted file mode 100644 index c589a239c63a436c546ce760ca1fd21fa77d1c89..0000000000000000000000000000000000000000 --- a/VectoCore/Utils/IMemento.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace TUGraz.VectoCore.Utils -{ - public interface IMemento - { - string Serialize(); - void Deserialize(string data); - } -} \ No newline at end of file diff --git a/VectoCore/Utils/Memento.cs b/VectoCore/Utils/Memento.cs deleted file mode 100644 index 37aff48d955b52301dd05d30f422b0e68ecabd19..0000000000000000000000000000000000000000 --- a/VectoCore/Utils/Memento.cs +++ /dev/null @@ -1,37 +0,0 @@ -using System.Globalization; -using Newtonsoft.Json; - -namespace TUGraz.VectoCore.Utils -{ - public static class Memento - { - public static string Serialize<T>(T memento) - { - var mementoObject = (memento as IMemento); - if (mementoObject != null) { - return mementoObject.Serialize(); - } - - return JsonConvert.SerializeObject(memento, Formatting.Indented, - new JsonSerializerSettings { Culture = CultureInfo.InvariantCulture }); - } - - public static T Deserialize<T>(string data, T mem) - { - return JsonConvert.DeserializeAnonymousType(data, mem, - new JsonSerializerSettings { Culture = CultureInfo.InvariantCulture }); - } - - public static T Deserialize<T>(string data) where T : IMemento, new() - { - var x = new T(); - x.Deserialize(data); - return x; - } - - public static void Deserialize<T>(T instance, string data) where T : IMemento - { - instance.Deserialize(data); - } - } -} \ No newline at end of file