Changeset 125 for branches/XmlReaderWriterBranch/HeuristicLab.Core/PersistenceManager.cs

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.Core/PersistenceManager.cs (modified) (2 diffs)

branches/XmlReaderWriterBranch/HeuristicLab.Core/PersistenceManager.cs

@@ -57 +57 @@
     }
 
-    public static IStorable Restore(XmlNode node, IDictionary<Guid,IStorable> restoredObjects) {
-      Guid guid = new Guid(node.Attributes["GUID"].Value);
-      if (restoredObjects.ContainsKey(guid)) {
+    public static IStorable Restore(XmlReader reader, string elementName, IDictionary<Guid, IStorable> restoredObjects) {
+      reader = reader.ReadSubtree();
+      reader.Read();
+      if(reader.Name != elementName) throw new XmlException("Expected: \"" + elementName + "\" found: \"" + reader.Name+"\"");
+      IStorable result = RestoreElement(reader, restoredObjects);
+      reader.Read();
+      reader.Close();
+      return result;
+    }
+
+    public static IStorable Restore(XmlReader reader, IDictionary<Guid, IStorable> restoredObjects) {
+      reader = reader.ReadSubtree();
+      reader.Read();
+      IStorable result = RestoreElement(reader, restoredObjects);
+      reader.Read();
+      reader.Close();
+      return result;
+    }
+    private static IStorable RestoreElement(XmlReader reader, IDictionary<Guid, IStorable> restoredObjects) {
+      Guid guid = new Guid(reader["GUID"]);
+      if(restoredObjects.ContainsKey(guid)) {        
         return restoredObjects[guid];
       } else {
-        Type type = Type.GetType(node.Attributes["Type"].Value, true);
+        Type type = Type.GetType(reader["Type"], true);
         IStorable instance = (IStorable)Activator.CreateInstance(type);
         restoredObjects.Add(guid, instance);
-        instance.Populate(node, restoredObjects);
+        instance.Populate(reader, restoredObjects);
         return instance;
       }
@@ -89 +107 @@
     }
     public static IStorable Load(Stream stream) {
-      XmlDocument doc = new XmlDocument();
-      doc.Load(stream);
-      return PersistenceManager.Restore(doc.ChildNodes[1], new Dictionary<Guid, IStorable>());
+      XmlReaderSettings settings = new XmlReaderSettings();
+      settings.IgnoreComments = true;
+      settings.IgnoreWhitespace = true;
+      XmlReader reader = XmlReader.Create(stream, settings);
+      reader.MoveToContent(); // read "<?xml version="1.0"?/>
+      return PersistenceManager.RestoreElement(reader, new Dictionary<Guid, IStorable>());
     }