From 118311ced5b576cd94ff09e34f3200e588d0bc32 Mon Sep 17 00:00:00 2001
From: Nathan Heskew <nathan.heskew@microsoft.com>
Date: Thu, 22 Jul 2010 14:16:10 -0700
Subject: [PATCH] MediaSettings -> MediaSettingsPart

- updating part names to conform to a <name>Part convention

--HG--
branch : dev
rename : src/Orchard.Web/Modules/Orchard.Media/Handlers/MediaSettingsHandler.cs => src/Orchard.Web/Modules/Orchard.Media/Handlers/MediaSettingsPartHandler.cs
rename : src/Orchard.Web/Modules/Orchard.Media/Models/MediaSettings.cs => src/Orchard.Web/Modules/Orchard.Media/Models/MediaSettingsPart.cs
rename : src/Orchard.Web/Modules/Orchard.Media/Models/MediaSettingsRecord.cs => src/Orchard.Web/Modules/Orchard.Media/Models/MediaSettingsPartRecord.cs
---
 .../DataMigrations/MediaDataMigration.cs       |  4 ++--
 .../Handlers/MediaSettingsHandler.cs           | 18 ------------------
 .../Handlers/MediaSettingsPartHandler.cs       | 18 ++++++++++++++++++
 .../Orchard.Media/Models/MediaSettings.cs      |  6 ------
 .../Orchard.Media/Models/MediaSettingsPart.cs  |  6 ++++++
 ...ngsRecord.cs => MediaSettingsPartRecord.cs} |  2 +-
 .../Modules/Orchard.Media/Orchard.Media.csproj |  6 +++---
 .../Parts/Media.SiteSettings.ascx              |  2 +-
 8 files changed, 31 insertions(+), 31 deletions(-)
 delete mode 100644 src/Orchard.Web/Modules/Orchard.Media/Handlers/MediaSettingsHandler.cs
 create mode 100644 src/Orchard.Web/Modules/Orchard.Media/Handlers/MediaSettingsPartHandler.cs
 delete mode 100644 src/Orchard.Web/Modules/Orchard.Media/Models/MediaSettings.cs
 create mode 100644 src/Orchard.Web/Modules/Orchard.Media/Models/MediaSettingsPart.cs
 rename src/Orchard.Web/Modules/Orchard.Media/Models/{MediaSettingsRecord.cs => MediaSettingsPartRecord.cs} (67%)

diff --git a/src/Orchard.Web/Modules/Orchard.Media/DataMigrations/MediaDataMigration.cs b/src/Orchard.Web/Modules/Orchard.Media/DataMigrations/MediaDataMigration.cs
index b60a81f98..39520f791 100644
--- a/src/Orchard.Web/Modules/Orchard.Media/DataMigrations/MediaDataMigration.cs
+++ b/src/Orchard.Web/Modules/Orchard.Media/DataMigrations/MediaDataMigration.cs
@@ -5,7 +5,7 @@ namespace Orchard.Media.DataMigrations {
 
         public int Create() {
             //CREATE TABLE Orchard_Media_MediaSettingsRecord (Id INTEGER not null, RootMediaFolder TEXT, primary key (Id));
-            SchemaBuilder.CreateTable("MediaSettingsRecord", table => table
+            SchemaBuilder.CreateTable("MediaSettingsPartRecord", table => table
                 .ContentPartRecord()
                 .Column<string>("RootMediaFolder")
                 );
@@ -14,7 +14,7 @@ namespace Orchard.Media.DataMigrations {
         }
 
         public int UpdateFrom1() {
-            // Filters.Add(new ActivatingFilter<MediaSettings>("Site"));
+            // Filters.Add(new ActivatingFilter<MediaSettingsPart>("Site"));
 
             return 2;
         }
diff --git a/src/Orchard.Web/Modules/Orchard.Media/Handlers/MediaSettingsHandler.cs b/src/Orchard.Web/Modules/Orchard.Media/Handlers/MediaSettingsHandler.cs
deleted file mode 100644
index 9b4b097e6..000000000
--- a/src/Orchard.Web/Modules/Orchard.Media/Handlers/MediaSettingsHandler.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using JetBrains.Annotations;
-using Orchard.ContentManagement.Handlers;
-using Orchard.Data;
-using Orchard.Media.Models;
-
-namespace Orchard.Media.Handlers {
-    [UsedImplicitly]
-    public class MediaSettingsHandler : ContentHandler {
-        public MediaSettingsHandler(IRepository<MediaSettingsRecord> repository) {
-            Filters.Add(StorageFilter.For(repository) );
-            OnInitializing<MediaSettings>(DefaultSettings);
-        }
-
-        private static void DefaultSettings(InitializingContentContext context, MediaSettings settings) {
-            settings.Record.RootMediaFolder = "~/Media";
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Media/Handlers/MediaSettingsPartHandler.cs b/src/Orchard.Web/Modules/Orchard.Media/Handlers/MediaSettingsPartHandler.cs
new file mode 100644
index 000000000..2a6d169d0
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Media/Handlers/MediaSettingsPartHandler.cs
@@ -0,0 +1,18 @@
+using JetBrains.Annotations;
+using Orchard.ContentManagement.Handlers;
+using Orchard.Data;
+using Orchard.Media.Models;
+
+namespace Orchard.Media.Handlers {
+    [UsedImplicitly]
+    public class MediaSettingsPartHandler : ContentHandler {
+        public MediaSettingsPartHandler(IRepository<MediaSettingsPartRecord> repository) {
+            Filters.Add(StorageFilter.For(repository) );
+            OnInitializing<MediaSettingsPart>(DefaultSettings);
+        }
+
+        private static void DefaultSettings(InitializingContentContext context, MediaSettingsPart settingsPart) {
+            settingsPart.Record.RootMediaFolder = "~/Media";
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Media/Models/MediaSettings.cs b/src/Orchard.Web/Modules/Orchard.Media/Models/MediaSettings.cs
deleted file mode 100644
index 896604a81..000000000
--- a/src/Orchard.Web/Modules/Orchard.Media/Models/MediaSettings.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Orchard.ContentManagement;
-
-namespace Orchard.Media.Models {
-    public class MediaSettings : ContentPart<MediaSettingsRecord> {
-    }
-}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Media/Models/MediaSettingsPart.cs b/src/Orchard.Web/Modules/Orchard.Media/Models/MediaSettingsPart.cs
new file mode 100644
index 000000000..28be07bd2
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Media/Models/MediaSettingsPart.cs
@@ -0,0 +1,6 @@
+using Orchard.ContentManagement;
+
+namespace Orchard.Media.Models {
+    public class MediaSettingsPart : ContentPart<MediaSettingsPartRecord> {
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Media/Models/MediaSettingsRecord.cs b/src/Orchard.Web/Modules/Orchard.Media/Models/MediaSettingsPartRecord.cs
similarity index 67%
rename from src/Orchard.Web/Modules/Orchard.Media/Models/MediaSettingsRecord.cs
rename to src/Orchard.Web/Modules/Orchard.Media/Models/MediaSettingsPartRecord.cs
index 3fbb1b520..9f8e24159 100644
--- a/src/Orchard.Web/Modules/Orchard.Media/Models/MediaSettingsRecord.cs
+++ b/src/Orchard.Web/Modules/Orchard.Media/Models/MediaSettingsPartRecord.cs
@@ -1,7 +1,7 @@
 using Orchard.ContentManagement.Records;
 
 namespace Orchard.Media.Models {
-    public class MediaSettingsRecord : ContentPartRecord {
+    public class MediaSettingsPartRecord : ContentPartRecord {
         public virtual string RootMediaFolder { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj b/src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj
index 778f23a1c..ac3f62731 100644
--- a/src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj
@@ -73,9 +73,9 @@
     <Compile Include="Controllers\AdminController.cs" />
     <Compile Include="DataMigrations\MediaDataMigration.cs" />
     <Compile Include="Helpers\MediaHelpers.cs" />
-    <Compile Include="Models\MediaSettings.cs" />
-    <Compile Include="Handlers\MediaSettingsHandler.cs" />
-    <Compile Include="Models\MediaSettingsRecord.cs" />
+    <Compile Include="Models\MediaSettingsPart.cs" />
+    <Compile Include="Handlers\MediaSettingsPartHandler.cs" />
+    <Compile Include="Models\MediaSettingsPartRecord.cs" />
     <Compile Include="Permissions.cs" />
     <Compile Include="Models\FolderNavigation.cs" />
     <Compile Include="Models\MediaFile.cs" />
diff --git a/src/Orchard.Web/Modules/Orchard.Media/Views/EditorTemplates/Parts/Media.SiteSettings.ascx b/src/Orchard.Web/Modules/Orchard.Media/Views/EditorTemplates/Parts/Media.SiteSettings.ascx
index 98bec79da..3515b5869 100644
--- a/src/Orchard.Web/Modules/Orchard.Media/Views/EditorTemplates/Parts/Media.SiteSettings.ascx
+++ b/src/Orchard.Web/Modules/Orchard.Media/Views/EditorTemplates/Parts/Media.SiteSettings.ascx
@@ -1,4 +1,4 @@
-<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<MediaSettingsRecord>" %>
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<MediaSettingsPartRecord>" %>
 <%@ Import Namespace="Orchard.Media.Models"%>
 <fieldset>
     <legend><%: T("Media")%></legend>