Changeset 4091 for branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.JobBase/3.3/JobBase.cs

Timestamp:

07/23/10 09:37:57 (14 years ago)

Author:

cneumuel

Message:

resolved issues with 3.3, hive-server now executable (1096)

File:

• branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.JobBase/3.3/JobBase.cs (modified) (3 diffs)

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.JobBase/3.3/JobBase.cs

@@ -27 +27 @@
 using System.Xml;
 using HeuristicLab.Core;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Hive.JobBase {
   [Serializable]
-  abstract public class JobBase : StorableBase, IJob {
+  [StorableClass]
+  abstract public class JobBase : IJob {
 
     private Thread thread = null;
@@ -36 +38 @@
     public event EventHandler JobFailed;
     
-    public long JobId { get; set; }    
-    public double Progress { get; set; }        
+    [Storable]
+    public long JobId { get; set; }
+
+    [Storable]
+    public double Progress { get; set; }
+
+    [Storable]
     public bool Running { get; set; }
-    
+
+    [Storable]
     protected bool abort = false;    
 
@@ -70 +78 @@
     }
 
-    public override XmlNode GetXmlNode(string name, XmlDocument document, IDictionary<Guid, IStorable> persistedObjects) {
-      XmlNode node = base.GetXmlNode(name, document, persistedObjects);
+    //public override XmlNode GetXmlNode(string name, XmlDocument document, IDictionary<Guid, IStorable> persistedObjects) {
+    //  XmlNode node = base.GetXmlNode(name, document, persistedObjects);
 
-      XmlNode progr = document.CreateNode(XmlNodeType.Element, "Progress", null);
-      progr.InnerText = Convert.ToString(Progress);
+    //  XmlNode progr = document.CreateNode(XmlNodeType.Element, "Progress", null);
+    //  progr.InnerText = Convert.ToString(Progress);
 
-      node.AppendChild(progr);
-      return node;
-    }
-    public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
-      base.Populate(node, restoredObjects);
+    //  node.AppendChild(progr);
+    //  return node;
+    //}
+    //public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
+    //  base.Populate(node, restoredObjects);
 
-      XmlNode progr = node.SelectSingleNode("Progress");
-      Progress = Convert.ToDouble(progr.InnerText);
-    }
+    //  XmlNode progr = node.SelectSingleNode("Progress");
+    //  Progress = Convert.ToDouble(progr.InnerText);
+    //}
 
     public JobBase() {