Changeset 1320 for branches

Timestamp:

03/09/09 17:25:27 (16 years ago)

Author:

epitzer

Message:

store actual type information instead of declared type. (#506)

Location:

branches/New Persistence Exploration/Persistence/Persistence

Files:

• NewSerializationTest.cs (modified) (2 diffs)
• XmlFormatter.cs (modified) (2 diffs)

branches/New Persistence Exploration/Persistence/Persistence/NewSerializationTest.cs

@@ -42 +42 @@
   }
 
+  public class Manager {
+
+    private DateTime lastLoadTime;
+    [Storable]
+    private DateTime lastLoadTimePersistence {
+      get { return lastLoadTime; }
+      set { this.lastLoadTime = DateTime.Now; }
+    }
+    [Storable]
+    private Nullable<double> dbl = null;
+  }  
+
   public class NewSerializationTest {
-    public static void Main() {
+
+    public static void Test1() {
       Root r = new Root();
       r.selfReferences = new List<Root>();
@@ -65 +78 @@
       DeSerializer deSerializer = new DeSerializer();        
       object o = deSerializer.DeSerialize(parser);
+      Console.Out.WriteLine(Util.AutoFormat(o, true));      
+    }
+
+    public static void Test2() {
+      Manager m = new Manager();      
+      Serializer s = new Serializer(m);
+      Persistence.XmlFormatter xmlFormatter = new Persistence.XmlFormatter();
+      StreamWriter writer = new StreamWriter("test2.xml");
+      foreach (ISerializationToken token in s) {
+        string line = xmlFormatter.Format(token);
+        writer.Write(line);
+        Console.Out.Write(line);
+      }
+      writer.Close();
+      XmlParser parser = new XmlParser(new StreamReader("test2.xml"));
+      DeSerializer deSerializer = new DeSerializer();
+      object o = deSerializer.DeSerialize(parser);
       Console.Out.WriteLine(Util.AutoFormat(o, true));
+    }
+
+    public static void Main() {
+      //Test1();
+      Test2();
       Console.In.ReadLine();
     }

branches/New Persistence Exploration/Persistence/Persistence/XmlFormatter.cs

@@ -31 +31 @@
       string result =
         String.Format("{0}<COMPOSITE name=\"{1}\" type=\"{2}\" id=\"{3}\">\n",
-          this.Prefix, beginToken.Accessor.Name, beginToken.Accessor.Type, beginToken.Id);
+          this.Prefix, beginToken.Accessor.Name, beginToken.Accessor.Get().GetType(), beginToken.Id);
       this.depth += 1;
       return result;
@@ -45 +45 @@
       PrimitiveToken dataToken = (PrimitiveToken)token;
       return String.Format("{0}<PRIMITIVE name=\"{1}\" type=\"{2}\">{3}</PRIMITIVE>\n",
-        this.Prefix, dataToken.accessor.Name, dataToken.accessor.Type, dataToken.Data);
+        this.Prefix, dataToken.accessor.Name, dataToken.accessor.Get().GetType(), dataToken.Data);
     }