From 03c88b0f38e0fd09fb921f1b9e4c0761e052b840 Mon Sep 17 00:00:00 2001
From: Justin Swanson <justin.c.swanson@gmail.com>
Date: Fri, 6 Dec 2019 20:04:42 -0600
Subject: [PATCH] Removed some Shutdown/Terminate functions in favor of Dispose

---
 Wabbajack.Common/WorkQueue.cs                   | 7 +------
 Wabbajack.Lib/ABatchProcessor.cs                | 9 ++-------
 Wabbajack.Lib/IBatchProcessor.cs                | 7 -------
 Wabbajack.Test.ListValidation/ListValidation.cs | 2 +-
 Wabbajack.Test/EndToEndTests.cs                 | 2 +-
 5 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/Wabbajack.Common/WorkQueue.cs b/Wabbajack.Common/WorkQueue.cs
index 1ab8a646..d1b0b514 100644
--- a/Wabbajack.Common/WorkQueue.cs
+++ b/Wabbajack.Common/WorkQueue.cs
@@ -85,15 +85,10 @@ namespace Wabbajack.Common
             Queue.Add(a);
         }
 
-        public void Shutdown()
+        public void Dispose()
         {
             _cancel.Cancel();
             Threads.Do(th => th.Join());
-        }
-
-        public void Dispose()
-        {
-            Shutdown();
             Queue?.Dispose();
         }
     }
diff --git a/Wabbajack.Lib/ABatchProcessor.cs b/Wabbajack.Lib/ABatchProcessor.cs
index 70ab467c..7a153113 100644
--- a/Wabbajack.Lib/ABatchProcessor.cs
+++ b/Wabbajack.Lib/ABatchProcessor.cs
@@ -12,11 +12,6 @@ namespace Wabbajack.Lib
     {
         public WorkQueue Queue { get; private set; }
 
-        public void Dispose()
-        {
-            Queue?.Shutdown();
-        }
-
         public Context VFS { get; private set; }
 
         protected StatusUpdateTracker UpdateTracker { get; private set; }
@@ -109,10 +104,10 @@ namespace Wabbajack.Lib
             return _tcs.Task;
         }
 
-        public void Terminate()
+        public void Dispose()
         {
             _cancel.Cancel();
-            Queue?.Shutdown();
+            Queue?.Dispose();
             _isRunning.OnNext(false);
         }
     }
diff --git a/Wabbajack.Lib/IBatchProcessor.cs b/Wabbajack.Lib/IBatchProcessor.cs
index 60d8a5c8..9b44d70f 100644
--- a/Wabbajack.Lib/IBatchProcessor.cs
+++ b/Wabbajack.Lib/IBatchProcessor.cs
@@ -36,12 +36,5 @@ namespace Wabbajack.Lib
         /// Begin processing
         /// </summary>
         Task<bool> Begin();
-
-        /// <summary>
-        /// Terminate any processing currently in progress by the processor. The processor should be disposed of
-        /// after calling this function as processing cannot be resumed and the tasks may be half completed.
-        /// Should only be called while IsRunning = true;
-        /// </summary>
-        void Terminate();
     }
 }
diff --git a/Wabbajack.Test.ListValidation/ListValidation.cs b/Wabbajack.Test.ListValidation/ListValidation.cs
index 93b8f970..aca26597 100644
--- a/Wabbajack.Test.ListValidation/ListValidation.cs
+++ b/Wabbajack.Test.ListValidation/ListValidation.cs
@@ -34,7 +34,7 @@ namespace Wabbajack.Test.ListValidation
         [TestCleanup]
         public void Cleanup()
         {
-            Queue.Shutdown();
+            Queue.Dispose();
             Queue = null;
         }
 
diff --git a/Wabbajack.Test/EndToEndTests.cs b/Wabbajack.Test/EndToEndTests.cs
index 7395403d..62c14c24 100644
--- a/Wabbajack.Test/EndToEndTests.cs
+++ b/Wabbajack.Test/EndToEndTests.cs
@@ -39,7 +39,7 @@ namespace Wabbajack.Test
         [TestCleanup]
         public void Cleanup()
         {
-            Queue.Shutdown();
+            Queue.Dispose();
         }
 
         [TestMethod]