FileRenaming after EventBindingService changes.

SideBar handling moved to WorkflowToolboxService.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@2348 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/AddIns/DisplayBindings/WorkflowDesigner/Project/Src/Gui/ViewContentControl.cs

@@ -7,32 +7,24 @@
 
 #region Using
 using System;
-using System.ComponentModel;
 using System.ComponentModel.Design;
-using System.Drawing;
 using System.Collections;
-using System.Collections.Generic;
 using System.Windows.Forms;
 using System.Workflow.ComponentModel.Design;
 using System.Workflow.Activities;
 using System.ComponentModel.Design.Serialization;
 using System.IO;
 using System.Drawing.Design;
-using System.Reflection;
 
-using ICSharpCode.SharpDevelop;
 using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop.Gui;
-using ICSharpCode.SharpDevelop.Widgets.SideBar;
 using ICSharpCode.TextEditor;
 using ICSharpCode.TextEditor.Document;
-using ICSharpCode.SharpDevelop.Project;
 using ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor;
 #endregion
 
 namespace WorkflowDesigner
 {
-	
 
 	/// <summary>
 	/// Description of ViewContentControl.
@@ -43,44 +35,6 @@ namespace WorkflowDesigner
 		private	BasicDesignerLoader loader;
 		private IViewContent viewContent;
 
-		// HACK: Temporary sidebar creation.
-		static SideTab	sideTab;
-		
-		static ViewContentControl()
-		{
-			sideTab = new SideTab("Workflow");
-			
-			// Make sure the side bar has actually bee created!
-			if (SharpDevelopSideBar.SideBar == null)
-				WorkbenchSingleton.Workbench.GetPad(typeof(SideBarView)).CreatePad();
-			
-			sideTab.CanSaved = false;
-			
-			// Add the standard pointer.
-			SharpDevelopSideTabItem sti = new SharpDevelopSideTabItem("Pointer");
-			sti.CanBeRenamed = false;
-			sti.CanBeDeleted = false;
-			Bitmap pointerBitmap = new Bitmap(IconService.GetBitmap("Icons.16x16.FormsDesigner.PointerIcon"), 16, 16);
-			sti.Icon = pointerBitmap;
-			sti.Tag = null;
-			sideTab.Items.Add(sti);
-
-
-			// Load activities from the standard assembly.
-			Assembly assembly = AppDomain.CurrentDomain.Load("System.Workflow.Activities, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35");
-			ICollection toolboxItems = System.Drawing.Design.ToolboxService.GetToolboxItems(assembly.GetName());
-			foreach (ToolboxItem tbi in toolboxItems)
-			{
-				sti = new SharpDevelopSideTabItem(tbi.DisplayName);
-				sti.CanBeDeleted = false;
-				sti.CanBeRenamed = false;
-				sti.Tag = tbi;
-				sti.Icon = tbi.Bitmap;
-				sideTab.Items.Add(sti);
-			}
-			
-		}
-		
 		public ViewContentControl(IViewContent viewContent)
 		{
 			//
@@ -90,11 +44,6 @@ namespace WorkflowDesigner
 			
 			this.viewContent = viewContent;
 			
-			// Make sure the standard workflow sidebar is on screen.
-			if (!SharpDevelopSideBar.SideBar.Tabs.Contains(sideTab)) {
-				SharpDevelopSideBar.SideBar.Tabs.Add(sideTab);
-				SharpDevelopSideBar.SideBar.Refresh();
-			}
 		}
 		
 		public IDesignerHost DesignerHost {
@@ -248,7 +197,7 @@ namespace WorkflowDesigner
 		internal void Selected()
 		{
 			WorkflowToolboxService srv = this.DesignerHost.GetService(typeof(IToolboxService)) as WorkflowToolboxService;
-			//srv.ShowSideTabs();
+			srv.ShowSideTabs();
 		}
 		
 		internal void Deselected()

src/AddIns/DisplayBindings/WorkflowDesigner/Project/Src/Loaders/NRefactoryDesignerLoader.cs

@@ -95,7 +95,7 @@ namespace WorkflowDesigner
 			host.AddService(typeof(IIdentifierCreationService), new IdentifierCreationService());
 			host.AddService(typeof(IMemberCreationService), new MemberCreationService());
 			//host.AddService(typeof(IEventBindingService), new EventBindingService(host));
-			host.AddService(typeof(IToolboxService), new WorkflowToolboxService());
+			host.AddService(typeof(IToolboxService), new WorkflowToolboxService(host));
 			host.AddService(typeof(MemberRelationshipService), new DefaultMemberRelationshipService());
 			host.AddService(typeof(IMenuCommandService), new WorkflowMenuCommandService(host));
 			TypeProvider tp = new TypeProvider(host);

src/AddIns/DisplayBindings/WorkflowDesigner/Project/Src/Loaders/XomlDesignerLoader.cs

@@ -121,7 +121,7 @@ namespace WorkflowDesigner
 		{
 			base.Initialize();
 
-			LoaderHost.AddService(typeof(IToolboxService), new WorkflowToolboxService());
+			LoaderHost.AddService(typeof(IToolboxService), new WorkflowToolboxService(LoaderHost));
 			
 			// HACK: Use default type provider and load all assemblies in #D,
 			//       should really only use the references for the current project!

src/AddIns/DisplayBindings/WorkflowDesigner/Project/Src/Services/EventBindingService/WorkflowDesignerEventBindingService.cs

@@ -39,7 +39,6 @@ namespace WorkflowDesigner
 	/// </summary>
 	public abstract class WorkflowDesignerEventBindingService : IWorkflowDesignerEventBindingService, IServiceProvider
 	{
-		IServiceProvider provider;
 		string codeFileName;
         CodeCompileUnit ccu;
 
@@ -50,7 +49,7 @@ namespace WorkflowDesigner
 		}
 
 
-		
+		#region IWorkflowDesignerEventBinginService implementation
 		public void UpdateCCU()
 		{
 			LoggingService.Debug("UpdateCCU");
@@ -67,11 +66,18 @@ namespace WorkflowDesigner
 
 			
 			
+		}
+
+		public string CodeFileName {
+			get {
+				return codeFileName;
+			}
 		}
 		
 		private void RefreshCCU(object sender, EventArgs e)
 		{
 		}
+		#endregion
 		
 		CodeCompileUnit Parse()
 		{
@@ -90,17 +96,16 @@ namespace WorkflowDesigner
 			return visitor.codeCompileUnit;
 		}
 
+		#region IServiceProvider implementation
+		IServiceProvider provider;
 		public object GetService(Type serviceType)
 		{
 			return provider.GetService(serviceType);
 		}
+		#endregion
 		
-		public string CodeFileName {
-			get {
-				return codeFileName;
-			}
-		}
 
+		#region IEventBindingService implemention
 		public string CreateUniqueMethodName(IComponent component, EventDescriptor e)
 		{
 			LoggingService.Debug("CreateUniqueMethodName(" + component + ", " + e + ")");
@@ -179,14 +184,6 @@ namespace WorkflowDesigner
 			return compatibleMethods;
 		}
 		
-		protected virtual int GetCursorLine(IDocument document, IMethod method)
-		{
-			return method.BodyRegion.BeginLine + 1;
-		}
-		
-		protected abstract string CreateEventHandler(IClass completeClass, EventDescriptor edesc, string eventMethodName, string body, string indentation);
-		
-		
 		public bool ShowCode()
 		{
 			FileService.OpenFile(codeFileName);
@@ -223,6 +220,16 @@ namespace WorkflowDesigner
 			
 		}
 
+		#endregion
+		
+		protected virtual int GetCursorLine(IDocument document, IMethod method)
+		{
+			return method.BodyRegion.BeginLine + 1;
+		}
+		
+		protected abstract string CreateEventHandler(IClass completeClass, EventDescriptor edesc, string eventMethodName, string body, string indentation);
+		
+		
 		public bool ShowCode(IComponent component, EventDescriptor e, string methodName)
 		{
 			LoggingService.DebugFormatted("ShowCode {0}", methodName);

src/AddIns/DisplayBindings/WorkflowDesigner/Project/Src/Services/WorkflowToolboxService.cs

@@ -8,26 +8,60 @@
 #region Using
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using System.Drawing.Design;
 using System.ComponentModel;
 using System.ComponentModel.Design;
 using System.Workflow.Activities;
 using ICSharpCode.Core;
 using System.Reflection;
+using System.Drawing;
 using System.Windows.Forms;
+using ICSharpCode.SharpDevelop;
 using ICSharpCode.SharpDevelop.Gui;
 using ICSharpCode.SharpDevelop.Project;
+using ICSharpCode.SharpDevelop.Widgets.SideBar;
 #endregion
 
 namespace WorkflowDesigner
 {
 	// TODO - Replace this a class based on System.Drawing.Design.ToolboxService
-	public class WorkflowToolboxService : IToolboxService
+	public class WorkflowToolboxService : IToolboxService, IServiceProvider
 	{
 		private string category = "Workflow";
+		private static SideTab standardSideTab;
 		
-		public WorkflowToolboxService()
+		public WorkflowToolboxService(IServiceProvider provider)
 		{
+			this.provider = provider;
+			
+			// Make sure the side bar has actually been created!
+			if (SharpDevelopSideBar.SideBar == null)
+				WorkbenchSingleton.Workbench.GetPad(typeof(SideBarView)).CreatePad();
+
+			if (standardSideTab == null) {
+				Assembly assembly = AppDomain.CurrentDomain.Load("System.Workflow.Activities, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35");
+				standardSideTab = CreateSideTabFromAssembly("Workflow", assembly);
+			}
+		}
+
+		#region IServiceProvider implementation
+		IServiceProvider provider;
+		public object GetService(Type serviceType)
+		{
+			return provider.GetService(serviceType);
+		}
+		#endregion
+		
+		
+		public void ShowSideTabs()
+		{
+			// Make sure the standard workflow sidebar is on screen.
+			if (!SharpDevelopSideBar.SideBar.Tabs.Contains(standardSideTab)) {
+				SharpDevelopSideBar.SideBar.Tabs.Add(standardSideTab);
+			}
+			
+			SharpDevelopSideBar.SideBar.Refresh();
 		}
 		
 		public CategoryNameCollection CategoryNames {
@@ -185,71 +219,48 @@ namespace WorkflowDesigner
 			throw new NotImplementedException();
 		}
 		
+		#region Helpers
+		static SideTab CreateSideTabFromAssembly(Assembly assembly)
+		{
+			return CreateSideTabFromAssembly(assembly.FullName + " components", assembly);
+		}
+
+		static SideTab CreateSideTabFromAssembly(string name, Assembly assembly)
+		{
+			SideTab sideTab = new SideTab(name);
+			sideTab.CanSaved = false;
+			AddPointerToSideTab(sideTab);
+			LoadSideTabItemsFromAssembly(assembly, sideTab);
+			return sideTab;
+		}
+		
+		static void AddPointerToSideTab(SideTab sideTab)
+		{
+			// Add the standard pointer.
+			SharpDevelopSideTabItem sti = new SharpDevelopSideTabItem("Pointer");
+			sti.CanBeRenamed = false;
+			sti.CanBeDeleted = false;
+			Bitmap pointerBitmap = new Bitmap(IconService.GetBitmap("Icons.16x16.FormsDesigner.PointerIcon"), 16, 16);
+			sti.Icon = pointerBitmap;
+			sti.Tag = null;
+			sideTab.Items.Add(sti);
+		}
 		
+
+		static void LoadSideTabItemsFromAssembly(Assembly assembly, SideTab sideTab)
+		{
+			ICollection toolboxItems = System.Drawing.Design.ToolboxService.GetToolboxItems(assembly.GetName());
+			foreach (ToolboxItem tbi in toolboxItems)
+			{
+				SharpDevelopSideTabItem sti = new SharpDevelopSideTabItem(tbi.DisplayName);
+				sti.CanBeDeleted = false;
+				sti.CanBeRenamed = false;
+				sti.Tag = tbi;
+				sti.Icon = tbi.Bitmap;
+				sideTab.Items.Add(sti);
+			}
+		}
+		#endregion
 	}
-//	public class ToolboxService2 : System.Drawing.Design.ToolboxService
-//	{
-//		private CategoryNameCollection categoryNameCollection = new CategoryNameCollection(new string[] {});
-//		private string selectedCategory;
-//		private ArrayList items = new ArrayList(); // TODO: replace by category item lists.
-//
-//		public ToolboxService2() : base()
-//		{
-//			foreach (Assembly assembly in System.AppDomain.CurrentDomain.GetAssemblies())
-//			{
-//				if (assembly.GetName().Name == "System.Workflow.Activities")
-//				{
-//					ICollection toolboxItems = System.Drawing.Design.ToolboxService.GetToolboxItems(assembly.GetName());
-//					LoggingService.DebugFormatted("ToolboxItems count = {0}", toolboxItems.Count);
-//
-//					foreach (ToolboxItem tbi in toolboxItems)
-//					{
-//						((IToolboxService)this).AddToolboxItem(tbi);
-//					}
-//				}
-//
-//			}
-//		}
-//
-//
-//		protected override CategoryNameCollection CategoryNames {
-//			get {
-//				return categoryNameCollection;
-//			}
-//		}
-//
-//		protected override string SelectedCategory {
-//			get {
-//				return selectedCategory;
-//			}
-//			set {
-//				selectedCategory = value;
-//			}
-//		}
-//
-//		protected override ToolboxItemContainer SelectedItemContainer {
-//			get {
-//				throw new NotImplementedException();
-//			}
-//			set {
-//				throw new NotImplementedException();
-//			}
-//		}
-//
-//		protected override System.Collections.IList GetItemContainers()
-//		{
-//			return items;
-//		}
-//
-//		protected override System.Collections.IList GetItemContainers(string categoryName)
-//		{
-//			return items;
-//		}
-//
-//		protected override void Refresh()
-//		{
-//			throw new NotImplementedException();
-//		}
-//
-//	}
+
 }

src/AddIns/DisplayBindings/WorkflowDesigner/Project/WorkflowDesigner.csproj

@@ -97,10 +97,10 @@
     <Compile Include="Src\PrimaryView\PrimaryViewContent.cs" />
     <Compile Include="Src\SecondaryView\SecondaryDisplayBinding.cs" />
     <Compile Include="Src\SecondaryView\SecondaryViewContent.cs" />
-    <Compile Include="Src\Services\EventBindingService\CSharpWorkflowDesignerGeneratorService.cs" />
+    <Compile Include="Src\Services\EventBindingService\CSharpWorkflowDesignerEventBindingService.cs" />
     <Compile Include="Src\Services\EventBindingService\EventPropertyDescriptor.cs" />
-    <Compile Include="Src\Services\EventBindingService\IWorkflowDesignerGeneratorService.cs" />
-    <Compile Include="Src\Services\EventBindingService\WorkflowDesignerGeneratorService.cs" />
+    <Compile Include="Src\Services\EventBindingService\IWorkflowDesignerEventBindingService.cs" />
+    <Compile Include="Src\Services\EventBindingService\WorkflowDesignerEventBindingService.cs" />
     <Compile Include="Src\Services\IdentifierCreationService.cs" />
     <Compile Include="Src\Services\MemberCreationService.cs" />
     <Compile Include="Src\Services\WorkflowMenuCommandService.cs" />