diff options
author | Matt Ward <matt.ward@xamarin.com> | 2016-01-05 14:15:55 +0300 |
---|---|---|
committer | Matt Ward <matt.ward@xamarin.com> | 2016-01-05 14:23:39 +0300 |
commit | 210f7acc7db490707d7ddf64c2083ac52ebba021 (patch) | |
tree | df9c06b229c23eadbc1e14c32e01b45d7f9d606b /main/src/addins | |
parent | 303a75a3b57a3c478274f5576798b35210d0dc49 (diff) |
[NuGet] No longer using DispatchService MessageHandler.
Switch to using an Action instead.
Diffstat (limited to 'main/src/addins')
10 files changed, 23 insertions, 23 deletions
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestableMonoDevelopProjectSystem.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestableMonoDevelopProjectSystem.cs index 22225ca8a9..8b24a7ed53 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestableMonoDevelopProjectSystem.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestableMonoDevelopProjectSystem.cs @@ -48,7 +48,7 @@ namespace MonoDevelop.PackageManagement.Tests.Helpers public ReferenceAndProjectName ReferenceAndProjectNamePassedToLogRemovedReferenceFromProject;
public FileNameAndProjectName FileNameAndProjectNamePassedToLogAddedFileToProject;
- public static Action<MessageHandler> GuiSyncDispatcher = handler => handler.Invoke ();
+ public static Action<Action> GuiSyncDispatcher = handler => handler.Invoke ();
public static Func<Func<Task>,Task> GuiSyncDispatcherFunc = handler => handler.Invoke();
public TestableMonoDevelopProjectSystem (IDotNetProject project)
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestablePackageCompatibilityRunner.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestablePackageCompatibilityRunner.cs index d1817710f8..5e12ff83e7 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestablePackageCompatibilityRunner.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestablePackageCompatibilityRunner.cs @@ -34,7 +34,7 @@ namespace MonoDevelop.PackageManagement.Tests.Helpers {
public class TestablePackageCompatibilityRunner : PackageCompatibilityRunner
{
- MessageHandler backgroundDispatcher;
+ Action backgroundDispatcher;
public TestablePackageCompatibilityRunner (
IDotNetProject project,
@@ -59,9 +59,9 @@ namespace MonoDevelop.PackageManagement.Tests.Helpers backgroundDispatcher.Invoke ();
}
- protected override void BackgroundDispatch (MessageHandler handler)
+ protected override void BackgroundDispatch (Action action)
{
- backgroundDispatcher = handler;
+ backgroundDispatcher = action;
}
protected override PackageManagementEventsMonitor CreateEventMonitor (
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestablePackageManagementEventsMonitor.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestablePackageManagementEventsMonitor.cs index 4402b82d5b..9a3ec4afff 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestablePackageManagementEventsMonitor.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestablePackageManagementEventsMonitor.cs @@ -50,9 +50,9 @@ namespace MonoDevelop.PackageManagement.Tests.Helpers FilesChanged.AddRange (files);
}
- protected override void GuiSyncDispatch (MessageHandler handler)
+ protected override void GuiSyncDispatch (Action action)
{
- handler.Invoke ();
+ action.Invoke ();
}
protected override void ShowPackageConsole (ProgressMonitor progressMonitor)
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestableUpdatedPackagesInSolution.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestableUpdatedPackagesInSolution.cs index cc5fd78d7b..d878b5d98d 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestableUpdatedPackagesInSolution.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestableUpdatedPackagesInSolution.cs @@ -48,9 +48,9 @@ namespace MonoDevelop.PackageManagement.Tests.Helpers };
}
- protected override void GuiDispatch (MessageHandler handler)
+ protected override void GuiDispatch (Action action)
{
- handler.Invoke ();
+ action.Invoke ();
}
public Func<string, bool> FileExistsAction;
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/ThreadSafePackageManagementEventsTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/ThreadSafePackageManagementEventsTests.cs index b83f08a25f..9151e6067d 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/ThreadSafePackageManagementEventsTests.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/ThreadSafePackageManagementEventsTests.cs @@ -49,10 +49,10 @@ namespace MonoDevelop.PackageManagement.Tests threadSafeEvents = new ThreadSafePackageManagementEvents (unsafeEvents, RunGuiSyncDispatch);
}
- void RunGuiSyncDispatch (MessageHandler messageHandler)
+ void RunGuiSyncDispatch (Action action)
{
isGuiSyncDispatchCalled = true;
- messageHandler.Invoke ();
+ action.Invoke ();
}
void OnEventHandlerFired (object sender, EventArgs e)
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MonoDevelopProjectSystem.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MonoDevelopProjectSystem.cs index 99369c9c09..4ed9da4aa6 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MonoDevelopProjectSystem.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MonoDevelopProjectSystem.cs @@ -46,7 +46,7 @@ namespace MonoDevelop.PackageManagement ProjectTargetFramework targetFramework;
IPackageManagementFileService fileService;
IPackageManagementEvents packageManagementEvents;
- Action<MessageHandler> guiSyncDispatcher;
+ Action<Action> guiSyncDispatcher;
Func<Func<Task>,Task> guiSyncDispatcherFunc;
public MonoDevelopProjectSystem(DotNetProject project)
@@ -65,8 +65,8 @@ namespace MonoDevelop.PackageManagement IPackageManagementFileService fileService,
IPackageManagementProjectService projectService,
IPackageManagementEvents packageManagementEvents,
- Action<MessageHandler> guiSyncDispatcher,
- Func<Func<Task>,Task> guiSyncDispatcherFunc)
+ Action<Action> guiSyncDispatcher,
+ Func<Func<Task>, Task> guiSyncDispatcherFunc)
: base (AppendTrailingSlashToDirectory (project.BaseDirectory))
{
this.project = project;
@@ -478,9 +478,9 @@ namespace MonoDevelop.PackageManagement return Runtime.RunInMainThread (func);
}
- internal static void DefaultGuiSyncDispatcher (MessageHandler action)
+ internal static void DefaultGuiSyncDispatcher (Action action)
{
- Runtime.RunInMainThread (() => action ()).Wait ();
+ Runtime.RunInMainThread (action).Wait ();
}
void GuiSyncDispatch (Func<Task> func)
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageCompatibilityRunner.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageCompatibilityRunner.cs index 1dede8577d..1da9f5b079 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageCompatibilityRunner.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageCompatibilityRunner.cs @@ -77,9 +77,9 @@ namespace MonoDevelop.PackageManagement BackgroundDispatch (() => RunInternal ());
}
- protected virtual void BackgroundDispatch (MessageHandler handler)
+ protected virtual void BackgroundDispatch (Action action)
{
- PackageManagementBackgroundDispatcher.Dispatch (() => RunInternal ());
+ PackageManagementBackgroundDispatcher.Dispatch (action);
}
void RunInternal ()
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementEventsMonitor.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementEventsMonitor.cs index 385cc5266b..ee1675a069 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementEventsMonitor.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementEventsMonitor.cs @@ -99,9 +99,9 @@ namespace MonoDevelop.PackageManagement (lastFileConflictResolution == FileConflictResolution.OverwriteAll);
}
- protected virtual void GuiSyncDispatch (MessageHandler handler)
+ protected virtual void GuiSyncDispatch (Action action)
{
- Runtime.RunInMainThread (() => handler ()).Wait ();
+ Runtime.RunInMainThread (action).Wait ();
}
void PackageOperationMessageLogged (object sender, PackageOperationMessageLoggedEventArgs e)
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ThreadSafePackageManagementEvents.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ThreadSafePackageManagementEvents.cs index 237d3ba750..31eabde3fe 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ThreadSafePackageManagementEvents.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ThreadSafePackageManagementEvents.cs @@ -38,7 +38,7 @@ namespace MonoDevelop.PackageManagement {
public class ThreadSafePackageManagementEvents : IThreadSafePackageManagementEvents
{
- Action<MessageHandler> guiSyncDispatcher;
+ Action<Action> guiSyncDispatcher;
IPackageManagementEvents unsafeEvents;
public ThreadSafePackageManagementEvents (IPackageManagementEvents unsafeEvents)
@@ -48,7 +48,7 @@ namespace MonoDevelop.PackageManagement public ThreadSafePackageManagementEvents (
IPackageManagementEvents unsafeEvents,
- Action<MessageHandler> guiSyncDispatcher)
+ Action<Action> guiSyncDispatcher)
{
this.unsafeEvents = unsafeEvents;
this.guiSyncDispatcher = guiSyncDispatcher;
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdatedPackagesInSolution.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdatedPackagesInSolution.cs index bf24661425..3ced778ce4 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdatedPackagesInSolution.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdatedPackagesInSolution.cs @@ -253,9 +253,9 @@ namespace MonoDevelop.PackageManagement });
}
- protected virtual void GuiDispatch (MessageHandler handler)
+ protected virtual void GuiDispatch (Action action)
{
- Runtime.RunInMainThread (() => handler ()).Wait ();
+ Runtime.RunInMainThread (action).Wait ();
}
T GuiSyncDispatch<T> (Func<T> action)
|