Changeset 1331

Timestamp:

03/12/09 13:49:56 (16 years ago)

Author:

epitzer

Message:

Include storable attributes of base classes. (#506)

Location:

branches/New Persistence Exploration/Persistence

Files:

• . (modified) (1 prop)
• Persistence/DeSerializer.cs (modified) (1 diff)
• Persistence/StorableAttribute.cs (modified) (2 diffs)
• Persistence/Test/NewSerializationTest.cs (modified) (2 diffs)

branches/New Persistence Exploration/Persistence

@@ -3 +3 @@
 *.suo
 _ReSharper.Persistence
+Persistence.4.1.resharper.user

@@ -3 +3 @@
 *.suo
 _ReSharper.Persistence
+Persistence.4.1.resharper.user

branches/New Persistence Exploration/Persistence/Persistence/DeSerializer.cs

@@ -4 +4 @@
   public class DeSerializer {
 
-    class ParentReference {      
-    }
+    struct ParentReference { }
 
     delegate void Setter(object value);

branches/New Persistence Exploration/Persistence/Persistence/StorableAttribute.cs

@@ -19 +19 @@
       BindingFlags.Public |
       BindingFlags.NonPublic;
-
-
-    public static IEnumerable<KeyValuePair<StorableAttribute, MemberInfo>> GetStorableMembers(object obj) {
-      foreach (MemberInfo memberInfo in obj.GetType().GetMembers(instanceMembers)) {
+    
+    public static IEnumerable<KeyValuePair<StorableAttribute, MemberInfo>> GetStorableMembers(Type type) {
+      return GetStorableMembers(type, true);      
+    }
+
+    public static IEnumerable<KeyValuePair<StorableAttribute, MemberInfo>>
+        GetStorableMembers(Type type, bool inherited) {
+      if (type.BaseType != null)
+        foreach ( var pair in GetStorableMembers(type.BaseType) )
+          yield return pair;
+      foreach (MemberInfo memberInfo in type.GetMembers(instanceMembers)) {
         foreach (object attribute in memberInfo.GetCustomAttributes(false)) {          
           StorableAttribute storableAttribute =
@@ -36 +43 @@
       Dictionary<string, DataMemberAccessor> storableAccessors =
         new Dictionary<string, DataMemberAccessor>();
-      foreach (KeyValuePair<StorableAttribute, MemberInfo> pair in GetStorableMembers(obj)) {
+      foreach (KeyValuePair<StorableAttribute, MemberInfo> pair in GetStorableMembers(obj.GetType())) {
         storableAccessors.Add(pair.Value.Name,
           new DataMemberAccessor(pair.Value, pair.Key, obj));

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

@@ -3 +3 @@
 using System.Collections;
 using System.IO;
+using System.Reflection;
 
 namespace Persistence.Test {
 
-  public class Root {
+  public class RootBase {
+    [Storable] private string baseString = "Serial";
+  }
+
+  public class Root : RootBase {
     [Storable]
     public int[] i = new[] { 3, 4, 5, 6 };
@@ -240 +245 @@
     }
 
+    public class Base {
+      [Storable] private int baseInt = 3;      
+    }
+
+    public class Derived: Base {
+      [Storable] private int derivedInt = 5;
+    }
+
     public static void Main() {
+      int[] i = {1, 2, 3};
+      object o = i;
+      Type type = o.GetType().BaseType.BaseType;
+      foreach (MemberInfo mi in type.GetMembers(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic )) {
+        if ( mi.MemberType == MemberTypes.Field || mi.MemberType == MemberTypes.Property )
+          Console.WriteLine(mi.Name);
+      }
       Test1();
       //Test2();

@@ -3 +3 @@
 *.suo
 _ReSharper.Persistence
+Persistence.4.1.resharper.user