na-get-lib,新構造タスクのキャンセル処理を修正。

[applistation/AppliStation.git] / na-get-lib / NaGet.SubCommands / NaGetUninstall.cs

diff --git a/na-get-lib/NaGet.SubCommands/NaGetUninstall.cs b/na-get-lib/NaGet.SubCommands/NaGetUninstall.cs
index 2d1e4da..7b5270a 100644 (file)
--- a/na-get-lib/NaGet.SubCommands/NaGetUninstall.cs
+++ b/na-get-lib/NaGet.SubCommands/NaGetUninstall.cs
@@ -2,6 +2,7 @@ using System;
 using NaGet.Packages.Install;\r
 using NaGet.Packages;\r
 using NaGet.Net;\r
+using NaGet.Tasks;\r
 \r
 namespace NaGet.SubCommands\r
 {\r
@@ -48,24 +49,22 @@ namespace NaGet.SubCommands
                \r
                private void initializeMainTaskSetNames()\r
                {\r
-                       System.Collections.Generic.List<string> taskSetNames = new System.Collections.Generic.List<string>();\r
+                       taskSetNames = new System.Collections.Generic.List<string>();\r
                        \r
                        for (int i =0; i < Uninstallations.Length; i++) {\r
                                taskSetNames.Add(string.Format("\83A\83\93\83C\83\93\83X\83g\81[\83\8b: {0}", Uninstallations[i].ToString()));\r
                        }\r
                        taskSetNames.Add(string.Format("\83\8a\83X\83g\8dX\90V: {0}", NaGet.Env.ArchiveInstalledPackageListFile));\r
                        taskSetNames.Add(string.Format("\83\8a\83X\83g\8dX\90V: {0}", NaGet.Env.SystemInstalledPackageListFile));\r
-                       \r
-                       TaskSetNames = taskSetNames.ToArray();\r
                }\r
                \r
                public override void Run()\r
                {\r
                        currentTaskSetIndex ++;\r
-                       RaiseTaskSetEvent(NaGetTaskSetEventType.STARTED, "\83A\83\93\83C\83\93\83X\83g\81[\83\8b\8f\88\97\9d\8aJ\8en");\r
+                       RaiseTaskSetEvent(TaskEventType.STARTED, "\83A\83\93\83C\83\93\83X\83g\81[\83\8b\8f\88\97\9d\8aJ\8en");\r
                        \r
                        foreach (Uninstallation uninst in Uninstallations) {\r
-                               RaiseTaskSetEvent(NaGetTaskSetEventType.STARTED_TASKSET, uninst.ToString());\r
+                               RaiseTaskSetEvent(TaskEventType.STARTED_SUBTASK, uninst.ToString());\r
                                \r
                                if (uninst.Installed) {\r
                                        try {\r
@@ -73,41 +72,41 @@ namespace NaGet.SubCommands
                                                uninst.ErrorDataReceived += this.ReceivedErrorData;\r
                                                int exitCode = uninst.Uninstall();\r
                                                if (exitCode != 0) {\r
-                                                       RaiseTaskSetEvent(NaGetTaskSetEventType.WARNING, "\83A\83\93\83C\83\93\83X\83g\81[\83\8b\82ª\90³\8fí\82É\8fI\82¦\82Ä\82¢\82È\82¢\89Â\94\\90«\82ª\82 \82è\82Ü\82·\81B\83v\83\8d\83Z\83X\82Ì\8fI\97¹\83R\81[\83h:"+exitCode);\r
+                                                       RaiseTaskSetEvent(TaskEventType.WARNING, "\83A\83\93\83C\83\93\83X\83g\81[\83\8b\82ª\90³\8fí\82É\8fI\82¦\82Ä\82¢\82È\82¢\89Â\94\\90«\82ª\82 \82è\82Ü\82·\81B\83v\83\8d\83Z\83X\82Ì\8fI\97¹\83R\81[\83h:"+exitCode);\r
                                                }\r
                                        } catch (Exception e) {\r
-                                               RaiseTaskSetEvent(NaGetTaskSetEventType.ERROR, e.Message);\r
+                                               RaiseTaskSetEvent(TaskEventType.ERROR, e.Message);\r
                                                done = true;\r
                                                return;\r
                                        }\r
                                } else {\r
-                                       RaiseTaskSetEvent(NaGetTaskSetEventType.WARNING, string.Format("{0}\82Í\8aù\82É\83A\83\93\83C\83\93\83X\83g\81[\83\8b\82³\82ê\82Ä\82¢\82é\82©\81A\83\\83t\83g\82Ì\91¶\8dÝ\82ð\8am\94F\82Å\82«\82Ü\82¹\82ñ\82Å\82µ\82½", uninst));\r
+                                       RaiseTaskSetEvent(TaskEventType.WARNING, string.Format("{0}\82Í\8aù\82É\83A\83\93\83C\83\93\83X\83g\81[\83\8b\82³\82ê\82Ä\82¢\82é\82©\81A\83\\83t\83g\82Ì\91¶\8dÝ\82ð\8am\94F\82Å\82«\82Ü\82¹\82ñ\82Å\82µ\82½", uninst));\r
                                }\r
                                \r
-                               RaiseTaskSetEvent(NaGetTaskSetEventType.COMPLETED_TASKSET, uninst.ToString());\r
+                               RaiseTaskSetEvent(TaskEventType.COMPLETED_SUBTASK, uninst.ToString());\r
                        }\r
                        \r
                        runLocalUpdate();\r
                        \r
                        done = true;\r
                        \r
-                       RaiseTaskSetEvent(NaGetTaskSetEventType.COMPLETED, "\8fI\97¹", 100);\r
+                       RaiseTaskSetEvent(TaskEventType.COMPLETED, "\8fI\97¹", 100);\r
                }\r
                \r
                private void runLocalUpdate()\r
                {\r
                        // \83C\83\93\83X\83g\81[\83\8b\83g\83\8a\83X\83g\82Ì\8dX\90V\r
-                       RaiseTaskSetEvent(NaGetTaskSetEventType.STARTED_TASKSET, TaskSetNames[currentTaskSetIndex]);\r
+                       RaiseTaskSetEvent(TaskEventType.STARTED_SUBTASK, taskSetNames[currentTaskSetIndex]);\r
                        pkgListMan.DetectInstalledPkgs();\r
                        pkgListMan.SaveInstalledPackageList();\r
-                       RaiseTaskSetEvent(NaGetTaskSetEventType.COMPLETED_TASKSET, TaskSetNames[currentTaskSetIndex]);\r
+                       RaiseTaskSetEvent(TaskEventType.COMPLETED_SUBTASK, taskSetNames[currentTaskSetIndex]);\r
                        currentTaskSetIndex++;\r
                \r
                        // \83V\83X\83e\83\80\82É\83C\83\93\83X\83g\81[\83\8b\82³\82ê\82Ä\82¢\82é\83\8a\83X\83g\82Ì\8dX\90V\r
-                       RaiseTaskSetEvent(NaGetTaskSetEventType.STARTED_TASKSET, TaskSetNames[currentTaskSetIndex]);\r
+                       RaiseTaskSetEvent(TaskEventType.STARTED_SUBTASK, taskSetNames[currentTaskSetIndex]);\r
                        pkgListMan.DetectSystemInstalledPkgs();\r
                        pkgListMan.SaveSystemInstalledPackageList();\r
-                       RaiseTaskSetEvent(NaGetTaskSetEventType.COMPLETED_TASKSET, TaskSetNames[currentTaskSetIndex]);\r
+                       RaiseTaskSetEvent(TaskEventType.COMPLETED_SUBTASK, taskSetNames[currentTaskSetIndex]);\r
                        currentTaskSetIndex++;\r
                }\r
                \r