Changeset 16943 for branches/2994-AutoDiffForIntervals/HeuristicLab.Core

Timestamp:

05/11/19 08:14:56 (5 years ago)

Author:

gkronber

Message:

#2994 merge r16933:16942 from trunk to branch

Location:

branches/2994-AutoDiffForIntervals

Files:

• . (modified) (1 prop)
• HeuristicLab.Core (modified) (1 prop)
• HeuristicLab.Core/3.3/NamedItem.cs (modified) (7 diffs)
• HeuristicLab.Core/3.3/PersistenceContentManager.cs (modified) (2 diffs)

branches/2994-AutoDiffForIntervals/HeuristicLab.Core/3.3/NamedItem.cs

@@ -30 +30 @@
     [Storable]
     protected string name;
-    /// <inheritdoc/>
+    /// Gets and sets the name of the item.
     /// <remarks>Calls <see cref="OnNameChanging"/> and also <see cref="OnNameChanged"/> 
     /// eventually in the setter.</remarks>
@@ -74 +74 @@
     }
     /// <summary>
-    /// Initializes a new instance of <see cref="Variable"/> with name <c>Anonymous</c> 
+    /// Initializes a new instance of <see cref="NamedItem"/> with name and description <c>string.Empty</c> 
     /// and value <c>null</c>.
     /// </summary>
@@ -82 +82 @@
     }
     /// <summary>
-    /// Initializes a new instance of <see cref="Variable"/> with the specified <paramref name="name"/>
-    /// and the specified <paramref name="value"/>.
+    /// Initializes a new instance of <see cref="NamedItem"/> with the specified <paramref name="name"/>
     /// </summary>
     /// <param name="name">The name of the current instance.</param>
-    /// <param name="value">The value of the current instance.</param>
     protected NamedItem(string name) {
       if (name == null) this.name = string.Empty;
@@ -92 +90 @@
       description = string.Empty;
     }
+    /// <summary>
+    /// Initializes a new instance of <see cref="NamedItem"/> with the specified <paramref name="name"/> and <paramref name="description"/>.
+    /// </summary>
     protected NamedItem(string name, string description) {
       if (name == null) this.name = string.Empty;
@@ -100 +101 @@
 
     /// <summary>
-    /// Gets the string representation of the current instance in the format: <c>Name: [null|Value]</c>.
+    /// Gets the string representation of the current instance.
     /// </summary>
     /// <returns>The current instance as a string.</returns>
@@ -122 +123 @@
     /// Fires a new <c>NameChanged</c> event.
     /// </summary>
-    /// <remarks>Calls <see cref="ItemBase.OnChanged"/>.</remarks>
+    /// <remarks>Calls <see cref="Item.OnToStringChanged"/>.</remarks>
     protected virtual void OnNameChanged() {
       var handler = NameChanged;
@@ -133 +134 @@
     /// Fires a new <c>DescriptionChanged</c> event.
     /// </summary>
-    /// <remarks>Calls <see cref="ItemBase.OnChanged"/>.</remarks>
     protected virtual void OnDescriptionChanged() {
       var handler = DescriptionChanged;

branches/2994-AutoDiffForIntervals/HeuristicLab.Core/3.3/PersistenceContentManager.cs

@@ -24 +24 @@
 using HeuristicLab.Persistence.Default.Xml;
 using HEAL.Attic;
+using System;
 
 namespace HeuristicLab.Core {
@@ -32 +33 @@
       // first try to load using the new persistence format
       var ser = new ProtoBufSerializer();
-      var o = (IStorableContent)ser.Deserialize(filename, out SerializationInfo info);
-      if (info.SerializedTypes != null) {
-        return o;
+      try {
+        return (IStorableContent)ser.Deserialize(filename, out SerializationInfo info);
+      } catch (Exception e) {
+        try {
+          // try old format if new format fails
+          return XmlParser.Deserialize<IStorableContent>(filename);
+        } catch (Exception e2) {
+          throw new AggregateException($"Cannot open file {filename}", e, e2);
+        }
       }
-      // try old format if new format fails
-      return XmlParser.Deserialize<IStorableContent>(filename);
     }