Changeset 6033 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine/3.4/EngineJob.cs

Timestamp:

04/19/11 18:58:53 (13 years ago)

Author:

cneumuel

Message:

#1233

• created baseclass for jobs (ItemJob) which derives OperatorJobs and EngineJobs
• created special view for OptimizerJobs which derives from a more general view
• removed logic from domain class HiveExperiment and moved it into RefreshableHiveExperiment
• improved ItemTreeView
• corrected plugin dependencies
• fixed bug in database trigger when deleting HiveExperiments
• added delete cascade for Plugin and PluginData
• lots of fixes

File:

• branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine/3.4/EngineJob.cs (modified) (7 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine/3.4/EngineJob.cs

@@ -9 +9 @@
 namespace HeuristicLab.HiveEngine {
   [StorableClass]
-  public class EngineJob : AbstractJob {
-    [Storable]
-    private IEngine engine;
-
+  public class EngineJob : ItemJob {
     [Storable]
     protected IOperation initialOperation;
@@ -20 +17 @@
     }
 
+    public new IEngine Item {
+      get { return (IEngine)base.Item; }
+      set { base.Item = value; }
+    }
+
     public override TimeSpan ExecutionTime {
-      get { return engine.ExecutionTime; }
+      get { return Item.ExecutionTime; }
     }
 
     public override ExecutionState ExecutionState {
-      get { return engine.ExecutionState; }
+      get { return Item.ExecutionState; }
     }
 
@@ -32 +34 @@
     public EngineJob(IOperation initialOperation, IEngine engine) {
       this.initialOperation = initialOperation;
-      this.engine = engine;
-      RegisterEngineEvents();
+      this.Item = engine;
     }
 
@@ -40 +41 @@
     protected EngineJob(EngineJob original, Cloner cloner)
       : base(original, cloner) {
-      this.engine = cloner.Clone(original.engine);
       this.initialOperation = cloner.Clone(original.initialOperation);
-      RegisterEngineEvents();
     }
     public override IDeepCloneable Clone(Cloner cloner) {
       return new EngineJob(this, cloner);
-    }
-    [StorableHook(HookType.AfterDeserialization)]
-    private void AfterDeserialization() {
-      RegisterEngineEvents();
     }
     #endregion
@@ -60 +55 @@
 
     public override void Start() {
-      engine.Prepare(initialOperation);
-      engine.Start();
+      Item.Prepare(initialOperation);
+      Item.Start();
     }
     
     public override void Pause() {
-      engine.Pause();
+      Item.Pause();
     }
 
     public override void Stop() {
-      engine.Stop();
+      Item.Stop();
     }
     
@@ -76 +71 @@
     }
 
-    private void RegisterEngineEvents() {
-      engine.Stopped += new EventHandler(engine_Stopped);
-      engine.ExceptionOccurred += new EventHandler<EventArgs<Exception>>(engine_ExceptionOccurred);
+    protected override void RegisterItemEvents() {
+      Item.Stopped += new EventHandler(engine_Stopped);
+      Item.ExceptionOccurred += new EventHandler<EventArgs<Exception>>(engine_ExceptionOccurred);
+    }
+
+    protected override void DeregisterItemEvents() {
+      Item.Stopped -= new EventHandler(engine_Stopped);
+      Item.ExceptionOccurred -= new EventHandler<EventArgs<Exception>>(engine_ExceptionOccurred);
     }
 
@@ -103 +103 @@
 
     public override string Name {
-      get { return engine.ToString(); }
+      get { return Item.ToString(); }
       set { throw new NotSupportedException(); }
     }