Changeset 122 for branches/XmlTextReaderBranch/HeuristicLab.Data/ConstrainedItemList.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.Data/ConstrainedItemList.cs (modified) (1 diff)

branches/XmlTextReaderBranch/HeuristicLab.Data/ConstrainedItemList.cs

@@ -77 +77 @@
     public override void Populate(XmlReader reader, IDictionary<Guid, IStorable> restoredObjects) {
       base.Populate(reader, restoredObjects);
-      reader.ReadStartElement("ListItems");
+      reader.Read();
+      if(reader.Name!="ListItems") throw new XmlException("Expected: \"ListItems\", found: \""+reader.Name+"\"");
       suspendConstraintCheck = bool.Parse(reader["SuspendConstraintCheck"]);
       list = new List<IItem>();
-      while(reader.IsStartElement())
-        list.Add((IItem)PersistenceManager.Restore(reader, restoredObjects));
-      reader.ReadEndElement();
+      if(!reader.IsEmptyElement) {
+        while(reader.IsStartElement()) {
+          list.Add((IItem)PersistenceManager.Restore(reader, restoredObjects));
+          reader.Skip();
+        }
+        reader.ReadEndElement();
+      } else {
+        reader.Read();
+      }
     }
     #endregion