* MonoDevelop.Ide.Gui/IWorkbenchWindow.cs:

* MonoDevelop.Ide.Gui/SdiWorkspaceWindow.cs:
* MonoDevelop.Ide.Gui/HiddenWorkbenchWindow.cs: Addeds subview
  contents to the interface.

svn path=/trunk/monodevelop/; revision=159708

4 files changed, 59 insertions, 52 deletions

diff --git a/main/src/core/MonoDevelop.Ide/ChangeLog b/main/src/core/MonoDevelop.Ide/ChangeLog
index 8f04169365..a7fad7488b 100644
--- a/main/src/core/MonoDevelop.Ide/ChangeLog
+++ b/main/src/core/MonoDevelop.Ide/ChangeLog
@@ -1,3 +1,10 @@
+2010-06-30  Mike Krüger  <mkrueger@novell.com>
+
+	* MonoDevelop.Ide.Gui/IWorkbenchWindow.cs:
+	* MonoDevelop.Ide.Gui/SdiWorkspaceWindow.cs:
+	* MonoDevelop.Ide.Gui/HiddenWorkbenchWindow.cs: Addeds subview
+	  contents to the interface.
+
 2010-06-29  Carlo Kok  <ck@remobjects.com>
 
 	* MonoDevelop.Ide.Extensions/MimeTypeOptionsPanelNode.cs: Make
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/HiddenWorkbenchWindow.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/HiddenWorkbenchWindow.cs
index 64f37545c5..299cd31551 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/HiddenWorkbenchWindow.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/HiddenWorkbenchWindow.cs
@@ -25,6 +25,7 @@
 // THE SOFTWARE.
 
 using System;
+using System.Collections.Generic;
 
 namespace MonoDevelop.Ide.Gui
 {
@@ -61,9 +62,7 @@ namespace MonoDevelop.Ide.Gui
 			set { viewContent = value; }
 		}
 		
-		public System.Collections.ArrayList SubViewContents {
-			get { return new System.Collections.ArrayList (); }
-		}
+		public IEnumerable<IAttachableViewContent> SubViewContents { get { return new IAttachableViewContent[0]; } }
 		
 		public MonoDevelop.Ide.Gui.IBaseViewContent ActiveViewContent {
 			get { return ViewContent;}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IWorkbenchWindow.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IWorkbenchWindow.cs
index 18cc702215..f21bcb0ae3 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IWorkbenchWindow.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IWorkbenchWindow.cs
@@ -27,64 +27,65 @@
 
 using System;
 using System.ComponentModel;
+using System.Collections.Generic;
 
 namespace MonoDevelop.Ide.Gui
 {
 	public interface IWorkbenchWindow
 	{
-        IViewContent ViewContent { get; }
-        IBaseViewContent ActiveViewContent { get; set; }
-        Document Document { get; set; }
-        string DocumentType { get; set; }
-        string Title { get; set; }
-        bool ShowNotification { get; set; }
+		IViewContent ViewContent { get; }
+		IBaseViewContent ActiveViewContent { get; set; }
 
-        void AttachViewContent (IAttachableViewContent subViewContent);
-        void SwitchView (int index);
+		IEnumerable<IAttachableViewContent> SubViewContents { get; }
 
-        bool CloseWindow (bool force, bool fromMenu, int pageNum);
-        void SelectWindow ();
+		Document Document { get; set; }
+		string DocumentType { get; set; }
+		string Title { get; set; }
+		bool ShowNotification { get; set; }
 
-        event WorkbenchWindowEventHandler Closed;
-        event WorkbenchWindowEventHandler Closing;
-        event ActiveViewContentEventHandler ActiveViewContentChanged;
+		void AttachViewContent (IAttachableViewContent subViewContent);
+		void SwitchView (int index);
 
+		bool CloseWindow (bool force, bool fromMenu, int pageNum);
+		void SelectWindow ();
+
+		event WorkbenchWindowEventHandler Closed;
+		event WorkbenchWindowEventHandler Closing;
+		event ActiveViewContentEventHandler ActiveViewContentChanged;
+		
 	}
 
-    public delegate void WorkbenchWindowEventHandler (object o, WorkbenchWindowEventArgs e);
-    public class WorkbenchWindowEventArgs : CancelEventArgs
-    {
-        private bool forced;
-        public bool Forced
-        {
-            get { return forced; }
-        }
+	public delegate void WorkbenchWindowEventHandler (object o, WorkbenchWindowEventArgs e);
+	public class WorkbenchWindowEventArgs : CancelEventArgs
+	{
+		private bool forced;
+		public bool Forced {
+			get { return forced; }
+		}
 
-        private bool wasActive;
-        public bool WasActive
-        {
-            get { return wasActive; }
-        }
+		private bool wasActive;
+		public bool WasActive {
+			get { return wasActive; }
+		}
 
-        public WorkbenchWindowEventArgs (bool forced, bool wasActive)
-        {
-            this.forced = forced;
-            this.wasActive = wasActive;
-        }
-    }
+		public WorkbenchWindowEventArgs (bool forced, bool wasActive)
+		{
+			this.forced = forced;
+			this.wasActive = wasActive;
+		}
+	}
 
-    public delegate void ActiveViewContentEventHandler (object o, ActiveViewContentEventArgs e);
-    public class ActiveViewContentEventArgs: EventArgs
-    {
-        private IBaseViewContent content = null;
-        public IBaseViewContent Content
-        {
-            get { return content; }
-        }
+	public delegate void ActiveViewContentEventHandler (object o, ActiveViewContentEventArgs e);
+	public class ActiveViewContentEventArgs : EventArgs
+	{
+		private IBaseViewContent content = null;
+		public IBaseViewContent Content {
+			get { return content; }
+		}
 
-        public ActiveViewContentEventArgs (IBaseViewContent content)
-        {
-            this.content = content;
-        }
-    }
+		public ActiveViewContentEventArgs (IBaseViewContent content)
+		{
+			this.content = content;
+		}
+	}
 }
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/SdiWorkspaceWindow.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/SdiWorkspaceWindow.cs
index 0d9db103ce..73c1487056 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/SdiWorkspaceWindow.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/SdiWorkspaceWindow.cs
@@ -42,7 +42,7 @@ namespace MonoDevelop.Ide.Gui
 		DefaultWorkbench workbench;
 		IViewContent content;
 		
-		ArrayList subViewContents = null;
+		List<IAttachableViewContent> subViewContents = null;
 		Notebook subViewNotebook = null;
 		Toolbar subViewToolbar = null;
 		PathBar pathBar = null;
@@ -141,9 +141,9 @@ namespace MonoDevelop.Ide.Gui
 			}
 		}
 		
-		public ArrayList SubViewContents {
+		public IEnumerable<IAttachableViewContent> SubViewContents {
 			get {
-				return subViewContents;
+				return (IEnumerable<IAttachableViewContent>)subViewContents ?? new IAttachableViewContent[0];
 			}
 		}
 		
@@ -390,7 +390,7 @@ namespace MonoDevelop.Ide.Gui
 			if (subViewContents != null)
 				return;
 			
-			subViewContents = new ArrayList ();
+			subViewContents = new List<IAttachableViewContent> ();
 			
 			box.Remove (this.ViewContent.Control);