Commit: c3a256ccb4a9a5823695d2237d31680b12931560 - CleanAuLait (git)

Commit MetaInfo

• Revision: c3a256ccb4a9a5823695d2237d31680b12931560 (tree)
• Time: 2022-11-29 23:54:33
• Author: yoshy <yoshy.org.bitbucket@gz.j...>
• Commiter: yoshy

Log Message

[MOD] キャプション書式化機能でキャプションの取得と書式化を行う機能の区別を明確にした

Change Summary

• modified: Core/Resource/CaptionFormatter.cs
• modified: Core/Resource/ICaptionFormatter.cs

Incremental Difference

--- a/Core/Resource/CaptionFormatter.cs
+++ b/Core/Resource/CaptionFormatter.cs
@@ -3,10 +3,14 @@
     public class CaptionFormatter : ICaptionFormatter
     {
         public const string MSG_KEY_CAPTION = "Caption";
-        public const string MSG_KEY_CAPTION_INFO = "Caption.Info";
-        public const string MSG_KEY_CAPTION_WARN = "Caption.Warn";
-        public const string MSG_KEY_CAPTION_ERROR = "Caption.Error";
-        public const string MSG_KEY_CAPTION_EXCEPTION = "Caption.Exception";
+
+        public const string MSG_KEY_PREFIX_CAPTION_FORMAT = "Caption.Format.";
+
+        public const string MSG_KEY_CAPTION_FORMAT_INFO = MSG_KEY_PREFIX_CAPTION_FORMAT + "Info";
+        public const string MSG_KEY_CAPTION_FORMAT_WARN = MSG_KEY_PREFIX_CAPTION_FORMAT + "Warn";
+        public const string MSG_KEY_CAPTION_FORMAT_ERROR = MSG_KEY_PREFIX_CAPTION_FORMAT + "Error";
+        public const string MSG_KEY_CAPTION_FORMAT_CONFIRM = MSG_KEY_PREFIX_CAPTION_FORMAT + "Confirm";
+        public const string MSG_KEY_CAPTION_FORMAT_EXCEPTION = MSG_KEY_PREFIX_CAPTION_FORMAT + "Exception";
         
         protected readonly IMessageRepository repo;
 
@@ -15,67 +19,100 @@
             this.repo = repo;
         }
 
-        public string GetCaption()
+        public string GetDefaultCaption()
+        {
+            return GetCaption(MSG_KEY_CAPTION);
+        }
+
+        public string GetCaption(string captionKey)
         {
-            return repo.Get(MSG_KEY_CAPTION);
+            return this.repo.Get(captionKey);
         }
 
         public string GetInfoCaption()
         {
-            return GetCaption(MSG_KEY_CAPTION_INFO);
+            return FormatDefaultCaption(MSG_KEY_CAPTION_FORMAT_INFO);
         }
 
-        public string GetInfoCaption(string caption)
+        public string FormatInfoCaption(string captionKey)
         {
-            return GetCaption(MSG_KEY_CAPTION_INFO, caption);
+            return FormatCaption(MSG_KEY_CAPTION_FORMAT_INFO, captionKey);
         }
 
         public string GetWarnCaption()
         {
-            return GetCaption(MSG_KEY_CAPTION_WARN);
+            return FormatDefaultCaption(MSG_KEY_CAPTION_FORMAT_WARN);
         }
 
-        public string GetWarnCaption(string caption)
+        public string FormatWarnCaption(string captionKey)
         {
-            return GetCaption(MSG_KEY_CAPTION_WARN, caption);
+            return FormatCaption(MSG_KEY_CAPTION_FORMAT_WARN, captionKey);
         }
 
         public string GetErrorCaption()
         {
-            return GetCaption(MSG_KEY_CAPTION_ERROR);
+            return FormatDefaultCaption(MSG_KEY_CAPTION_FORMAT_ERROR);
+        }
+
+        public string FormatErrorCaption(string captionKey)
+        {
+            return FormatCaption(MSG_KEY_CAPTION_FORMAT_ERROR, captionKey);
+        }
+
+        public string GetConfirmCaption()
+        {
+            return FormatDefaultCaption(MSG_KEY_CAPTION_FORMAT_ERROR);
         }
 
-        public string GetErrorCaption(string caption)
+        public string FormatConfirmCaption(string captionKey)
         {
-            return GetCaption(MSG_KEY_CAPTION_ERROR, caption);
+            return FormatCaption(MSG_KEY_CAPTION_FORMAT_CONFIRM, captionKey);
         }
 
         public string GetExceptionCaption(Exception e)
         {
-            return GetExceptionCaption(e, null);
+            return FormatExceptionCaption(e, null);
         }
 
-        public string GetExceptionCaption(Exception e, string caption)
+        public string FormatExceptionCaption(Exception e, string captionKey)
         {
-            if (string.IsNullOrEmpty(caption))
+            string caption;
+
+            if (string.IsNullOrEmpty(captionKey))
+            {
+                caption = GetDefaultCaption();
+            }
+            else
             {
-                caption = GetCaption();
+                caption = GetCaption(captionKey);
             }
-            return string.Format(repo.Get(MSG_KEY_CAPTION_EXCEPTION), caption, e.GetType().Name);
+
+            string format = GetCaption(MSG_KEY_CAPTION_FORMAT_EXCEPTION);
+
+            return string.Format(format, caption, e.GetType().Name);
         }
 
-        protected string GetCaption(string msgCaptionKey)
+        protected string FormatDefaultCaption(string captionFormatKey)
         {
-            return GetCaption(msgCaptionKey, null);
+            return FormatCaption(captionFormatKey, null);
         }
 
-        protected string GetCaption(string msgCaptionKey, string caption)
+        protected string FormatCaption(string captionFormatKey, string captionKey)
         {
-            if (string.IsNullOrEmpty(caption))
+            string caption;
+
+            if (string.IsNullOrEmpty(captionKey))
+            {
+                caption = GetDefaultCaption();
+            }
+            else
             {
-                caption = GetCaption();
+                caption = GetCaption(captionKey);
             }
-            return string.Format(repo.Get(msgCaptionKey), caption);
+
+            string format = GetCaption(captionFormatKey);
+
+            return string.Format(format, caption);
         }
 
     }

--- a/Core/Resource/ICaptionFormatter.cs
+++ b/Core/Resource/ICaptionFormatter.cs
@@ -2,14 +2,17 @@
 {
     public interface ICaptionFormatter
     {
-        string GetCaption();
-        string GetErrorCaption();
-        string GetErrorCaption(string caption);
-        string GetExceptionCaption(Exception e);
-        string GetExceptionCaption(Exception e, string caption);
+        string GetDefaultCaption();
+        string GetCaption(string captionKey);
         string GetInfoCaption();
-        string GetInfoCaption(string caption);
+        string FormatInfoCaption(string captionKey);
         string GetWarnCaption();
-        string GetWarnCaption(string caption);
+        string FormatWarnCaption(string captionKey);
+        string GetErrorCaption();
+        string FormatErrorCaption(string captionKey);
+        string GetConfirmCaption();
+        string FormatConfirmCaption(string captionKey);
+        string GetExceptionCaption(Exception e);
+        string FormatExceptionCaption(Exception e, string captionKey);
     }
 }
\ No newline at end of file