提交: cfa22461ae837e893170d945e08595c56e7c4bf7 - CleanAuLait48 (git)

Commit MetaInfo

• 修訂: cfa22461ae837e893170d945e08595c56e7c4bf7 (tree)
• 時間: 2022-05-21 18:58:48
• 作者: yoshy <yoshy.org.bitbucket@gz.j...>
• Commiter: yoshy

Log Message

[MOD] キャプションクラスをアプリ側で拡張可能なようにリファクタ

Change Summary

• modified: Core/Resource/CaptionFormatter.cs

差異

--- a/Core/Resource/CaptionFormatter.cs
+++ b/Core/Resource/CaptionFormatter.cs
@@ -11,8 +11,8 @@ namespace CleanAuLait48.Core.Resource
         public const string MSG_KEY_CAPTION_ERROR = "Caption.Error";
         public const string MSG_KEY_CAPTION_EXCEPTION = "Caption.Exception";
         
-        private readonly IMessageRepository repo;
-        private readonly DlgInfo defaultDlgInfo;
+        protected readonly IMessageRepository repo;
+        protected readonly DlgInfo defaultDlgInfo;
 
         public CaptionFormatter(IMessageRepository repo)
         {
@@ -32,44 +32,32 @@ namespace CleanAuLait48.Core.Resource
 
         public string GetInfoCaption()
         {
-            return GetInfoCaption(null);
+            return GetCaption(MSG_KEY_CAPTION_INFO);
         }
 
         public string GetInfoCaption(DlgInfo dlgInfo)
         {
-            if (dlgInfo == null)
-            {
-                dlgInfo = defaultDlgInfo;
-            }
-            return string.Format(repo.Get(MSG_KEY_CAPTION_INFO), dlgInfo.Caption);
+            return GetCaption(MSG_KEY_CAPTION_INFO, dlgInfo);
         }
 
         public string GetWarnCaption()
         {
-            return GetWarnCaption(null);
+            return GetCaption(MSG_KEY_CAPTION_WARN);
         }
 
         public string GetWarnCaption(DlgInfo dlgInfo)
         {
-            if (dlgInfo == null)
-            {
-                dlgInfo = defaultDlgInfo;
-            }
-            return string.Format(repo.Get(MSG_KEY_CAPTION_WARN), dlgInfo.Caption);
+            return GetCaption(MSG_KEY_CAPTION_WARN, dlgInfo);
         }
 
         public string GetErrorCaption()
         {
-            return GetErrorCaption(null);
+            return GetCaption(MSG_KEY_CAPTION_ERROR);
         }
 
         public string GetErrorCaption(DlgInfo dlgInfo)
         {
-            if (dlgInfo == null)
-            {
-                dlgInfo = defaultDlgInfo;
-            }
-            return string.Format(repo.Get(MSG_KEY_CAPTION_ERROR), dlgInfo.Caption);
+            return GetCaption(MSG_KEY_CAPTION_ERROR, dlgInfo);
         }
 
         public string GetExceptionCaption(Exception e)
@@ -85,5 +73,20 @@ namespace CleanAuLait48.Core.Resource
             }
             return string.Format(repo.Get(MSG_KEY_CAPTION_EXCEPTION), dlgInfo.Caption, e.GetType().Name);
         }
+
+        protected string GetCaption(string msgCaptionKey)
+        {
+            return GetCaption(msgCaptionKey, null);
+        }
+
+        protected string GetCaption(string msgCaptionKey, DlgInfo dlgInfo)
+        {
+            if (dlgInfo == null)
+            {
+                dlgInfo = defaultDlgInfo;
+            }
+            return string.Format(repo.Get(msgCaptionKey), dlgInfo.Caption);
+        }
+
     }
 }