Changeset 1519 for trunk

Timestamp:

04/07/09 12:43:26 (16 years ago)

Author:

epitzer

Message:

Include chain of declaring types for proper type information of nested types. (#575)

Location:

trunk/sources

Files:

• HeuristicLab.Persistence.Test/NewSerializationTest.cs (modified) (2 diffs)
• HeuristicLab.Persistence/Core/TypeStringBuilder.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Persistence.Test/NewSerializationTest.cs

@@ -254 +254 @@
     }
 
+    public class NestedType {
+      [Storable]
+      private string value = "value";
+    }
+
+    public static void Test7() {
+      NestedType t = new NestedType();
+      XmlGenerator.Serialize(t, "test7.zip");
+      object o = XmlParser.DeSerialize("test7.zip");
+      Console.WriteLine(ViewOnlyGenerator.Serialize(t));
+      Console.WriteLine(ViewOnlyGenerator.Serialize(o));
+    }
+
 
     public static void Main() {
@@ -263 +276 @@
       Test5();
       Test6();
+      Test7();
       //SpeedTest();
       //SpeedTest2();

trunk/sources/HeuristicLab.Persistence/Core/TypeStringBuilder.cs

@@ -6 +6 @@
   public static class TypeStringBuilder {
 
-    private static void BuildVersionInvariantName(Type type, StringBuilder sb) {    
-      sb.Append(type.Namespace);
-      sb.Append('.');
+    private static void BuildDeclaringTypeChain(Type type, StringBuilder sb) {
+      if ( type.DeclaringType != null ) {
+        BuildDeclaringTypeChain(type.DeclaringType, sb);
+        sb.Append(type.DeclaringType.Name).Append('+');
+      }
+    }
+
+    private static void BuildVersionInvariantName(Type type, StringBuilder sb) {
+      sb.Append(type.Namespace).Append('.');
+      BuildDeclaringTypeChain(type, sb);
       sb.Append(type.Name);
       if (type.IsGenericType) {
@@ -16 +23 @@
           sb.Append("[");
           BuildVersionInvariantName(args[i], sb);
-          sb.Append("]");
-          sb.Append(",");
+          sb.Append("],");
         }
         if (args.Length > 0)
@@ -23 +29 @@
         sb.Append("]");
       }            
-      sb.Append(", ");
-      sb.Append(type.Assembly.GetName().Name);      
+      sb.Append(", ").Append(type.Assembly.GetName().Name);
     }