Changeset 2983

Timestamp:

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

Author:

epitzer

Message:

add support for new StorableConstructor attribute (#900)

Location:

trunk/sources/HeuristicLab.Persistence/3.3

Files:

• Default/CompositeSerializers/Storable/StorableConstructorAttribute.cs (added)
• Default/CompositeSerializers/Storable/StorableHookAttribute.cs (modified) (1 diff)
• Default/CompositeSerializers/Storable/StorableSerializer.cs (modified) (1 diff)
• HeuristicLab.Persistence-3.3.csproj (modified) (1 diff)
• Tests/UseCases.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;
     }
 

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

@@ -121 +121 @@
     <Compile Include="Default\CompositeSerializers\Storable\EmptyStorableClassAttribute.cs" />
     <Compile Include="Default\CompositeSerializers\Storable\StorableAttribute.cs" />
+    <Compile Include="Default\CompositeSerializers\Storable\StorableConstructorAttribute.cs" />
     <Compile Include="Default\CompositeSerializers\Storable\StorableHookAttribute.cs" />
     <Compile Include="Default\CompositeSerializers\Storable\StorableSerializer.cs" />

trunk/sources/HeuristicLab.Persistence/3.3/Tests/UseCases.cs

@@ -692 +692 @@
       Assert.IsFalse(newHookTest.WasSerialized);
     }
+    
+    [EmptyStorableClass]
+    private class CustomConstructor {
+      public string Value = "none";
+      public CustomConstructor() {
+        Value = "default";
+      }
+      [StorableConstructor]
+      private CustomConstructor(bool deserializing) {
+        Assert.IsTrue(deserializing);
+        Value = "persistence";
+      }
+    }
+
+    [TestMethod]
+    public void TestCustomConstructor() {
+      CustomConstructor cc = new CustomConstructor();
+      Assert.AreEqual(cc.Value, "default");
+      XmlGenerator.Serialize(cc, tempFile);
+      CustomConstructor newCC = (CustomConstructor)XmlParser.Deserialize(tempFile);
+      Assert.AreEqual(newCC.Value, "persistence");
+    }
 
     [ClassInitialize]