Changeset 17097 for stable/HeuristicLab.Scripting/3.3/VariableStore.cs

Timestamp:

07/07/19 23:40:10 (5 years ago)

Author:

mkommend

Message:

#2520: Merged 16565 - 16579 into stable.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Scripting/3.3/VariableStore.cs (modified) (4 diffs)

stable/HeuristicLab.Scripting/3.3/VariableStore.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -27 +27 @@
 using HeuristicLab.Common.Resources;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 using HeuristicLab.Persistence.Default.Xml;
 
 namespace HeuristicLab.Scripting {
   [Item("VariableStore", "Represents a variable store.")]
-  [StorableClass]
+  [StorableType("DDE415E7-99FD-4C10-9B5E-63334876FFDE")]
   public class VariableStore : ObservableDictionary<string, object>, IItem {
     #region Properties
@@ -55 +54 @@
     #region Constructors & Cloning
     [StorableConstructor]
-    protected VariableStore(bool deserializing) : base(deserializing) { }
+    protected VariableStore(StorableConstructorFlag _) : base(_) { }
     protected VariableStore(VariableStore original, Cloner cloner) {
       cloner.RegisterClonedObject(original, this);
@@ -82 +81 @@
     protected T CloneByPersistence<T>(T value) {
       using (var serializerStream = new MemoryStream()) {
-        XmlGenerator.Serialize(value, serializerStream);
+        var serializer = new ProtoBufSerializer();
+        serializer.Serialize(value, serializerStream, disposeStream: false);
         var bytes = serializerStream.GetBuffer();
         using (var deserializerStream = new MemoryStream(bytes)) {
-          return XmlParser.Deserialize<T>(deserializerStream);
+          return (T)serializer.Deserialize(deserializerStream);
         }
       }