キャレット位置設定時にフォーカスフラグを変更しないようにした

[fooeditengine/FooEditEngine.git] / Common / WatchDogPattern.cs

diff --git a/Common/WatchDogPattern.cs b/Common/WatchDogPattern.cs
index e922f83..d350335 100644 (file)
--- a/Common/WatchDogPattern.cs
+++ b/Common/WatchDogPattern.cs
@@ -15,9 +15,9 @@ using System.Text.RegularExpressions;
 namespace FooEditEngine\r
 {\r
     /// <summary>\r
-    /// WatchDog\83C\83\93\83^\81[\83t\83F\83C\83X\r
+    /// IMarkerPattern\83C\83\93\83^\81[\83t\83F\83C\83X\r
     /// </summary>\r
-    public interface IWatchDog\r
+    public interface IMarkerPattern\r
     {\r
         /// <summary>\r
         /// \83}\81[\83J\81[\82ð\95Ô\82·\r
@@ -25,12 +25,12 @@ namespace FooEditEngine
         /// <param name="lineHeadIndex">\8ds\93ª\82Ö\82Ì\83C\83\93\83f\83b\83N\83X\82ð\95\\82·</param>\r
         /// <param name="s">\95¶\8e\9a\97ñ</param>\r
         /// <returns>Marker\97ñ\8b\93\91Ì\82ð\95Ô\82·</returns>\r
-        IEnumerable<Marker> Mark(int lineHeadIndex, string s);\r
+        IEnumerable<Marker> GetMarker(int lineHeadIndex, string s);\r
     }\r
     /// <summary>\r
-    /// \90³\8bK\95\\8c»\82Å\83p\83^\81[\83\93\83}\83b\83`\82ð\8ds\82¤WatchDog\r
+    /// \90³\8bK\95\\8c»\82Å\83}\81[\83J\81[\82Ì\8eæ\93¾\82ð\8ds\82¤\83N\83\89\83X\r
     /// </summary>\r
-    public sealed class RegexWatchDog : IWatchDog\r
+    public sealed class RegexMarkerPattern : IMarkerPattern\r
     {\r
         Regex regex;\r
         HilightType type;\r
@@ -41,7 +41,7 @@ namespace FooEditEngine
         /// <param name="regex">regex\83I\83u\83W\83F\83N\83g</param>\r
         /// <param name="type">\83n\83C\83\89\83C\83g\83^\83C\83v</param>\r
         /// <param name="color">\90F</param>\r
-        public RegexWatchDog(Regex regex,HilightType type,Color color)\r
+        public RegexMarkerPattern(Regex regex,HilightType type,Color color)\r
         {\r
             this.regex = regex;\r
             this.type = type;\r
@@ -54,7 +54,7 @@ namespace FooEditEngine
         /// <param name="lineHeadIndex">\8ds\93ª\82Ö\82Ì\83C\83\93\83f\83b\83N\83X\82ð\95\\82·</param>\r
         /// <param name="s">\95¶\8e\9a\97ñ</param>\r
         /// <returns>Marker\97ñ\8b\93\91Ì\82ð\95Ô\82·</returns>\r
-        public IEnumerable<Marker> Mark(int lineHeadIndex, string s)\r
+        public IEnumerable<Marker> GetMarker(int lineHeadIndex, string s)\r
         {\r
             foreach (Match m in this.regex.Matches(s))\r
             {\r
@@ -63,14 +63,14 @@ namespace FooEditEngine
         }\r
     }\r
     /// <summary>\r
-    /// WatchDog\83p\83^\81[\83\93\83Z\83b\83g\r
+    /// MarkerPattern\83Z\83b\83g\r
     /// </summary>\r
-    public sealed class WatchDogSet\r
+    public sealed class MarkerPatternSet\r
     {\r
         MarkerCollection markers;\r
-        Dictionary<int, IWatchDog> set = new Dictionary<int, IWatchDog>();\r
+        Dictionary<int, IMarkerPattern> set = new Dictionary<int, IMarkerPattern>();\r
 \r
-        internal WatchDogSet(LineToIndexTable lti,MarkerCollection markers)\r
+        internal MarkerPatternSet(LineToIndexTable lti,MarkerCollection markers)\r
         {\r
             lti.CreateingLayout += lti_CreateingLayout;\r
             this.markers = markers;\r
@@ -82,7 +82,7 @@ namespace FooEditEngine
             foreach (int id in this.set.Keys)\r
             {\r
                 this.markers.RemoveAll(id, e.Index, e.Length);\r
-                this.markers.AddRange(id, this.set[id].Mark(e.Index,e.Content));\r
+                this.markers.AddRange(id, this.set[id].GetMarker(e.Index,e.Content));\r
             }\r
         }\r
 \r
@@ -92,8 +92,8 @@ namespace FooEditEngine
         /// WatchDog\82ð\92Ç\89Á\82·\82é\r
         /// </summary>\r
         /// <param name="id">\83}\81[\83J\81[ID</param>\r
-        /// <param name="dog">IWatchDog\83C\83\93\83^\81[\83t\83F\83C\83X</param>\r
-        public void Add(int id, IWatchDog dog)\r
+        /// <param name="dog">IMarkerPattern\83C\83\93\83^\81[\83t\83F\83C\83X</param>\r
+        public void Add(int id, IMarkerPattern dog)\r
         {\r
             this.set.Add(id, dog);\r
             this.Updated(this, null);\r
@@ -109,6 +109,5 @@ namespace FooEditEngine
             this.set.Remove(id);\r
             this.Updated(this, null);\r
         }\r
-\r
     }\r
 }
\ No newline at end of file