Changeset 11058 for trunk

Timestamp:

06/30/14 14:42:38 (10 years ago)

Author:

abeham

Message:

#2203: Made VariableStore IDeepCloneable and implemented cloning there

Location:

trunk/sources/HeuristicLab.Scripting/3.3

Files:

• CSharpScript.cs (modified) (3 diffs)
• VariableStore.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Scripting/3.3/CSharpScript.cs

@@ -21 +21 @@
 
 using System;
-using System.IO;
 using System.Linq;
 using System.Reflection;
@@ -27 +26 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Persistence.Default.Xml;
 
 namespace HeuristicLab.Scripting {
@@ -81 +78 @@
     protected CSharpScript(CSharpScript original, Cloner cloner)
       : base(original, cloner) {
-      try {
-        using (var serializerStream = new MemoryStream()) {
-          XmlGenerator.Serialize(original.variableStore, serializerStream);
-          var bytes = serializerStream.GetBuffer();
-          using (var deserializerStream = new MemoryStream(bytes)) {
-            variableStore = XmlParser.Deserialize<VariableStore>(deserializerStream);
-          }
-        }
-      } catch (PersistenceException pe) {
-        throw new NotSupportedException("Could not clone the script because some of its variables could not be cloned.", pe);
-      }
+      variableStore = cloner.Clone(original.variableStore);
     }
     public CSharpScript() {

trunk/sources/HeuristicLab.Scripting/3.3/VariableStore.cs

@@ -20 +20 @@
 #endregion
 
+using System;
+using System.IO;
 using HeuristicLab.Collections;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Persistence.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Persistence.Default.Xml;
 
 namespace HeuristicLab.Scripting {
   [Item("VariableStore", "Represents a variable store.")]
   [StorableClass]
-  public class VariableStore : ObservableDictionary<string, object>, IContent {
+  public class VariableStore : ObservableDictionary<string, object>, IContent, IDeepCloneable {
     [StorableConstructor]
     protected VariableStore(bool deserializing) : base(deserializing) { }
+    protected VariableStore(VariableStore original, Cloner cloner) {
+      cloner.RegisterClonedObject(original, this);
+      foreach (var kvp in original.dict) {
+        var clonedValue = kvp.Value as IDeepCloneable;
+        if (clonedValue != null) {
+          dict[kvp.Key] = cloner.Clone(clonedValue);
+        } else {
+          try {
+            dict[kvp.Key] = CloneByPersistence(kvp.Value);
+          } catch (PersistenceException pe) {
+            throw new NotSupportedException("VariableStore: Variable " + kvp.Key + " could not be cloned.", pe);
+          }
+        }
+      }
+    }
     public VariableStore() : base() { }
+
+    public object Clone() {
+      return Clone(new Cloner());
+    }
+    public IDeepCloneable Clone(Cloner cloner) {
+      return new VariableStore(this, cloner);
+    }
+
+    protected object CloneByPersistence(object value) {
+      using (var serializerStream = new MemoryStream()) {
+        XmlGenerator.Serialize(value, serializerStream);
+        var bytes = serializerStream.GetBuffer();
+        using (var deserializerStream = new MemoryStream(bytes)) {
+          return XmlParser.Deserialize<VariableStore>(deserializerStream);
+        }
+      }
+    }
   }
 }