Merge branch 'master' into 090beta2

rodolfograve · Jun 12, 2010 · 60e3d41 · 60e3d41
2 parents 0a2a74b + 80c4d55
commit 60e3d41
Show file tree

Hide file tree

Showing 8 changed files with 210 additions and 180 deletions.
diff --git a/examples/Simple/Main.cs b/examples/Simple/Main.cs
@@ -14,7 +14,7 @@ namespace Simple
     /// </summary>
     internal class MainClass
     {
-        private IMongoCollection categories;
+        private IMongoCollection<Document> categories;
         private Mongo mongo;
         private IMongoDatabase simple;
 
@@ -36,7 +36,7 @@ public void Setup()
             mongo = new Mongo(connstr);
             mongo.Connect();
             simple = mongo["simple"];
-            categories = simple["categories"];
+            categories = simple.GetCollection<Document>("categories");
             Clean();
 
             var names = new[] {"Bluez", "Jazz", "Classical", "Rock", "Oldies", "Heavy Metal"};

diff --git a/examples/SimpleVB/Application.vb b/examples/SimpleVB/Application.vb
@@ -17,7 +17,7 @@ Namespace Simple
     Public Class Application
         Private mongo as Mongo
         Private simple as IMongoDatabase
-        Private categories as IMongoCollection
+        Private categories As IMongoCollection(Of Document)
 
         Public Shared Sub Main()
             Dim app As New Application()
@@ -37,7 +37,7 @@ Namespace Simple
             mongo = new Mongo(connstr)
             mongo.Connect()
             simple = mongo("simple")
-            categories = simple("categories")
+            categories = simple.GetCollection(Of Document)("categories")
             Clean()
 
             Dim names() As String = {"Bluez", "Jazz", "Classical", "Rock", "Oldies", "Heavy Metal"}
@@ -78,7 +78,7 @@ Namespace Simple
             'Find(new Document()) is equivalent to FindAll()
             'Specifying the cursor in a using block will close it on the server if we decide not
             'to iterate through the whole thing.
-            Dim all As ICursor = categories.Find(New Document())
+            Dim all As ICursor(Of Document) = categories.Find(New Document())
             Try
                 For Each doc As Document In all.Documents
                     Console.WriteLine(doc.ToString())

diff --git a/source/MongoDB.GridFS/MongoDB.GridFS.csproj b/source/MongoDB.GridFS/MongoDB.GridFS.csproj
@@ -45,8 +45,7 @@
     <RegisterForComInterop>false</RegisterForComInterop>
     <DocumentationFile>bin\Debug\MongoDB.GridFS.xml</DocumentationFile>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <NoWarn>
-    </NoWarn>
+    <NoWarn>0618</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>

diff --git a/source/MongoDB/MongoDB.csproj b/source/MongoDB/MongoDB.csproj
@@ -53,6 +53,7 @@
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <RunCodeAnalysis>false</RunCodeAnalysis>
+    <NoWarn>0618</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>

diff --git a/source/MongoDB/Obsolete/Cursor.cs b/source/MongoDB/Obsolete/Cursor.cs
@@ -62,6 +62,7 @@ public long Id
         /// <param name="fields">The fields.</param>
         /// <returns></returns>
         public ICursor Fields(Document fields){
+            _cursor.Fields(fields);
             return this;
         }
 

diff --git a/source/MongoDB/Obsolete/ICursor.cs b/source/MongoDB/Obsolete/ICursor.cs
@@ -5,6 +5,7 @@ namespace MongoDB {
     /// <summary>
     /// 
     /// </summary>
+    [Obsolete("Uses ICursor<Document> instead. This class will be possible not included in future releases.")]
     public interface ICursor : IDisposable
     {
         /// <summary>

diff --git a/source/MongoDB/Obsolete/IMongoCollection.cs b/source/MongoDB/Obsolete/IMongoCollection.cs
@@ -5,6 +5,7 @@ namespace MongoDB
 {
     /// <summary>
     /// </summary>
+    [Obsolete("Uses IMongoCollection<Document> instead. This class will be possible not included in future releases.")]
     public interface IMongoCollection
     {
         /// <summary>