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

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/Tasks/EngineTask.cs (modified) (3 diffs)
• HeuristicLab.Clients.Hive/3.3/Tasks/ItemTask.cs (modified) (3 diffs)
• HeuristicLab.Clients.Hive/3.3/Tasks/OptimizerTask.cs (modified) (3 diffs)

trunk/HeuristicLab.Clients.Hive/3.3/Tasks/EngineTask.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.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Clients.Hive {
-  [StorableClass]
+  [StorableType("FFDE8A4B-FDEC-47AA-B8E2-B16E5B513055")]
   public class EngineTask : ItemTask {
     public override HiveTask CreateHiveTask() {
@@ -63 +63 @@
 
     [StorableConstructor]
-    protected EngineTask(bool deserializing) : base(deserializing) { }
+    protected EngineTask(StorableConstructorFlag _) : base(_) { }
     protected EngineTask(EngineTask original, Cloner cloner)
       : base(original, cloner) {

trunk/HeuristicLab.Clients.Hive/3.3/Tasks/ItemTask.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.Core;
 using HeuristicLab.Hive;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 using HeuristicLab.PluginInfrastructure;
 
 namespace HeuristicLab.Clients.Hive {
   [Item("Item Task", "Represents a executable hive task which contains a HeuristicLab Item.")]
-  [StorableClass]
+  [StorableType("69EB65A5-9132-41B6-BE1D-60EDA46EF3C5")]
   public abstract class ItemTask : NamedItem, ITask {
     public virtual HiveTask CreateHiveTask() {
@@ -72 +72 @@
 
     [StorableConstructor]
-    protected ItemTask(bool deserializing) { }
+    protected ItemTask(StorableConstructorFlag _) : base(_) { }
     protected ItemTask(ItemTask original, Cloner cloner)
       : base(original, cloner) {

trunk/HeuristicLab.Clients.Hive/3.3/Tasks/OptimizerTask.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.Core;
 using HeuristicLab.Optimization;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Clients.Hive.Jobs {
   [Item("Optimizer Task", "Represents Task which executes a IOptimizer object.")]
-  [StorableClass]
+  [StorableType("9A59FAAF-3F5C-4629-B22D-714488DC2678")]
   public class OptimizerTask : ItemTask {
     public override HiveTask CreateHiveTask() {
@@ -60 +60 @@
     }
     [StorableConstructor]
-    protected OptimizerTask(bool deserializing) { }
+    protected OptimizerTask(StorableConstructorFlag _) : base(_) { }
     protected OptimizerTask(OptimizerTask original, Cloner cloner)
       : base(original, cloner) {