Changeset 16723 for branches/2521_ProblemRefactoring/HeuristicLab.Scripting.Views/3.3/VariableStoreView.cs

Timestamp:

03/28/19 16:54:20 (6 years ago)

Author:

abeham

Message:

#2521: merged changes from r15684 to trunk HEAD (r16716) and resolved all merge conflicts

• it doesn't build

Location:

branches/2521_ProblemRefactoring

Files:

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

branches/2521_ProblemRefactoring/HeuristicLab.Scripting.Views/3.3/VariableStoreView.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.
@@ -32 +32 @@
 using HeuristicLab.MainForm.WindowsForms;
 using HeuristicLab.Persistence.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 using HeuristicLab.Persistence.Default.Xml;
 using HeuristicLab.PluginInfrastructure;
+using System.IO;
 
 namespace HeuristicLab.Scripting.Views {
@@ -90 +91 @@
       Content.ItemsRemoved -= Content_ItemsRemoved;
       Content.CollectionReset -= Content_CollectionReset;
+
+      foreach (var variable in Content) {
+        var item = variable.Value as IItem;
+        if (item != null) item.ToStringChanged -= item_ToStringChanged;
+      }
+
       base.DeregisterContentEvents();
     }
     protected override void RegisterContentEvents() {
       base.RegisterContentEvents();
+
       Content.ItemsAdded += Content_ItemsAdded;
       Content.ItemsReplaced += Content_ItemsReplaced;
       Content.ItemsRemoved += Content_ItemsRemoved;
       Content.CollectionReset += Content_CollectionReset;
+
+      foreach (var variable in Content) {
+        var item = variable.Value as IItem;
+        if (item != null) item.ToStringChanged += item_ToStringChanged;
+      }
     }
 
@@ -474 +487 @@
     private bool IsSerializable(KeyValuePair<string, object> variable) {
       Type type = null;
-      bool serializable;
+      bool serializable = false;
 
       if (variable.Value != null) {
         type = variable.Value.GetType();
         if (serializableLookup.TryGetValue(type, out serializable)) return serializable;
-        if (StorableClassAttribute.IsStorableClass(type)) return serializableLookup[type] = true;
-      }
-
-      var ser = new Serializer(variable, ConfigurationService.Instance.GetDefaultConfig(new XmlFormat()), "ROOT", true);
+        if (StorableTypeAttribute.IsStorableType(type)) return serializableLookup[type] = true;
+      }
+
+      var ser = new ProtoBufSerializer();
       try {
-        serializable = ser.Count() > 0; // try to create all serialization tokens
+        using (var memStream = new MemoryStream()) {
+          ser.Serialize(variable.Value, memStream); // try to serialize to memory stream
+          serializable = true;
+        }
       } catch (PersistenceException) {
         serializable = false;