From 81c6ae441263414037814c2db308ea5b0bbe1c06 Mon Sep 17 00:00:00 2001
From: Sebastien Ros <none@none>
Date: Thu, 16 Feb 2012 16:02:12 -0800
Subject: [PATCH] Using IsInstanceOfType instead of IsAssignableFrom

--HG--
branch : 1.x
---
 src/Orchard/ContentManagement/ContentItem.cs                  | 4 ++--
 src/Orchard/ContentManagement/ContentPart.cs                  | 4 ++--
 .../Data/Migration/Generator/SchemaCommandGenerator.cs        | 2 +-
 src/Orchard/Environment/HostComponentsConfigModule.cs         | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Orchard/ContentManagement/ContentItem.cs b/src/Orchard/ContentManagement/ContentItem.cs
index 22a6efa43..c3bd5e0d5 100644
--- a/src/Orchard/ContentManagement/ContentItem.cs
+++ b/src/Orchard/ContentManagement/ContentItem.cs
@@ -31,13 +31,13 @@ namespace Orchard.ContentManagement {
         public IContentManager ContentManager { get; set; }
 
         public bool Has(Type partType) {
-            return partType == typeof(ContentItem) || _parts.Any(part => partType.IsAssignableFrom(part.GetType()));
+            return partType == typeof(ContentItem) || _parts.Any(partType.IsInstanceOfType);
         }
 
         public IContent Get(Type partType) {
             if (partType == typeof(ContentItem))
                 return this;
-            return _parts.FirstOrDefault(part => partType.IsAssignableFrom(part.GetType()));
+            return _parts.FirstOrDefault(partType.IsInstanceOfType);
         }
 
         public void Weld(ContentPart part) {
diff --git a/src/Orchard/ContentManagement/ContentPart.cs b/src/Orchard/ContentManagement/ContentPart.cs
index 32acc9464..6c7c54e4a 100644
--- a/src/Orchard/ContentManagement/ContentPart.cs
+++ b/src/Orchard/ContentManagement/ContentPart.cs
@@ -54,11 +54,11 @@ namespace Orchard.ContentManagement {
 
 
         public bool Has(Type fieldType, string fieldName) {
-            return _fields.Any(field => fieldType.IsAssignableFrom(field.GetType()) && field.Name == fieldName);
+            return _fields.Any(field => fieldType.IsInstanceOfType(field) && field.Name == fieldName);
         }
 
         public ContentField Get(Type fieldType, string fieldName) {
-            return _fields.FirstOrDefault(field => fieldType.IsAssignableFrom(field.GetType()) && field.Name == fieldName);
+            return _fields.FirstOrDefault(field => fieldType.IsInstanceOfType(field) && field.Name == fieldName);
         }
 
         public void Weld(ContentField field) {
diff --git a/src/Orchard/Data/Migration/Generator/SchemaCommandGenerator.cs b/src/Orchard/Data/Migration/Generator/SchemaCommandGenerator.cs
index b3941bc0c..a80635d3d 100644
--- a/src/Orchard/Data/Migration/Generator/SchemaCommandGenerator.cs
+++ b/src/Orchard/Data/Migration/Generator/SchemaCommandGenerator.cs
@@ -76,7 +76,7 @@ namespace Orchard.Data.Migration.Generator {
 
             foreach(var table in tables.Where(t => parameters.RecordDescriptors.Any(rd => rd.Feature.Descriptor.Id == feature && rd.TableName == t.Name))) {
                 string tableName = table.Name;
-                var recordType = parameters.RecordDescriptors.Where(rd => rd.Feature.Descriptor.Id == feature && rd.TableName == tableName).First().Type;
+                var recordType = parameters.RecordDescriptors.First(rd => rd.Feature.Descriptor.Id == feature && rd.TableName == tableName).Type;
                 var isContentPart = typeof(ContentPartRecord).IsAssignableFrom(recordType);
 
                 if ( tableName.StartsWith(prefix) ) {
diff --git a/src/Orchard/Environment/HostComponentsConfigModule.cs b/src/Orchard/Environment/HostComponentsConfigModule.cs
index 6e7c014d4..490d410ae 100644
--- a/src/Orchard/Environment/HostComponentsConfigModule.cs
+++ b/src/Orchard/Environment/HostComponentsConfigModule.cs
@@ -119,7 +119,7 @@ namespace Orchard.Environment {
                 return false;
             }
 
-            if (destinationType.IsAssignableFrom(value.GetType())) {
+            if (destinationType.IsInstanceOfType(value)) {
                 result = value;
                 return true;
             }