Changeset 125 for branches/XmlReaderWriterBranch/HeuristicLab.Logging

Timestamp:

04/15/08 16:41:18 (16 years ago)

Author:

gkronber

Message:

created a branch that combines the XmlReader and XmlWriter branches

Location:

branches/XmlReaderWriterBranch

Files:

• . (copied) (copied from branches/XmlTextWriterBranch)
• HeuristicLab.Logging/Linechart.cs (modified) (1 diff)
• HeuristicLab.Logging/Log.cs (modified) (1 diff)

branches/XmlReaderWriterBranch/HeuristicLab.Logging/Linechart.cs

@@ -94 +94 @@
       PersistenceManager.Persist("Values", Values, writer, persistedObjects);
     }
-    public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
-      base.Populate(node, restoredObjects);
-      myNumberOfLines = (IntData)PersistenceManager.Restore(node.SelectSingleNode("NumberOfLines"), restoredObjects);
-      myValues = (ItemList)PersistenceManager.Restore(node.SelectSingleNode("Values"), restoredObjects);
+    //public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
+    //  base.Populate(node, restoredObjects);
+    //  myNumberOfLines = (IntData)PersistenceManager.Restore(node.SelectSingleNode("NumberOfLines"), restoredObjects);
+    //  myValues = (ItemList)PersistenceManager.Restore(node.SelectSingleNode("Values"), restoredObjects);
+    //}
+    public override void Populate(XmlReader reader, IDictionary<Guid, IStorable> restoredObjects) {
+      base.Populate(reader, restoredObjects);
+      reader.Read();
+      myNumberOfLines = (IntData)PersistenceManager.Restore(reader, "NumberOfLines", restoredObjects);
+      reader.Skip();
+      myValues = (ItemList)PersistenceManager.Restore(reader, "Values", restoredObjects);
+      reader.Read();
     }
     #endregion

branches/XmlReaderWriterBranch/HeuristicLab.Logging/Log.cs

@@ -68 +68 @@
       PersistenceManager.Persist("Items", Items, writer, persistedObjects);
     }
-    public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
-      base.Populate(node, restoredObjects);
-      myItems = (ItemList)PersistenceManager.Restore(node.SelectSingleNode("Items"), restoredObjects);
+    //public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
+    //  base.Populate(node, restoredObjects);
+    //  myItems = (ItemList)PersistenceManager.Restore(node.SelectSingleNode("Items"), restoredObjects);
+    //}
+    public override void Populate(XmlReader reader, IDictionary<Guid, IStorable> restoredObjects) {
+      base.Populate(reader, restoredObjects);
+      reader.Read();
+      myItems = (ItemList)PersistenceManager.Restore(reader, "Items", restoredObjects);
+      reader.Read();
     }
     #endregion