OSDN Git Service

(root) / kancollesniffer / KancolleSniffer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2abd283)
FlashをFlushに
authorKazuhiro Fujieda <fujieda@users.osdn.me>
Sat, 25 Apr 2020 10:39:57 +0000 (19:39 +0900)
committerKazuhiro Fujieda <fujieda@users.osdn.me>
Sun, 30 Aug 2020 05:58:21 +0000 (14:58 +0900)
KancolleSniffer.Test/NotificationManagerTest.cs patch | blob | history
KancolleSniffer/MainForm.cs patch | blob | history
KancolleSniffer/Notification/Scheduler.cs patch | blob | history

diff --git a/KancolleSniffer.Test/NotificationManagerTest.cs b/KancolleSniffer.Test/NotificationManagerTest.cs
index 5825f82..170dfdf 100644 (file)
--- a/KancolleSniffer.Test/NotificationManagerTest.cs
+++ b/KancolleSniffer.Test/NotificationManagerTest.cs
@@ -58,7 +58,7 @@ namespace KancolleSniffer.Test
             var manager =\r
                 new Scheduler((t, b, n) => { result = new Message {Title = t, Body = b, Name = n}; }, time.GetNow);\r
             manager.Enqueue("遠征終了", 1, "防空射撃演習");\r
-            manager.Flash();\r
+            manager.Flush();\r
             PAssert.That(() => new Message {Title = "遠征が終わりました", Body = "第二艦隊 防空射撃演習", Name = "遠征終了"}.Equals(result));\r
         }\r
 \r
@@ -74,12 +74,12 @@ namespace KancolleSniffer.Test
                 new Scheduler((t, b, n) => { result = new Message {Title = t, Body = b, Name = n}; }, time.GetNow);\r
             manager.Enqueue("遠征終了", 1, "防空射撃演習");\r
             manager.Enqueue("疲労回復49", 1, "cond49");\r
-            manager.Flash();\r
+            manager.Flush();\r
             PAssert.That(() => new Message {Title = "遠征が終わりました", Body = "第二艦隊 防空射撃演習", Name = "遠征終了"}.Equals(result));\r
             result = null;\r
-            manager.Flash();\r
+            manager.Flush();\r
             PAssert.That(() => result == null);\r
-            manager.Flash();\r
+            manager.Flush();\r
             PAssert.That(() => new Message {Title = "疲労が回復しました", Body = "第二艦隊", Name = "疲労回復"}.Equals(result));\r
         }\r
 \r
@@ -94,11 +94,11 @@ namespace KancolleSniffer.Test
             var manager =\r
                 new Scheduler((t, b, n) => { result = new Message {Title = t, Body = b, Name = n}; }, time.GetNow);\r
             manager.Enqueue("建造完了", 0, "");\r
-            manager.Flash();\r
+            manager.Flush();\r
             PAssert.That(() => new Message {Title = "建造が終わりました", Body = "第一ドック", Name = "建造完了"}.Equals(result));\r
-            manager.Flash();\r
+            manager.Flush();\r
             manager.Enqueue("建造完了", 1, "");\r
-            manager.Flash();\r
+            manager.Flush();\r
             PAssert.That(() => new Message {Title = "建造が終わりました", Body = "第二ドック", Name = "建造完了"}.Equals(result));\r
         }\r
 \r
@@ -120,19 +120,19 @@ namespace KancolleSniffer.Test
                 {\r
                     case 0:\r
                         manager.Enqueue("遠征終了", 1, "防空射撃演習", 2);\r
-                        manager.Flash();\r
+                        manager.Flush();\r
                         PAssert.That(() => expected.Equals(result));\r
                         break;\r
                     case 2000:\r
-                        manager.Flash();\r
+                        manager.Flush();\r
                         PAssert.That(() => expected.Repeat.Equals(result));\r
                         break;\r
                     case 4000:\r
-                        manager.Flash();\r
+                        manager.Flush();\r
                         PAssert.That(() => expected.Repeat.Equals(result));\r
                         return;\r
                     default:\r
-                        manager.Flash();\r
+                        manager.Flush();\r
                         PAssert.That(() => result == null, elapsed.ToString());\r
                         break;\r
                 }\r
@@ -160,24 +160,24 @@ namespace KancolleSniffer.Test
                 {\r
                     case 0:\r
                         manager.Enqueue("遠征終了", 1, "防空射撃演習", 10);\r
-                        manager.Flash();\r
+                        manager.Flush();\r
                         PAssert.That(() => ensei.Equals(result));\r
                         break;\r
                     case 2000:\r
                         manager.Enqueue("泊地修理20分経過", 0, "", 5);\r
-                        manager.Flash();\r
+                        manager.Flush();\r
                         PAssert.That(() => hakuchi.Equals(result));\r
                         break;\r
                     case 7000:\r
-                        manager.Flash();\r
+                        manager.Flush();\r
                         PAssert.That(() => hakuchi.Repeat.Equals(result), "泊地修理2回目");\r
                         break;\r
                     case 10000:\r
-                        manager.Flash();\r
+                        manager.Flush();\r
                         PAssert.That(() => ensei.Repeat.Equals(result), "遠征終了2回目");\r
                         return;\r
                     default:\r
-                        manager.Flash();\r
+                        manager.Flush();\r
                         PAssert.That(() => result == null, elapsed.ToString());\r
                         break;\r
                 }\r
@@ -205,27 +205,27 @@ namespace KancolleSniffer.Test
                 {\r
                     case 0:\r
                         manager.Enqueue("遠征終了", 1, "防空射撃演習", 3);\r
-                        manager.Flash();\r
+                        manager.Flush();\r
                         PAssert.That(() => ensei.Equals(result));\r
                         break;\r
                     case 1000:\r
                         manager.Enqueue("泊地修理20分経過", 0, "", 2);\r
-                        manager.Flash();\r
+                        manager.Flush();\r
                         break;\r
                     case 2000:\r
-                        manager.Flash();\r
+                        manager.Flush();\r
                         PAssert.That(() => hakuchi.Equals(result));\r
                         break;\r
                     case 4000:\r
-                        manager.Flash();\r
+                        manager.Flush();\r
                         PAssert.That(() => ensei.Repeat.Equals(result), "遠征終了2回目");\r
                         break;\r
                     case 6000:\r
-                        manager.Flash();\r
+                        manager.Flush();\r
                         PAssert.That(() => hakuchi.Repeat.Equals(result), "泊地修理2回目");\r
                         return;\r
                     default:\r
-                        manager.Flash();\r
+                        manager.Flush();\r
                         PAssert.That(() => result == null, elapsed.ToString());\r
                         break;\r
                 }\r
@@ -253,28 +253,28 @@ namespace KancolleSniffer.Test
                 {\r
                     case 0:\r
                         manager.Enqueue("遠征終了", 1, "防空射撃演習", 10);\r
-                        manager.Flash();\r
+                        manager.Flush();\r
                         PAssert.That(() => ensei.Equals(result));\r
                         break;\r
                     case 2000:\r
                         manager.Enqueue("入渠終了", 0, "綾波改二", 5);\r
-                        manager.Flash();\r
+                        manager.Flush();\r
                         PAssert.That(() => nyukyo.Equals(result));\r
                         break;\r
                     case 3000:\r
                         manager.StopRepeat("入渠終了");\r
-                        manager.Flash();\r
+                        manager.Flush();\r
                         break;\r
                     case 7000:\r
-                        manager.Flash();\r
+                        manager.Flush();\r
                         PAssert.That(() => result == null, "入渠終了2回目はない");\r
                         break;\r
                     case 10000:\r
-                        manager.Flash();\r
+                        manager.Flush();\r
                         PAssert.That(() => ensei.Repeat.Equals(result), "遠征終了2回目");\r
                         return;\r
                     default:\r
-                        manager.Flash();\r
+                        manager.Flush();\r
                         PAssert.That(() => result == null, elapsed.ToString());\r
                         break;\r
                 }\r
@@ -301,23 +301,23 @@ namespace KancolleSniffer.Test
                 {\r
                     case 0:\r
                         manager.Enqueue("遠征終了", 1, "防空射撃演習", 10);\r
-                        manager.Flash();\r
+                        manager.Flush();\r
                         PAssert.That(() => expected.Equals(result));\r
                         break;\r
                     case 1000:\r
-                        manager.Flash();\r
+                        manager.Flush();\r
                         manager.SuspendRepeat();\r
                         break;\r
                     case 11000:\r
-                        manager.Flash();\r
+                        manager.Flush();\r
                         manager.ResumeRepeat();\r
                         break;\r
                     case 12000:\r
-                        manager.Flash();\r
+                        manager.Flush();\r
                         PAssert.That(() => expected.Repeat.Equals(result));\r
                         return;\r
                     default:\r
-                        manager.Flash();\r
+                        manager.Flush();\r
                         PAssert.That(() => result == null, elapsed.ToString());\r
                         break;\r
                 }\r
@@ -345,32 +345,32 @@ namespace KancolleSniffer.Test
                 {\r
                     case 0:\r
                         manager.Enqueue("遠征終了", 1, "防空射撃演習", 10);\r
-                        manager.Flash();\r
+                        manager.Flush();\r
                         PAssert.That(() => ensei.Equals(result));\r
                         break;\r
                     case 1000:\r
-                        manager.Flash();\r
+                        manager.Flush();\r
                         manager.SuspendRepeat("大破警告");\r
                         break;\r
                     case 2000:\r
                         manager.Enqueue("大破警告", "摩耶改二", 8);\r
-                        manager.Flash();\r
+                        manager.Flush();\r
                         PAssert.That(() => taiha.Equals(result));\r
                         break;\r
                     case 10000:\r
-                        manager.Flash();\r
+                        manager.Flush();\r
                         PAssert.That(() => taiha.Repeat.Equals(result));\r
                         break;\r
                     case 11000:\r
-                        manager.Flash();\r
+                        manager.Flush();\r
                         manager.ResumeRepeat();\r
                         break;\r
                     case 12000:\r
-                        manager.Flash();\r
+                        manager.Flush();\r
                         PAssert.That(() => ensei.Repeat.Equals(result));\r
                         return;\r
                     default:\r
-                        manager.Flash();\r
+                        manager.Flush();\r
                         PAssert.That(() => result == null, elapsed.ToString());\r
                         break;\r
                 }\r
@@ -398,27 +398,27 @@ namespace KancolleSniffer.Test
                 {\r
                     case 0:\r
                         manager.Enqueue("遠征終了", 1, "防空射撃演習", 10);\r
-                        manager.Flash();\r
+                        manager.Flush();\r
                         PAssert.That(() => expected1.Equals(result));\r
                         break;\r
                     case 1000:\r
                         manager.Enqueue("遠征終了", 2, "海上護衛任務", 10);\r
-                        manager.Flash();\r
+                        manager.Flush();\r
                         break;\r
                     case 2000:\r
-                        manager.Flash();\r
+                        manager.Flush();\r
                         PAssert.That(() => expected2.Equals(result));\r
                         break;\r
                     case 5000:\r
-                        manager.Flash();\r
+                        manager.Flush();\r
                         manager.StopRepeat("遠征終了", 1);\r
                         break;\r
                     case 12000:\r
-                        manager.Flash();\r
+                        manager.Flush();\r
                         PAssert.That(() => expected2.Repeat.Equals(result));\r
                         return;\r
                     default:\r
-                        manager.Flash();\r
+                        manager.Flush();\r
                         PAssert.That(() => result == null, elapsed.ToString());\r
                         break;\r
                 }\r
@@ -446,26 +446,26 @@ namespace KancolleSniffer.Test
                 {\r
                     case 0:\r
                         manager.Enqueue("遠征終了", 1, "防空射撃演習", 10);\r
-                        manager.Flash();\r
+                        manager.Flush();\r
                         PAssert.That(() => expected1.Equals(result));\r
                         break;\r
                     case 2000:\r
-                        manager.Flash();\r
+                        manager.Flush();\r
                         manager.StopRepeat("遠征終了", true);\r
                         break;\r
                     case 10000:\r
-                        manager.Flash();\r
+                        manager.Flush();\r
                         PAssert.That(() => expected2.Cont.Equals(result));\r
                         break;\r
                     case 11000:\r
-                        manager.Flash();\r
+                        manager.Flush();\r
                         manager.StopRepeat("遠征終了", 1);\r
                         break;\r
                     case 21000:\r
-                        manager.Flash();\r
+                        manager.Flush();\r
                         return;\r
                     default:\r
-                        manager.Flash();\r
+                        manager.Flush();\r
                         PAssert.That(() => result == null, elapsed.ToString());\r
                         break;\r
                 }\r
@@ -486,7 +486,7 @@ namespace KancolleSniffer.Test
                 new Scheduler((t, b, n) => { result = new Message {Title = t, Body = b, Name = n}; }, time.GetNow);\r
             var expected = new Message {Title = "[予告] 遠征が終わりました", Body = "第二艦隊 防空射撃演習", Name = "遠征終了"};\r
             manager.Enqueue("遠征終了", 1, "防空射撃演習", 0, true);\r
-            manager.Flash();\r
+            manager.Flush();\r
             PAssert.That(() => expected.Equals(result));\r
         }\r
 \r
@@ -502,7 +502,7 @@ namespace KancolleSniffer.Test
                 new Scheduler((t, b, n) => { result = new Message {Title = t, Body = b, Name = n}; }, time.GetNow);\r
             manager.Enqueue("遠征終了", 1, "防空射撃演習", 10);\r
             manager.Enqueue("遠征終了", 2, "海上護衛任務", 10);\r
-            manager.Flash();\r
+            manager.Flush();\r
             PAssert.That(() =>\r
                 new Message {Title = "遠征が終わりました", Body = "第二艦隊 防空射撃演習\r\n第三艦隊 海上護衛任務", Name = "遠征終了"}.Equals(result));\r
         }\r
@@ -527,19 +527,19 @@ namespace KancolleSniffer.Test
                     case 0:\r
                         manager.Enqueue("遠征終了", 1, "防空射撃演習", 10);\r
                         manager.Enqueue("遠征終了", 2, "海上護衛任務", 10);\r
-                        manager.Flash();\r
+                        manager.Flush();\r
                         PAssert.That(() => expected1.Equals(result));\r
                         break;\r
                     case 5000:\r
-                        manager.Flash();\r
+                        manager.Flush();\r
                         manager.StopRepeat("遠征終了", 1);\r
                         break;\r
                     case 10000:\r
-                        manager.Flash();\r
+                        manager.Flush();\r
                         PAssert.That(() => expected2.Repeat.Equals(result));\r
                         return;\r
                     default:\r
-                        manager.Flash();\r
+                        manager.Flush();\r
                         PAssert.That(() => result == null, elapsed.ToString());\r
                         break;\r
                 }\r
diff --git a/KancolleSniffer/MainForm.cs b/KancolleSniffer/MainForm.cs
index 0337c79..51db912 100644 (file)
--- a/KancolleSniffer/MainForm.cs
+++ b/KancolleSniffer/MainForm.cs
@@ -138,7 +138,7 @@ namespace KancolleSniffer
 \r
             public void Flash()\r
             {\r
-                _manager.Flash();\r
+                _manager.Flush();\r
             }\r
 \r
             public void Enqueue(string key, string subject)\r
@@ -679,7 +679,7 @@ namespace KancolleSniffer
             if (!Sniffer.BadlyDamagedShips.Any())\r
                 return;\r
             SetNotification("大破警告", string.Join(" ", Sniffer.BadlyDamagedShips));\r
-            _notificationScheduler.Flash();\r
+            _notificationScheduler.Flush();\r
         }\r
 \r
         private void UpdateBattleInfo()\r
@@ -741,7 +741,7 @@ namespace KancolleSniffer
             }\r
             NotifyCondTimers();\r
             NotifyAkashiTimer();\r
-            _notificationScheduler.Flash();\r
+            _notificationScheduler.Flush();\r
         }\r
 \r
         private void CheckAlarm(string key, AlarmTimer timer, int fleet, string subject)\r
@@ -853,7 +853,7 @@ namespace KancolleSniffer
                 SetNotification("任務達成", 0, questName);\r
             foreach (var questName in stop)\r
                 _notificationScheduler.StopRepeat("任務達成", questName);\r
-            _notificationScheduler.Flash();\r
+            _notificationScheduler.Flush();\r
         }\r
 \r
         private void Alarm(string balloonTitle, string balloonMessage, string name)\r
diff --git a/KancolleSniffer/Notification/Scheduler.cs b/KancolleSniffer/Notification/Scheduler.cs
index d793a4d..1be7dfb 100644 (file)
--- a/KancolleSniffer/Notification/Scheduler.cs
+++ b/KancolleSniffer/Notification/Scheduler.cs
@@ -70,7 +70,7 @@ namespace KancolleSniffer.Notification
             Enqueue(key, 0, subject, repeat);\r
         }\r
 \r
-        public void Flash()\r
+        public void Flush()\r
         {\r
             Alarm();\r
         }\r
About OSDN
Find Software
Develop Software
Help