Changeset 2983 for trunk/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers

Timestamp:

03/09/10 18:57:40 (15 years ago)

Author:

epitzer

Message:

add support for new StorableConstructor attribute (#900)

Location:

trunk/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable

Files:

• StorableConstructorAttribute.cs (added)
• StorableHookAttribute.cs (modified) (1 diff)
• StorableSerializer.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable/StorableHookAttribute.cs

@@ -31 +31 @@
       Type type = obj.GetType();
       foreach (MemberInfo memberInfo in type.GetMembers(instanceMembers)) {
-        foreach (object attribute in memberInfo.GetCustomAttributes(false)) {
-          StorableHookAttribute hook = attribute as StorableHookAttribute;
+        foreach (StorableHookAttribute hook in memberInfo.GetCustomAttributes(typeof(StorableHookAttribute), false)) {          
           if (hook != null && hook.HookType == hookType) {
             MethodInfo methodInfo = memberInfo as MethodInfo;
             if (memberInfo.MemberType != MemberTypes.Method || memberInfo == null)
-              throw new ArgumentException("Storable hooks must be methods");            
-            methodInfo.Invoke(obj, emptyArgs);            
+              throw new ArgumentException("Storable hooks must be methods");
+            methodInfo.Invoke(obj, emptyArgs);
           }
         }

trunk/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable/StorableSerializer.cs

@@ -40 +40 @@
 
     public object CreateInstance(Type type, IEnumerable<Tag> metaInfo) {
-      return Activator.CreateInstance(type, true);
+      object instance = StorableConstructorAttribute.CallStorableConstructor(type);
+      if (instance == null)
+        instance = Activator.CreateInstance(type, true);
+      return instance;
     }