Changeset 1324

Timestamp:

03/11/09 17:25:40 (16 years ago)

Author:

epitzer

Message:

replace Functional with Linq

Location:

branches/New Persistence Exploration/Persistence/Persistence

Files:

• Persistence.csproj (modified) (1 diff)
• StorableAttribute.cs (modified) (2 diffs)
• Util.cs (modified) (1 diff)

branches/New Persistence Exploration/Persistence/Persistence/Persistence.csproj

@@ -42 +42 @@
   <ItemGroup>
     <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
     <Reference Include="System.Data" />
-    <Reference Include="System.Data.Linq">
+    <Reference Include="System.Data.DataSetExtensions">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>

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

@@ -2 +2 @@
 using System.Collections.Generic;
 using System.Reflection;
+using System.Linq;
 
 namespace Persistence {
@@ -134 +135 @@
       }
       object method(object obj, Dictionary<object, object> twins) {
-        return serializer.DeSerialize(          
-          Functional.Map(
-            serializer.Serialize(obj),
-            o => factory.Clone(o, twins)),
-          type);
+        return serializer.DeSerialize(
+          serializer.Serialize(obj)
+          .OfType<object>()
+          .Select(o => factory.Clone(o, twins)),
+          type);          
       }
     }

branches/New Persistence Exploration/Persistence/Persistence/Util.cs

@@ -5 +5 @@
 using System.Collections;
 
-namespace Persistence {
-  public class Functional {
-
-    public delegate object Mapper(object x);
-
-    public static IEnumerable Map(IEnumerable enumeration, Mapper m) {
-      foreach (object t in enumeration) {
-        yield return m(t);
-      }
-    }
-
-  }
+namespace Persistence {  
   public class InterfaceInstantiatior {
     public static List<T> InstantiateAll<T>() {