From a5a5c98a94932812d69fb674a06c2ff47b983916 Mon Sep 17 00:00:00 2001 From: Lluis Sanchez Date: Wed, 18 Nov 2015 00:25:25 +0100 Subject: Converted content interfaces to classes The new BaseViewContent class replaces IBaseViewContent, IAttachableViewContent, AbstractBaseViewContent and AbstractAttachableViewContent. The ViewContent class replaces IViewContent and AbstractViewContent. --- .../ActionGroupDisplayBinding.cs | 2 +- .../ActionGroupView.cs | 2 +- .../CombinedDesignView.cs | 26 ++++------------------ .../GuiBuilderDisplayBinding.cs | 2 +- .../GuiBuilderView.cs | 2 +- 5 files changed, 8 insertions(+), 26 deletions(-) (limited to 'main/src/addins/MonoDevelop.GtkCore') diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs index b122cf3de6..5eae8f19fd 100644 --- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs +++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs @@ -81,7 +81,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder return db != null; } - public IViewContent CreateContent (FilePath fileName, string mimeType, MonoDevelop.Projects.Project ownerProject) + public ViewContent CreateContent (FilePath fileName, string mimeType, MonoDevelop.Projects.Project ownerProject) { excludeThis = true; var db = DisplayBindingService.GetDefaultViewBinding (fileName, mimeType, ownerProject); diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs index 3e16e11f17..9d1af20768 100644 --- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs +++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs @@ -50,7 +50,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder Stetic.ActionGroupInfo groupInfo; string groupName; - public ActionGroupView (IViewContent content, Stetic.ActionGroupInfo group, GuiBuilderProject project): base (content) + public ActionGroupView (ViewContent content, Stetic.ActionGroupInfo group, GuiBuilderProject project): base (content) { groupName = group.Name; this.project = project; diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs index d4107e6ae2..6c4404fd00 100644 --- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs +++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs @@ -41,13 +41,13 @@ using MonoDevelop.Ide.Editor; namespace MonoDevelop.GtkCore.GuiBuilder { - public class CombinedDesignView : AbstractViewContent + public class CombinedDesignView : ViewContent { - IViewContent content; + ViewContent content; Gtk.Widget control; List tabs = new List (); - public CombinedDesignView (IViewContent content) + public CombinedDesignView (ViewContent content) { this.content = content; /* This code causes that chagnes in a version control view always select the source code view. @@ -256,7 +256,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder } } - class TabView: AbstractBaseViewContent, IAttachableViewContent + class TabView: BaseViewContent { string label; Gtk.Widget content; @@ -274,24 +274,6 @@ namespace MonoDevelop.GtkCore.GuiBuilder return base.GetContent (type); } - #region IAttachableViewContent implementation - public virtual void Selected () - { - } - - public virtual void Deselected () - { - } - - public virtual void BeforeSave () - { - } - - public virtual void BaseContentChanged () - { - } - #endregion - public override Control Control { get { return content; diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDisplayBinding.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDisplayBinding.cs index 65cde80d96..c9f93016f6 100644 --- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDisplayBinding.cs +++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDisplayBinding.cs @@ -68,7 +68,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder return db != null; } - public IViewContent CreateContent (MonoDevelop.Core.FilePath fileName, string mimeType, Project ownerProject) + public ViewContent CreateContent (MonoDevelop.Core.FilePath fileName, string mimeType, Project ownerProject) { excludeThis = true; var db = DisplayBindingService.GetDefaultViewBinding (fileName, mimeType, ownerProject); diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs index a472231a22..b99dba9b3a 100644 --- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs +++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs @@ -63,7 +63,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder string rootName; object designerStatus; - public GuiBuilderView (IViewContent content, GuiBuilderWindow window): base (content) + public GuiBuilderView (ViewContent content, GuiBuilderWindow window): base (content) { rootName = window.Name; -- cgit v1.2.3