Track api changes.

5 files changed, 39 insertions, 35 deletions

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CustomTools/CustomToolService.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CustomTools/CustomToolService.cs
index bb40416bfc..bd663d1a84 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CustomTools/CustomToolService.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CustomTools/CustomToolService.cs
@@ -60,11 +60,13 @@ namespace MonoDevelop.Ide.CustomTools
 					break;
 				}
 			});
-			IdeApp.Workspace.FileChangedInProject += delegate (object sender, ProjectFileEventArgs e) {
-				Update (e.ProjectFile, false);
+			IdeApp.Workspace.FileChangedInProject += delegate (object sender, ProjectFileEventArgs args) {
+				foreach (ProjectFileEventInfo e in args)
+					Update (e.ProjectFile, false);
 			};
-			IdeApp.Workspace.FilePropertyChangedInProject += delegate (object sender, ProjectFileEventArgs e) {
-				Update (e.ProjectFile, false);
+			IdeApp.Workspace.FilePropertyChangedInProject += delegate (object sender, ProjectFileEventArgs args) {
+				foreach (ProjectFileEventInfo e in args)
+					Update (e.ProjectFile, false);
 			};
 			//FIXME: handle the rename
 			//MonoDevelop.Ide.Gui.IdeApp.Workspace.FileRenamedInProject
@@ -213,12 +215,14 @@ namespace MonoDevelop.Ide.CustomTools
 			}
 		}
 		
-		public static void HandleRename (ProjectFileRenamedEventArgs args)
+		public static void HandleRename (ProjectFileRenamedEventArgs e)
 		{
-			var file = args.ProjectFile;
-			var tool = GetGenerator (file);
-			if (tool == null)
-				return;
+			foreach (ProjectFileEventInfo args in e) {
+				var file = args.ProjectFile;
+				var tool = GetGenerator (file);
+				if (tool == null)
+					continue;
+			}
 		}
 	}
 }
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/SolutionNodeBuilder.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/SolutionNodeBuilder.cs
index b3646b2f5d..7d8ef35946 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/SolutionNodeBuilder.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/SolutionNodeBuilder.cs
@@ -41,27 +41,23 @@ namespace MonoDevelop.Ide.Gui.Pads.ClassPad
 {
 	public class SolutionNodeBuilder: TypeNodeBuilder
 	{
-		SolutionItemEventHandler combineEntryAdded;
-		SolutionItemEventHandler combineEntryRemoved;
 		EventHandler<WorkspaceItemRenamedEventArgs> combineNameChanged;
 		EventHandler startupChanged;
 		
 		public SolutionNodeBuilder ()
 		{
-			combineEntryAdded = (SolutionItemEventHandler) DispatchService.GuiDispatch (new SolutionItemEventHandler (OnEntryAdded));
-			combineEntryRemoved = (SolutionItemEventHandler) DispatchService.GuiDispatch (new SolutionItemEventHandler (OnEntryRemoved));
 			combineNameChanged = (EventHandler<WorkspaceItemRenamedEventArgs>) DispatchService.GuiDispatch (new EventHandler<WorkspaceItemRenamedEventArgs> (OnCombineRenamed));
 			startupChanged = (EventHandler) DispatchService.GuiDispatch (new EventHandler (OnStartupChanged));
 			
-			IdeApp.Workspace.ItemAddedToSolution += combineEntryAdded;
-			IdeApp.Workspace.ItemRemovedFromSolution += combineEntryRemoved;
+			IdeApp.Workspace.ItemAddedToSolution += OnEntryAdded;
+			IdeApp.Workspace.ItemRemovedFromSolution += OnEntryRemoved;
 		}
 		
 		public override void Dispose ()
 		{
 			base.Dispose ();
-			IdeApp.Workspace.ItemAddedToSolution -= combineEntryAdded;
-			IdeApp.Workspace.ItemRemovedFromSolution -= combineEntryRemoved;
+			IdeApp.Workspace.ItemAddedToSolution -= OnEntryAdded;
+			IdeApp.Workspace.ItemRemovedFromSolution -= OnEntryRemoved;
 		}
 
 		public override Type NodeDataType {
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/SolutionNodeBuilder.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/SolutionNodeBuilder.cs
index 9b2c311fb4..1d10105420 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/SolutionNodeBuilder.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/SolutionNodeBuilder.cs
@@ -41,7 +41,7 @@ namespace MonoDevelop.Ide.Gui.Pads.ProjectPad
 {
 	public class SolutionNodeBuilder: TypeNodeBuilder
 	{
-		SolutionItemEventHandler globalItemAddedRemoved;
+		SolutionItemChangeEventHandler globalItemAddedRemoved;
 		SolutionItemChangeEventHandler combineEntryAdded;
 		SolutionItemChangeEventHandler combineEntryRemoved;
 		EventHandler<WorkspaceItemRenamedEventArgs> combineNameChanged;
@@ -51,7 +51,7 @@ namespace MonoDevelop.Ide.Gui.Pads.ProjectPad
 		
 		public SolutionNodeBuilder ()
 		{
-			globalItemAddedRemoved = (SolutionItemEventHandler) DispatchService.GuiDispatch (new SolutionItemEventHandler (OnSolutionItemAddedRemoved));
+			globalItemAddedRemoved = (SolutionItemChangeEventHandler) DispatchService.GuiDispatch (new SolutionItemChangeEventHandler (OnSolutionItemAddedRemoved));
 			combineEntryAdded = (SolutionItemChangeEventHandler) DispatchService.GuiDispatch (new SolutionItemChangeEventHandler (OnEntryAdded));
 			combineEntryRemoved = (SolutionItemChangeEventHandler) DispatchService.GuiDispatch (new SolutionItemChangeEventHandler (OnEntryRemoved));
 			combineNameChanged = (EventHandler<WorkspaceItemRenamedEventArgs>) DispatchService.GuiDispatch (new EventHandler<WorkspaceItemRenamedEventArgs> (OnCombineRenamed));
@@ -147,14 +147,14 @@ namespace MonoDevelop.Ide.Gui.Pads.ProjectPad
 			}
 		}
 		
-		void OnSolutionItemAddedRemoved (object sender, SolutionItemEventArgs e)
+		void OnSolutionItemAddedRemoved (object sender, SolutionItemChangeEventArgs e)
 		{
 			ITreeBuilder tb = Context.GetTreeBuilder (e.Solution);
 			if (tb != null)
 				tb.Update ();	// Update the entry count
 		}
 
-		void OnEntryAdded (object sender, SolutionItemEventArgs e)
+		void OnEntryAdded (object sender, SolutionItemChangeEventArgs e)
 		{
 			ITreeBuilder tb = Context.GetTreeBuilder (e.SolutionItem.ParentSolution);
 			if (tb != null) {
@@ -163,7 +163,7 @@ namespace MonoDevelop.Ide.Gui.Pads.ProjectPad
 			}
 		}
 
-		void OnEntryRemoved (object sender, SolutionItemEventArgs e)
+		void OnEntryRemoved (object sender, SolutionItemChangeEventArgs e)
 		{
 			ITreeBuilder tb = Context.GetTreeBuilder (e.SolutionItem);
 			if (tb != null)
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Navigation/NavigationHistoryService.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Navigation/NavigationHistoryService.cs
index c1c14ae4e5..3025bf747b 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Navigation/NavigationHistoryService.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Navigation/NavigationHistoryService.cs
@@ -32,6 +32,8 @@ using System.Collections.Generic;
 
 using MonoDevelop.Ide.Gui.Content;
 using MonoDevelop.Ide.Gui;
+using MonoDevelop.Projects;
+using MonoDevelop.Projects.Text;
 
 namespace MonoDevelop.Ide.Navigation
 {
@@ -288,27 +290,29 @@ namespace MonoDevelop.Ide.Navigation
 		
 		#region Text file line number and snippet updating
 		
-		static void LineCountChanged (object sender, MonoDevelop.Projects.Text.LineCountEventArgs args)
+		static void LineCountChanged (object sender, LineCountEventArgs args)
 		{
 //			MonoDevelop.Projects.Text.ITextFile textFile = (MonoDevelop.Projects.Text.ITextFile) sender;
 		}
 		
-		static void CommitCountChanges (object sender, MonoDevelop.Projects.Text.TextFileEventArgs args)
+		static void CommitCountChanges (object sender, TextFileEventArgs args)
 		{
 //			MonoDevelop.Projects.Text.ITextFile textFile = (MonoDevelop.Projects.Text.ITextFile) sender;
 		}
 		
-		static void ResetCountChanges (object sender, MonoDevelop.Projects.Text.TextFileEventArgs args)
+		static void ResetCountChanges (object sender, TextFileEventArgs args)
 		{
 //			MonoDevelop.Projects.Text.ITextFile textFile = (MonoDevelop.Projects.Text.ITextFile) sender;
 		}
 		
-		static void FileRenamed (object sender, MonoDevelop.Projects.ProjectFileRenamedEventArgs args)
+		static void FileRenamed (object sender, ProjectFileRenamedEventArgs e)
 		{
 			bool changed = false;
-			foreach (NavigationHistoryItem point in history) {
-				DocumentNavigationPoint dp = point.NavigationPoint as DocumentNavigationPoint;
-				changed &= (dp != null && dp.HandleRenameEvent (args.OldName, args.NewName));
+			foreach (ProjectFileRenamedEventInfo args in e) {
+				foreach (NavigationHistoryItem point in history) {
+					DocumentNavigationPoint dp = point.NavigationPoint as DocumentNavigationPoint;
+					changed &= (dp != null && dp.HandleRenameEvent (args.OldName, args.NewName));
+				}
 			}
 			if (changed)
 				OnHistoryChanged ();
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/RootWorkspace.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/RootWorkspace.cs
index 29e685a739..f29bd08374 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/RootWorkspace.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/RootWorkspace.cs
@@ -96,7 +96,7 @@ namespace MonoDevelop.Ide
 				}
 			};
 			
-			FileService.FileChanged += CheckWorkspaceItems;
+			FileService.FileChanged += (EventHandler<FileEventArgs>) DispatchService.GuiDispatch (new EventHandler<FileEventArgs> (CheckWorkspaceItems));;
 		}
 		
 		public WorkspaceItemCollection Items {
@@ -1137,7 +1137,7 @@ namespace MonoDevelop.Ide
 			}
 		}
 		
-		void NotifyItemAddedToSolution (object sender, SolutionItemEventArgs args)
+		void NotifyItemAddedToSolution (object sender, SolutionItemChangeEventArgs args)
 		{
 			// Delay the notification of this event to ensure that the new project is properly
 			// registered in the parser database when it is fired
@@ -1148,7 +1148,7 @@ namespace MonoDevelop.Ide
 			});
 		}
 		
-		void NotifyItemRemovedFromSolution (object sender, SolutionItemEventArgs args)
+		void NotifyItemRemovedFromSolution (object sender, SolutionItemChangeEventArgs args)
 		{
 			NotifyItemRemovedFromSolutionRec (sender, args.SolutionItem, args.Solution);
 		}
@@ -1163,7 +1163,7 @@ namespace MonoDevelop.Ide
 					NotifyItemRemovedFromSolutionRec (sender, ce, sol);
 			}
 			if (ItemRemovedFromSolution != null)
-				ItemRemovedFromSolution (sender, new SolutionItemEventArgs (e, sol));
+				ItemRemovedFromSolution (sender, new SolutionItemChangeEventArgs (e, sol, false));
 		}
 		
 		void NotifyDescendantItemAdded (object s, WorkspaceItemEventArgs args)
@@ -1356,12 +1356,12 @@ namespace MonoDevelop.Ide
 		/// <summary>
 		/// Fired just before a project is added to a solution
 		/// </summary>
-		public event SolutionItemEventHandler ItemAddedToSolution;
+		public event SolutionItemChangeEventHandler ItemAddedToSolution;
 		
 		/// <summary>
 		/// Fired after a project is removed from a solution
 		/// </summary>
-		public event SolutionItemEventHandler ItemRemovedFromSolution;
+		public event SolutionItemChangeEventHandler ItemRemovedFromSolution;
 		
 		/// <summary>
 		/// Fired when the active solution configuration has changed