Changeset 1616 for trunk/sources

Timestamp:

04/21/09 15:34:44 (16 years ago)

Author:

epitzer

Message:

Fix small bugs found by test suite. (#593)

Location:

trunk/sources/HeuristicLab.Persistence/3.3

Files:

• Default/DebugString/Formatters/Byte2DebugStringFormatter.cs (added)
• Default/DebugString/Formatters/Long2DebugStringFormatter.cs (added)
• Default/DebugString/Formatters/SByte2DebugStringFormatter.cs (added)
• Default/DebugString/Formatters/Short2DebugStringFormatter.cs (added)
• Default/DebugString/Formatters/UInt2DebugStringFormatter.cs (added)
• Default/DebugString/Formatters/ULong2DebugStringFormatter.cs (added)
• Default/DebugString/Formatters/UShort2DebugStringFormatter.cs (added)
• Default/Xml/Primitive/Sting2XmlFormatter.cs (deleted)
• Default/Xml/XmlParser.cs (modified) (3 diffs)
• HeuristicLab.Persistence-3.3.csproj (modified) (1 diff)

trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/XmlParser.cs

@@ -41 +41 @@
         try {
           iterator = handlers[reader.Name].Invoke();
-        }
-        catch (KeyNotFoundException) {
+        } catch (KeyNotFoundException) {
           throw new InvalidOperationException(String.Format(
             "No handler for XML tag \"{0}\" installed",
@@ -58 +57 @@
       if (idString != null)
         id = int.Parse(idString);
-      yield return new PrimitiveToken(
-        reader.GetAttribute("name"),
-        int.Parse(reader.GetAttribute("typeId")),
-        id,
-        new XmlString(reader.ReadString()));
+      string name = reader.GetAttribute("name");
+      int typeId = int.Parse(reader.GetAttribute("typeId"));
+      XmlReader inner = reader.ReadSubtree();
+      inner.Read();
+      string xml = inner.ReadInnerXml();
+      inner.Close();      
+      yield return new PrimitiveToken(name, typeId, id, new XmlString(xml));
     }
 
@@ -123 +124 @@
       XmlParser parser = new XmlParser(
         new StreamReader(zipFile.GetInputStream(zipFile.GetEntry("data.xml"))));
-      return deSerializer.Deserialize(parser);
+      object result = deSerializer.Deserialize(parser);
+      zipFile.Close();
+      return result;
     }
   }

trunk/sources/HeuristicLab.Persistence/3.3/HeuristicLab.Persistence-3.3.csproj

@@ -103 +103 @@
     <Compile Include="Default\DebugString\DebugString.cs" />
     <Compile Include="Default\DebugString\DebugStringFormat.cs" />
+    <Compile Include="Default\DebugString\Formatters\SByte2DebugStringFormatter.cs" />
+    <Compile Include="Default\DebugString\Formatters\UInt2DebugStringFormatter.cs" />
+    <Compile Include="Default\DebugString\Formatters\Long2DebugStringFormatter.cs" />
+    <Compile Include="Default\DebugString\Formatters\ULong2DebugStringFormatter.cs" />
+    <Compile Include="Default\DebugString\Formatters\Short2DebugStringFormatter.cs" />
+    <Compile Include="Default\DebugString\Formatters\UShort2DebugStringFormatter.cs" />
+    <Compile Include="Default\DebugString\Formatters\Byte2DebugStringFormatter.cs" />
     <Compile Include="Default\DebugString\Formatters\ValueType2DebugStringFormatterBase.cs" />
     <Compile Include="Default\DebugString\Formatters\String2DebugStringFormatter.cs" />