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

Timestamp:

04/15/08 14:17:26 (16 years ago)

Author:

gkronber

Message:

bug fixes to make loading of OSGA-TSP work. Some non-working code remains

File:

• branches/XmlTextReaderBranch/HeuristicLab.Core/Scope.cs (modified) (1 diff)

branches/XmlTextReaderBranch/HeuristicLab.Core/Scope.cs

@@ -313 +313 @@
     //}
     public override void Populate(XmlReader reader, IDictionary<Guid, IStorable> restoredObjects) {
+      myName = reader["Name"];
       base.Populate(reader, restoredObjects);
-      myName = reader["Name"];
-
-      reader.ReadStartElement("Variables");
-      while(reader.IsStartElement()) {
-        IVariable variable = (IVariable)PersistenceManager.Restore(reader, restoredObjects);
-        AddVariable(variable);
-      }
-      reader.ReadEndElement();
-
-      if(reader.IsStartElement() && reader.Name=="Aliases") {
-        reader.ReadStartElement("Aliases");
-        while(reader.IsStartElement()) 
+      reader.Read();
+      if(reader.Name != "Variables") throw new XmlException("Expected: \"Variables\", found: \""+reader.Name+"\"");
+      if(!reader.IsEmptyElement) {
+        reader.Read();
+        while(reader.IsStartElement()) {
+          IVariable variable = (IVariable)PersistenceManager.Restore(reader, restoredObjects);
+          reader.Skip();
+          AddVariable(variable);
+        }
+        reader.ReadEndElement();
+      } else {
+        reader.Read();
+      }
+      if(reader.Name == "Aliases" && !reader.IsEmptyElement) {
+        reader.Read();
+        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();
+      } else {
+        reader.Read();
+      }
+      if(reader.Name != "SubScopes") throw new XmlException("Expected: \"SubScopes\", found: \"" + reader.Name + "\"");
+      if(!reader.IsEmptyElement) {
+        reader.Read();
+        while(reader.IsStartElement()) {
+          IScope scope = (IScope)PersistenceManager.Restore(reader, restoredObjects);
+          reader.Skip();
+          AddSubScope(scope);
+        }
+        reader.ReadEndElement();
+      } else {
+        reader.Read();
+      }
     }
     #endregion