Move IViewContent interface to Workbench namespace.

src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/EditorScript.cs

@@ -32,6 +32,7 @@ using ICSharpCode.NRefactory.TypeSystem;
 using ICSharpCode.SharpDevelop;
 using ICSharpCode.SharpDevelop.Dom;
 using ICSharpCode.SharpDevelop.Editor;
+using ICSharpCode.SharpDevelop.Workbench;
 
 namespace CSharpBinding.Refactoring
 {

src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/MoveTypeToFileContextAction.cs

@@ -35,6 +35,7 @@ using ICSharpCode.SharpDevelop;
 using ICSharpCode.SharpDevelop.Parser;
 using ICSharpCode.SharpDevelop.Project;
 using ICSharpCode.SharpDevelop.Refactoring;
+using ICSharpCode.SharpDevelop.Workbench;
 using CSharpBinding.Parser;
 
 namespace CSharpBinding.Refactoring

src/AddIns/BackendBindings/Scripting/Project/Src/IScriptingWorkbench.cs

@@ -19,6 +19,7 @@
 using System;
 using ICSharpCode.SharpDevelop;
 using ICSharpCode.SharpDevelop.Gui;
+using ICSharpCode.SharpDevelop.Workbench;
 
 namespace ICSharpCode.Scripting
 {

src/AddIns/BackendBindings/Scripting/Project/Src/ScriptingTextEditorViewContent.cs

@@ -21,6 +21,7 @@ using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop;
 using ICSharpCode.SharpDevelop.Editor;
 using ICSharpCode.SharpDevelop.Gui;
+using ICSharpCode.SharpDevelop.Workbench;
 
 namespace ICSharpCode.Scripting
 {

src/AddIns/BackendBindings/Scripting/Test/Utils/MockWorkbench.cs

@@ -22,6 +22,7 @@ using System.Windows.Forms;
 
 using ICSharpCode.Core;
 using ICSharpCode.Scripting;
+using ICSharpCode.SharpDevelop.Workbench;
 using ICSharpCode.Scripting.Tests.Utils;
 using ICSharpCode.SharpDevelop;
 using ICSharpCode.SharpDevelop.Gui;

src/AddIns/BackendBindings/WixBinding/Test/Gui/ShowExistingPackageFilesViewTestFixture.cs

@@ -18,6 +18,7 @@
 
 using System;
 using ICSharpCode.SharpDevelop;
+using ICSharpCode.SharpDevelop.Workbench;
 using ICSharpCode.WixBinding;
 using NUnit.Framework;
 using WixBinding.Tests.Utils;

src/AddIns/Debugger/Debugger.AddIn/Breakpoints/CurrentLineBookmark.cs

@@ -24,6 +24,7 @@ using ICSharpCode.NRefactory;
 using ICSharpCode.NRefactory.Editor;
 using ICSharpCode.SharpDevelop.Editor;
 using ICSharpCode.SharpDevelop.Editor.Bookmarks;
+using ICSharpCode.SharpDevelop.Workbench;
 
 namespace ICSharpCode.SharpDevelop.Debugging
 {

src/AddIns/Debugger/Debugger.AddIn/Service/WindowsDebugger.cs

@@ -27,6 +27,7 @@ using System.Windows.Forms;
 using Debugger;
 using ICSharpCode.SharpDevelop.Gui;
 using ICSharpCode.SharpDevelop.Gui.Pads;
+using ICSharpCode.SharpDevelop.Workbench;
 using Debugger.AddIn;
 using Debugger.AddIn.Breakpoints;
 using Debugger.AddIn.Tooltips;

src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Commands/SaveFileWithEncoding.cs

@@ -20,6 +20,7 @@ using System;
 using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop;
 using ICSharpCode.SharpDevelop.Gui;
+using ICSharpCode.SharpDevelop.Workbench;
 
 namespace ICSharpCode.AvalonEdit.AddIn.Commands
 {

src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/ContextActions/ContextActionsRenderer.cs

@@ -31,6 +31,7 @@ using ICSharpCode.SharpDevelop;
 using ICSharpCode.SharpDevelop.Editor;
 using ICSharpCode.SharpDevelop.Gui;
 using ICSharpCode.SharpDevelop.Refactoring;
+using ICSharpCode.SharpDevelop.Workbench;
 
 namespace ICSharpCode.AvalonEdit.AddIn.ContextActions
 {

src/AddIns/DisplayBindings/XmlEditor/Project/Src/RunXslTransformCommand.cs

@@ -22,6 +22,7 @@ using System.IO;
 using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop;
 using ICSharpCode.SharpDevelop.Gui;
+using ICSharpCode.SharpDevelop.Workbench;
 
 namespace ICSharpCode.XmlEditor
 {

src/AddIns/DisplayBindings/XmlEditor/Project/Src/XslOutputView.cs

@@ -21,6 +21,7 @@ using System;
 using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop;
 using ICSharpCode.SharpDevelop.Gui;
+using ICSharpCode.SharpDevelop.Workbench;
 
 namespace ICSharpCode.XmlEditor
 {

src/AddIns/Misc/PackageManagement/Project/Src/DocumentView.cs

@@ -20,6 +20,7 @@ using System;
 using ICSharpCode.NRefactory.Editor;
 using ICSharpCode.SharpDevelop;
 using ICSharpCode.SharpDevelop.Editor;
+using ICSharpCode.SharpDevelop.Workbench;
 
 namespace ICSharpCode.PackageManagement
 {

src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/Document.cs

@@ -18,6 +18,7 @@
 
 using System;
 using ICSharpCode.SharpDevelop;
+using ICSharpCode.SharpDevelop.Workbench;
 
 namespace ICSharpCode.PackageManagement.EnvDTE
 {

src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/Project.cs

@@ -27,6 +27,7 @@ using ICSharpCode.SharpDevelop;
 using ICSharpCode.SharpDevelop.Dom;
 using ICSharpCode.SharpDevelop.Gui;
 using ICSharpCode.SharpDevelop.Project;
+using ICSharpCode.SharpDevelop.Workbench;
 using Microsoft.Build.Construction;
 using SD = ICSharpCode.SharpDevelop.Project;
 

src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/ProjectItem.cs

@@ -23,6 +23,7 @@ using ICSharpCode.Core;
 using ICSharpCode.NRefactory.TypeSystem;
 using ICSharpCode.SharpDevelop;
 using ICSharpCode.SharpDevelop.Project;
+using ICSharpCode.SharpDevelop.Workbench;
 using SD = ICSharpCode.SharpDevelop.Project;
 
 namespace ICSharpCode.PackageManagement.EnvDTE

src/AddIns/Misc/PackageManagement/Project/Src/IPackageManagementFileService.cs

@@ -22,6 +22,7 @@ using ICSharpCode.SharpDevelop;
 using ICSharpCode.SharpDevelop.Dom;
 using ICSharpCode.SharpDevelop.Gui;
 using ICSharpCode.SharpDevelop.Project;
+using ICSharpCode.SharpDevelop.Workbench;
 
 namespace ICSharpCode.PackageManagement
 {

src/AddIns/Misc/PackageManagement/Project/Src/PackageManagementFileService.cs

@@ -24,6 +24,7 @@ using ICSharpCode.SharpDevelop;
 using ICSharpCode.SharpDevelop.Dom;
 using ICSharpCode.SharpDevelop.Gui;
 using ICSharpCode.SharpDevelop.Project;
+using ICSharpCode.SharpDevelop.Workbench;
 
 namespace ICSharpCode.PackageManagement
 {

src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/ProjectItemTests.cs

@@ -26,6 +26,7 @@ using ICSharpCode.NRefactory.TypeSystem.Implementation;
 using ICSharpCode.PackageManagement.EnvDTE;
 using ICSharpCode.SharpDevelop;
 using ICSharpCode.SharpDevelop.Dom;
+using ICSharpCode.SharpDevelop.Workbench;
 using NUnit.Framework;
 using PackageManagement.Tests.Helpers;
 using Rhino.Mocks;

src/AddIns/Misc/PackageManagement/Test/Src/Helpers/FakeFileService.cs

@@ -27,6 +27,7 @@ using ICSharpCode.SharpDevelop;
 using ICSharpCode.SharpDevelop.Dom;
 using ICSharpCode.SharpDevelop.Gui;
 using ICSharpCode.SharpDevelop.Project;
+using ICSharpCode.SharpDevelop.Workbench;
 
 namespace PackageManagement.Tests.Helpers
 {

src/AddIns/Misc/StartPage/Project/Src/ShowStartPageCommand.cs

@@ -22,6 +22,7 @@ using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop;
 using ICSharpCode.SharpDevelop.Gui;
 using ICSharpCode.SharpDevelop.Project;
+using ICSharpCode.SharpDevelop.Workbench;
 
 namespace ICSharpCode.StartPage
 {
@@ -29,7 +30,7 @@ namespace ICSharpCode.StartPage
 	{
 		static ShowStartPageCommand()
 		{
-			ProjectService.SolutionLoaded += delegate {
+			SD.ProjectService.SolutionOpened += delegate {
 				// close all start pages when loading a solution
 				foreach (IViewContent v in SD.Workbench.ViewContentCollection.ToArray()) {
 					if (v is StartPageViewContent) {

src/Main/Base/Project/Debugging/BaseDebuggerService.cs

@@ -200,13 +200,7 @@ namespace ICSharpCode.SharpDevelop.Debugging
 
 		public virtual void JumpToCurrentLine(string sourceFullFilename, int startLine, int startColumn, int endLine, int endColumn)
 		{
-			IViewContent viewContent = FileService.OpenFile(sourceFullFilename);
-			if (viewContent != null) {
-				IPositionable positionable = viewContent.GetService<IPositionable>();
-				if (positionable != null) {
-					positionable.JumpTo(startLine, startColumn);
-				}
-			}
+			FileService.JumpToFilePosition(sourceFullFilename, startLine, startColumn);
 		}
 	}
 }

src/Main/Base/Project/Src/Commands/ProjectMenuCommands.cs

@@ -26,6 +26,7 @@ using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop.Gui;
 using ICSharpCode.SharpDevelop.Project.Dialogs;
 using Microsoft.Win32;
+using ICSharpCode.SharpDevelop.Workbench;
 
 namespace ICSharpCode.SharpDevelop.Project.Commands
 {

src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/ServiceReference/ActiveTextEditors.cs

@@ -19,6 +19,7 @@
 using System;
 using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop.Editor;
+using ICSharpCode.SharpDevelop.Workbench;
 
 namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference	
 {

src/Main/Base/Project/Src/Internal/ConditionEvaluators/ActiveViewContentUntitledEvaluator.cs

@@ -19,6 +19,7 @@
 using System;
 using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop.Gui;
+using ICSharpCode.SharpDevelop.Workbench;
 
 namespace ICSharpCode.SharpDevelop
 {

src/Main/Base/Project/Src/Internal/ConditionEvaluators/WindowOpenEvaluator.cs

@@ -19,6 +19,7 @@
 using System;
 using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop.Gui;
+using ICSharpCode.SharpDevelop.Workbench;
 
 namespace ICSharpCode.SharpDevelop
 {

src/Main/Base/Project/Workbench/IViewContent.cs

@@ -22,12 +22,8 @@ using System.IO;
 using System.Windows.Forms;
 
 using ICSharpCode.Core;
-using ICSharpCode.SharpDevelop.Workbench;
 
-// Not sure if this should be in the Workbench namespace...
-// It would sort of belong there, but it's also REALLY commonly used which probably
-// means it should be in the root namespace.
-namespace ICSharpCode.SharpDevelop
+namespace ICSharpCode.SharpDevelop.Workbench
 {
 	/// <summary>
 	/// IViewContent is the base interface for "windows" in the document area of SharpDevelop.

src/Main/SharpDevelop/Sda/Document.cs

@@ -20,6 +20,7 @@ using System;
 using ICSharpCode.NRefactory.Editor;
 using ICSharpCode.SharpDevelop.Editor;
 using ICSharpCode.SharpDevelop.Gui;
+using ICSharpCode.SharpDevelop.Workbench;
 
 namespace ICSharpCode.SharpDevelop.Sda
 {