From 52f6668ff7761e63a20b4df3a9ae286c501e4780 Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Tue, 15 Oct 2019 16:04:27 +0300
Subject: [PATCH] ToolbarOptions to AbpToolbarOptions

---
 .../AbpAspNetCoreMvcUIBasicThemeModule.cs                     | 2 +-
 .../Toolbars/{ToolbarOptions.cs => AbpToolbarOptions.cs}      | 4 ++--
 .../Toolbars/ToolbarManager.cs                                | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Toolbars/{ToolbarOptions.cs => AbpToolbarOptions.cs} (81%)

diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/AbpAspNetCoreMvcUIBasicThemeModule.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/AbpAspNetCoreMvcUIBasicThemeModule.cs
index ec2a323a05..19ff484152 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/AbpAspNetCoreMvcUIBasicThemeModule.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/AbpAspNetCoreMvcUIBasicThemeModule.cs
@@ -43,7 +43,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic
                 options.FileSets.AddEmbedded<AbpAspNetCoreMvcUiBasicThemeModule>("Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic");
             });
 
-            Configure<ToolbarOptions>(options =>
+            Configure<AbpToolbarOptions>(options =>
             {
                 options.Contributors.Add(new BasicThemeMainTopToolbarContributor());
             });
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Toolbars/ToolbarOptions.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Toolbars/AbpToolbarOptions.cs
similarity index 81%
rename from framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Toolbars/ToolbarOptions.cs
rename to framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Toolbars/AbpToolbarOptions.cs
index e830f3fcf6..b4d010c608 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Toolbars/ToolbarOptions.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Toolbars/AbpToolbarOptions.cs
@@ -3,12 +3,12 @@ using JetBrains.Annotations;
 
 namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Toolbars
 {
-    public class ToolbarOptions
+    public class AbpToolbarOptions
     {
         [NotNull]
         public List<IToolbarContributor> Contributors { get; }
 
-        public ToolbarOptions()
+        public AbpToolbarOptions()
         {
             Contributors = new List<IToolbarContributor>();
         }
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Toolbars/ToolbarManager.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Toolbars/ToolbarManager.cs
index 77fbd67534..f1ac30779a 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Toolbars/ToolbarManager.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Toolbars/ToolbarManager.cs
@@ -10,11 +10,11 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Toolbars
     public class ToolbarManager : IToolbarManager, ITransientDependency
     {
         protected IThemeManager ThemeManager { get; }
-        protected ToolbarOptions Options { get; }
+        protected AbpToolbarOptions Options { get; }
         protected IServiceProvider ServiceProvider { get; }
 
         public ToolbarManager(
-            IOptions<ToolbarOptions> options, 
+            IOptions<AbpToolbarOptions> options, 
             IServiceProvider serviceProvider,
             IThemeManager themeManager)
         {