Changeset 1332

Timestamp:

03/12/09 14:09:35 (16 years ago)

Author:

epitzer

Message:

Enable object instantiation using non-public default constructors. (#506)

Location:

branches/New Persistence Exploration/Persistence

Files:

• Persistence.sln (modified) (1 diff)
• Persistence/CompoundSerializers.cs (modified) (4 diffs)
• Persistence/DeSerializer.cs (modified) (2 diffs)
• Persistence/StorableAttribute.cs (modified) (1 diff)

branches/New Persistence Exploration/Persistence/Persistence.sln

@@ -4 +4 @@
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Persistence", "Persistence\Persistence.csproj", "{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{2F65B17D-22F7-4A48-8762-74BB8BE3E0E5}"
-  ProjectSection(SolutionItems) = preProject
-    LocalTestRun.testrunconfig = LocalTestRun.testrunconfig
-    Persistence.vsmdi = Persistence.vsmdi
-  EndProjectSection
-EndProject
 Global
-  GlobalSection(TestCaseManagementSettings) = postSolution
-    CategoryFile = Persistence.vsmdi
-  EndGlobalSection
   GlobalSection(SolutionConfigurationPlatforms) = preSolution
     Debug|Any CPU = Debug|Any CPU

branches/New Persistence Exploration/Persistence/Persistence/CompoundSerializers.cs

@@ -28 +28 @@
     }
     public object DeSerialize(IEnumerable objects, Type t) {
-      object instance = Activator.CreateInstance(t);
+      object instance = Activator.CreateInstance(t, true);
       foreach (object o in objects) {
         t.GetMethod("Add").Invoke(instance, new[] { o });
@@ -78 +78 @@
 
   public class KeyValuePair2XmlSerializer : ICompoundSerializer {    
-    public bool CanSerialize(Type type) {
+    public bool CanSerialize(Type type) {      
       return type.IsGenericType &&
         type.GetGenericTypeDefinition().Name == "KeyValuePair`2";
@@ -87 +87 @@
       yield return t.GetProperty("Value").GetValue(o, null);
     }
-    public object DeSerialize(IEnumerable o, Type t) {
+    public object DeSerialize(IEnumerable o, Type t) {      
       return Activator.CreateInstance(t,
         new List<object>((IEnumerable<object>)o).ToArray());
@@ -105 +105 @@
     }
     public object DeSerialize(IEnumerable o, Type t) {
-      IDictionary dict = (IDictionary)Activator.CreateInstance(t);
+      IDictionary dict = (IDictionary)Activator.CreateInstance(t, true);
       IEnumerator iter = o.GetEnumerator();
       while (iter.MoveNext()) {

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

@@ -1 +1 @@
 using System.Collections.Generic;
 using System;
-namespace Persistence {
+namespace Persistence {  
+
   public class DeSerializer {
 
@@ -102 +103 @@
         compositeStack.Push(new CustomObject(instance));
         id2obj.Add(start.Id, instance);        
-      } else {
-        instance = Activator.CreateInstance(start.Type);
+      } else {        
+        instance = Activator.CreateInstance(start.Type, true);
         Dictionary<string, DataMemberAccessor> accessorDict =
         StorableAttribute.GetAutostorableAccessors(instance);

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

@@ -200 +200 @@
       }
       object method(object obj, Dictionary<object, object> twins) {
-        object newInstance = Activator.CreateInstance(obj.GetType());
+        object newInstance = Activator.CreateInstance(obj.GetType(), true);
         twins.Add(obj, newInstance);
         foreach (FieldAccessor fa in fieldAccessors) {