Changeset 17097 for stable/HeuristicLab.Persistence/3.3/Core/Configuration.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.Persistence (modified) (1 prop)
• HeuristicLab.Persistence/3.3/Core/Configuration.cs (modified) (6 diffs)

stable/HeuristicLab.Persistence/3.3/Core/Configuration.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.
@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 using HeuristicLab.Persistence.Interfaces;
 
@@ -32 +32 @@
   /// <c>ConfigurationService</c>.
   /// </summary>
-  [StorableClass]
+  [StorableType("72F8B3EA-0BC3-43A8-9B58-EF798C154CF3")]
   public class Configuration {
 
@@ -50 +50 @@
 
     [StorableConstructor]
-    protected Configuration(bool isDeserializing) {
+    protected Configuration(StorableConstructorFlag _) {
       compositeSerializerCache = new Dictionary<Type, ICompositeSerializer>();
-      if (isDeserializing)
-        return;
+    }
+
+    public Configuration() {
+      compositeSerializerCache = new Dictionary<Type, ICompositeSerializer>();
       primitiveSerializers = new Dictionary<Type, IPrimitiveSerializer>();
       compositeSerializers = new List<ICompositeSerializer>();
     }
+
 
     /// <summary>
@@ -67 +70 @@
         IEnumerable<IPrimitiveSerializer> primitiveSerializers,
         IEnumerable<ICompositeSerializer> compositeSerializers)
-      : this(false) {
+      : this() {
       this.Format = format;
       this.compositeSerializers.AddRange(compositeSerializers);
@@ -131 +134 @@
     /// <returns>A new <see cref="Configuration"/></returns>
     public Configuration Copy() {
-      var config = new Configuration(false);
+      var config = new Configuration();
       config.Format = Format;
       foreach (var ps in primitiveSerializers)