Changeset 121 for branches/XmlTextReaderBranch/HeuristicLab.Core/Scope.cs

Timestamp:

04/14/08 21:51:15 (16 years ago)

Author:

gkronber

Message:

created a branch that uses XmlTextReader instead of XMLDocument to load documents. Investigating ticket #103. (...work in progress!)

Location:

branches/XmlTextReaderBranch

Files:

• . (copied) (copied from trunk/sources)
• HeuristicLab.Core/Scope.cs (modified) (1 diff)

branches/XmlTextReaderBranch/HeuristicLab.Core/Scope.cs

@@ -290 +290 @@
       return node;
     }
-    public override void Populate(XmlNode node, IDictionary<Guid,IStorable> restoredObjects) {
-      base.Populate(node, restoredObjects);
-      myName = node.Attributes["Name"].Value;
-
-      XmlNode variables = node.SelectSingleNode("Variables");
-      foreach (XmlNode variableNode in variables.ChildNodes) {
-        IVariable variable = (IVariable)PersistenceManager.Restore(variableNode, restoredObjects);
+    //public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
+    //  base.Populate(node, restoredObjects);
+    //  myName = node.Attributes["Name"].Value;
+
+    //  XmlNode variables = node.SelectSingleNode("Variables");
+    //  foreach(XmlNode variableNode in variables.ChildNodes) {
+    //    IVariable variable = (IVariable)PersistenceManager.Restore(variableNode, restoredObjects);
+    //    AddVariable(variable);
+    //  }
+
+    //  XmlNode aliases = node.SelectSingleNode("Aliases");
+    //  if(aliases != null) {
+    //    foreach(XmlNode aliasNode in aliases.ChildNodes)
+    //      AddAlias(aliasNode.Attributes["Alias"].Value, aliasNode.Attributes["Name"].Value);
+    //  }
+
+    //  XmlNode subScopes = node.SelectSingleNode("SubScopes");
+    //  for(int i = 0; i < subScopes.ChildNodes.Count; i++) {
+    //    IScope scope = (IScope)PersistenceManager.Restore(subScopes.ChildNodes[i], restoredObjects);
+    //    AddSubScope(scope);
+    //  }
+    //}
+    public override void Populate(XmlReader reader, IDictionary<Guid, IStorable> restoredObjects) {
+      base.Populate(reader, restoredObjects);
+      myName = reader["Name"];
+
+      reader.ReadStartElement("Variables");
+      while(reader.IsStartElement()) {
+        IVariable variable = (IVariable)PersistenceManager.Restore(reader, restoredObjects);
         AddVariable(variable);
       }
-
-      XmlNode aliases = node.SelectSingleNode("Aliases");
-      if (aliases != null) {
-        foreach (XmlNode aliasNode in aliases.ChildNodes)
-          AddAlias(aliasNode.Attributes["Alias"].Value, aliasNode.Attributes["Name"].Value);
-      }
-
-      XmlNode subScopes = node.SelectSingleNode("SubScopes");
-      for (int i = 0; i < subScopes.ChildNodes.Count; i++) {
-        IScope scope = (IScope)PersistenceManager.Restore(subScopes.ChildNodes[i], restoredObjects);
+      reader.ReadEndElement();
+
+      if(reader.IsStartElement() && reader.Name=="Aliases") {
+        reader.ReadStartElement("Aliases");
+        while(reader.IsStartElement()) 
+          AddAlias(reader["Alias"], reader["Name"]);
+        reader.ReadEndElement();
+      }
+      reader.ReadStartElement("SubScopes");
+      while(reader.IsStartElement()) {
+        IScope scope = (IScope)PersistenceManager.Restore(reader, restoredObjects);
         AddSubScope(scope);
       }
+      reader.ReadEndElement();
     }
     #endregion