Changeset 16723 for branches/2521_ProblemRefactoring/HeuristicLab.Analysis/3.3/DataVisualization/DataRow.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.Analysis (modified) (1 prop)
• HeuristicLab.Analysis/3.3/DataVisualization/DataRow.cs (modified) (4 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Analysis/3.3/DataVisualization/DataRow.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.
@@ -26 +26 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Analysis {
@@ -33 +33 @@
   /// </summary>
   [Item("DataRow", "A row of data values.")]
-  [StorableClass]
-  public class DataRow : NamedItem {
+  [StorableType("34A66F23-0FBB-414C-81C8-D3AA1C470446")]
+  public class DataRow : NamedItem , IDataRow {
     private DataRowVisualProperties visualProperties;
     public DataRowVisualProperties VisualProperties {
@@ -70 +70 @@
 
     [StorableConstructor]
-    protected DataRow(bool deserializing) : base(deserializing) { }
+    protected DataRow(StorableConstructorFlag _) : base(_) { }
     protected DataRow(DataRow original, Cloner cloner)
       : base(original, cloner) {