Changeset 16565 for trunk/HeuristicLab.Clients.Hive/3.3/HiveTasks

Timestamp:

01/28/19 13:41:42 (6 years ago)

Author:

gkronber

Message:

#2520: merged changes from PersistenceOverhaul branch (r16451:16564) into trunk

Location:

trunk

Files:

• . (modified) (1 prop)
• HeuristicLab.Clients.Hive (modified) (1 prop)
• HeuristicLab.Clients.Hive/3.3/HiveTasks/EngineHiveTask.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive/3.3/HiveTasks/HiveTask.cs (modified) (6 diffs)
• HeuristicLab.Clients.Hive/3.3/HiveTasks/OptimizerHiveTask.cs (modified) (1 diff)

trunk/HeuristicLab.Clients.Hive/3.3/HiveTasks/EngineHiveTask.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.

trunk/HeuristicLab.Clients.Hive/3.3/HiveTasks/HiveTask.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.
@@ -29 +29 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 using HeuristicLab.PluginInfrastructure;
 
@@ -35 +35 @@
 
   [Item("Hive Task", "Represents a hive task.")]
-  [StorableClass]
+  [StorableType("AB546F71-AB78-44AF-9954-1A269D278C56")]
   public class HiveTask : NamedItem, IItemTree<HiveTask>, IDisposable {
     protected static object locker = new object();
@@ -170 +170 @@
     #region Constructors and Cloning
     [StorableConstructor]
-    protected HiveTask(bool deserializing) { }
+    protected HiveTask(StorableConstructorFlag _) : base(_) { }
 
     public HiveTask()
@@ -541 +541 @@
 
   [Item("Hive Task", "Represents a hive task.")]
-  [StorableClass]
+  [StorableType("F185C6FD-7282-4EE1-9F76-C4DD32C69207")]
   public class HiveTask<T> : HiveTask where T : ItemTask {
 
@@ -552 +552 @@
     public HiveTask() : base() { }
     [StorableConstructor]
-    protected HiveTask(bool deserializing) { }
+    protected HiveTask(StorableConstructorFlag _) : base(_) { }
     public HiveTask(T itemTask) : base(itemTask, true) { }
     protected HiveTask(HiveTask<T> original, Cloner cloner)

trunk/HeuristicLab.Clients.Hive/3.3/HiveTasks/OptimizerHiveTask.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.