Refactoring and fixing a bug with common part import.

--HG--
branch : dev

src/Orchard.Web/Core/Common/Drivers/CommonPartDriver.cs

@@ -124,12 +124,13 @@ namespace Orchard.Core.Common.Drivers {
         protected override void Importing(CommonPart part, ImportContentContext context) {
             var owner = context.Attribute(part.PartDefinition.Name, "Owner");
             if (owner != null) {
-                part.Owner = _membershipService.GetUser(owner);
+                var contentIdentity = new ContentIdentity(owner);
+                part.Owner = _membershipService.GetUser(contentIdentity.Get("User.UserName"));
             }
 
             var container = context.Attribute(part.PartDefinition.Name, "Container");
             if (container != null) {
-                part.Container = context.Session.Get(container);
+                part.Container = context.GetItemFromSession(container);
             }
 
             var createdUtc = context.Attribute(part.PartDefinition.Name, "CreatedUtc");

src/Orchard.Web/Core/Containers/Drivers/ContainerWidgetPartDriver.cs

@@ -80,7 +80,7 @@ namespace Orchard.Core.Containers.Drivers {
         protected override void Importing(ContainerWidgetPart part, ImportContentContext context) {
             var containerIdentity = context.Attribute(part.PartDefinition.Name, "Container");
             if (containerIdentity != null) {
-                var container = context.Session.Get(containerIdentity);
+                var container = context.GetItemFromSession(containerIdentity);
                 if (container != null) {
                     part.Record.ContainerId = container.Id;
                 }

src/Orchard.Web/Modules/Orchard.Comments/Drivers/CommentPartDriver.cs

@@ -53,7 +53,7 @@ namespace Orchard.Comments.Drivers {
 
             var commentedOn = context.Attribute(part.PartDefinition.Name, "CommentedOn");
             if (commentedOn != null) {
-                var contentItem = context.Session.Get(commentedOn);
+                var contentItem = context.GetItemFromSession(commentedOn);
                 if (contentItem != null) {
                     part.Record.CommentedOn = contentItem.Id;
                 }
@@ -61,7 +61,7 @@ namespace Orchard.Comments.Drivers {
 
             var commentedOnContainer = context.Attribute(part.PartDefinition.Name, "CommentedOnContainer");
             if (commentedOnContainer != null) {
-                var container = context.Session.Get(commentedOnContainer);
+                var container = context.GetItemFromSession(commentedOnContainer);
                 if (container != null) {
                     part.Record.CommentedOnContainer = container.Id;
                 }

src/Orchard.Web/Modules/Orchard.Localization/Drivers/LocalizationPartDriver.cs

@@ -81,7 +81,7 @@ namespace Orchard.Localization.Drivers {
         protected override void Importing(LocalizationPart part, ContentManagement.Handlers.ImportContentContext context) {
             var masterContentItem = context.Attribute(part.PartDefinition.Name, "MasterContentItem");
             if (masterContentItem != null) {
-                var contentItem = context.Session.Get(masterContentItem);
+                var contentItem = context.GetItemFromSession(masterContentItem);
                 if (contentItem != null) {
                     part.MasterContentItem = contentItem;
                 }

src/Orchard/ContentManagement/ContentIdentity.cs

@@ -33,6 +33,10 @@ namespace Orchard.ContentManagement {
             }
         }
 
+        public string Get(string name) {
+            return _dictionary.ContainsKey(name) ? _dictionary[name] : null;
+        }
+
         public override string ToString() {
             var stringBuilder = new StringBuilder();
             foreach (var key in _dictionary.Keys) {

src/Orchard/ContentManagement/Handlers/ImportContentContext.cs

@@ -3,7 +3,7 @@ using System.Xml.Linq;
 namespace Orchard.ContentManagement.Handlers {
     public class ImportContentContext : ContentContextBase {
         public XElement Data { get; set; }
-        public ImportContentSession Session { get; set; }
+        private ImportContentSession Session { get; set; }
 
         public ImportContentContext(ContentItem contentItem, XElement data, ImportContentSession importContentSession)
             : base(contentItem) {