Changeset 16723 for branches/2521_ProblemRefactoring/HeuristicLab.Operators.Views.GraphVisualization/3.3/General

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.Operators.Views.GraphVisualization/3.3/General/ConnectionInfo.cs (modified) (2 diffs)
• HeuristicLab.Operators.Views.GraphVisualization/3.3/General/GraphVisualizationInfo.cs (modified) (2 diffs)
• HeuristicLab.Operators.Views.GraphVisualization/3.3/General/IConnectionInfo.cs (modified) (2 diffs)
• HeuristicLab.Operators.Views.GraphVisualization/3.3/General/IGraphVisualizationInfo.cs (modified) (2 diffs)
• HeuristicLab.Operators.Views.GraphVisualization/3.3/General/IShapeInfo.cs (modified) (2 diffs)
• HeuristicLab.Operators.Views.GraphVisualization/3.3/General/ShapeInfo.cs (modified) (2 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Operators.Views.GraphVisualization/3.3/General/ConnectionInfo.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.
@@ -23 +23 @@
 using System.Linq;
 using HeuristicLab.Common;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Operators.Views.GraphVisualization {
-  [StorableClass]
+  [StorableType("92043EDD-87B0-42E9-A66F-230CC955C6D3")]
   public class ConnectionInfo : DeepCloneable, IConnectionInfo {
     [StorableConstructor]
-    protected ConnectionInfo(bool deserializing) : base() { }
+    protected ConnectionInfo(StorableConstructorFlag _) { }
     protected ConnectionInfo(ConnectionInfo original, Cloner cloner)
       : base(original, cloner) {

branches/2521_ProblemRefactoring/HeuristicLab.Operators.Views.GraphVisualization/3.3/General/GraphVisualizationInfo.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.
@@ -25 +25 @@
 using HeuristicLab.Collections;
 using HeuristicLab.Common;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Operators.Views.GraphVisualization {
-  [StorableClass]
+  [StorableType("85B8035F-C25D-4C75-A2A2-21230A08E9B2")]
   public class GraphVisualizationInfo : DeepCloneable, IGraphVisualizationInfo {
     [StorableConstructor]
-    protected GraphVisualizationInfo(bool deserializing) : base() { }
+    protected GraphVisualizationInfo(StorableConstructorFlag _) { }
     protected GraphVisualizationInfo(GraphVisualizationInfo original, Cloner cloner)
       : base(original, cloner) {

branches/2521_ProblemRefactoring/HeuristicLab.Operators.Views.GraphVisualization/3.3/General/IConnectionInfo.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 HeuristicLab.Common;
+using HEAL.Attic;
 
 namespace HeuristicLab.Operators.Views.GraphVisualization {
+  [StorableType("3cdcae5a-9f9f-4b99-bcd7-cc9619a547d8")]
   public interface IConnectionInfo : IDeepCloneable {
     IShapeInfo From { get; }

branches/2521_ProblemRefactoring/HeuristicLab.Operators.Views.GraphVisualization/3.3/General/IGraphVisualizationInfo.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.
@@ -24 +24 @@
 using HeuristicLab.Collections;
 using HeuristicLab.Common;
+using HEAL.Attic;
 
 namespace HeuristicLab.Operators.Views.GraphVisualization {
+  [StorableType("d6df3b9d-453c-4f85-ae4b-76c3cbcc304c")]
   public interface IGraphVisualizationInfo : IDeepCloneable, IContent {
     IShapeInfo InitialShape { get; set; }

branches/2521_ProblemRefactoring/HeuristicLab.Operators.Views.GraphVisualization/3.3/General/IShapeInfo.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.
@@ -24 +24 @@
 using System.Drawing;
 using HeuristicLab.Common;
+using HEAL.Attic;
 
 namespace HeuristicLab.Operators.Views.GraphVisualization {
+  [StorableType("a4ab29fa-705b-4a49-8ca2-86a18b40de12")]
   public interface IShapeInfo : IDeepCloneable {
     Point Location { get; set; }

branches/2521_ProblemRefactoring/HeuristicLab.Operators.Views.GraphVisualization/3.3/General/ShapeInfo.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.
@@ -24 +24 @@
 using System.Drawing;
 using HeuristicLab.Common;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Operators.Views.GraphVisualization {
-  [StorableClass]
+  [StorableType("330945A7-D7AF-42B9-91D2-06C1B00BC078")]
   public abstract class ShapeInfo : DeepCloneable, IShapeInfo {
     [StorableConstructor]
-    protected ShapeInfo(bool deserializing) : base() { }
+    protected ShapeInfo(StorableConstructorFlag _) { }
     protected ShapeInfo(ShapeInfo original, Cloner cloner)
       : base(original, cloner) {