Merge branch 'master' of https://github.com/RNoeldner/CSVQuickViewer

Author: RNoeldner

Library/ClassLibraryCSV/ClassLibraryCsvExtensionMethods.cs

@@ -747,10 +747,10 @@ public static string ReplaceDefaults(this string inputValue, string old1, string
     /// <summary>
     /// Replace placeholder in a template with value of property
     /// </summary>
-    /// <param name="template">The template, e.G. ID:{ID}</param>
+    /// <param name="template">The template with placeholder in {}, e.G. ID:{ID} </param>
     /// <param name="obj">The object that is used to look at the properties</param>
     /// <returns>Any found property placeholder is replaced by the property value</returns>
-    public static string ReplacePlaceholder(this string template, object obj)
+    public static string ReplacePlaceholderWithPropertyValues(this string template, object obj)
     {
       if (template.IndexOf('{') == -1)
         return template;
@@ -775,7 +775,40 @@ public static string ReplacePlaceholder(this string template, object obj)
       foreach (var pro in placeholder)
         template = template.ReplaceCaseInsensitive(pro.Key, pro.Value);
 
-      return template;
+      return template.Replace("  ", " ");
+    }
+
+    /// <summary>
+    /// Replace placeholder in a template with the text provide in the parameters the order of the placeholders is important not their contend
+    /// </summary>
+    /// <param name="template">The template with placeholder in {}, e.G. ID:{ID} </param>
+    /// <param name="values">a variable number of text that will replace the placeholder in order of appearance</param>
+    /// <returns>Any found property placeholder is replaced by the provide text</returns>
+    public static string ReplacePlaceholderWithText(this string template, params string[] values)
+    {
+      if (template.IndexOf('{') == -1)
+        return template;
+
+      // get all placeholders in {}
+      var rgx = new Regex(@"\{[^\}]+\}");
+
+      var placeholder = new Dictionary<string, string>();
+      var index = 0;
+      foreach (Match match in rgx.Matches(template))
+      {
+        if (index >= values.Length)
+          break;
+        if (!placeholder.ContainsKey(match.Value))
+        {
+          placeholder.Add(match.Value, values[index++]);
+        }
+      }
+
+      // replace them  with the property value from setting
+      foreach (var pro in placeholder)
+        template = template.ReplaceCaseInsensitive(pro.Key, pro.Value);
+
+      return template.Replace("  ", " ");
     }
 
     /// <summary>

Library/ClassLibraryCSV/RemoteAccess.cs

@@ -115,11 +115,11 @@ public virtual string User
       }
     }
 
-    [XmlAttribute]
+    [XmlAttribute("Password")]
     [DefaultValue("")]
     [Browsable(true)]
     [ReadOnly(false)]
-    public virtual string Password
+    public virtual string EncryptedPassword
     {
       get => m_EncryptedPassword;
       set
@@ -128,7 +128,7 @@ public virtual string Password
         if (m_EncryptedPassword.Equals(newVal))
           return;
         m_EncryptedPassword = newVal;
-        NotifyPropertyChanged(nameof(Password));
+        NotifyPropertyChanged(nameof(EncryptedPassword));
       }
     }
 
@@ -143,7 +143,7 @@ public void CopyTo(RemoteAccess other)
     {
       if (other == null)
         return;
-      other.Password = Password;
+      other.EncryptedPassword = EncryptedPassword;
       other.User = User;
       other.HostName = HostName;
       other.Protocol = Protocol;
@@ -161,7 +161,7 @@ public bool Equals(RemoteAccess other)
         return false;
       if (ReferenceEquals(this, other))
         return true;
-      return string.Equals(Password, other.Password) && m_Protocol == other.Protocol &&
+      return string.Equals(EncryptedPassword, other.EncryptedPassword) && m_Protocol == other.Protocol &&
              string.Equals(HostName, other.HostName, StringComparison.OrdinalIgnoreCase) &&
              string.Equals(User, other.User, StringComparison.OrdinalIgnoreCase);
     }

Library/ClassLibraryCSVUnitTest/ExtensionTests.cs

@@ -23,9 +23,9 @@ public void ReplacePlaceholder()
         ID = "12234"
       };
 
-      Assert.AreEqual("This is a test 12234", "This is a test {Id}".ReplacePlaceholder(csv));
-      Assert.AreEqual("This is fileName a test 12234", "This is {FileName} a test {Id}".ReplacePlaceholder(csv));
-      Assert.AreEqual("This is {nonsense} a test", "This is {nonsense} a test".ReplacePlaceholder(csv));
+      Assert.AreEqual("This is a test 12234", "This is a test {Id}".ReplacePlaceholderWithPropertyValues(csv));
+      Assert.AreEqual("This is fileName a test 12234", "This is {FileName} a test {Id}".ReplacePlaceholderWithPropertyValues(csv));
+      Assert.AreEqual("This is {nonsense} a test", "This is {nonsense} a test".ReplacePlaceholderWithPropertyValues(csv));
     }
   }
 }

Library/ClassLibraryCSVUnitTest/RemoteAccessTests.cs

@@ -11,6 +11,7 @@
  * If not, see http://www.gnu.org/licenses/ .
  *
  */
+
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace CsvTools.Tests
@@ -32,7 +33,7 @@ public void EqualsTest()
     public void RemoteAccessTest()
     {
       var testCase = new RemoteAccess();
-      bool hasFired = false;
+      var hasFired = false;
       testCase.PropertyChanged += delegate (object sender, System.ComponentModel.PropertyChangedEventArgs e)
       {
         hasFired = true;
@@ -51,11 +52,11 @@ public void RemoteAccessTest()
       testCase.User = "Hello";
       Assert.IsFalse(hasFired);
 
-      testCase.Password = "World";
+      testCase.EncryptedPassword = "World";
       Assert.IsTrue(hasFired);
-      Assert.AreEqual("World", testCase.Password);
+      Assert.AreEqual("World", testCase.EncryptedPassword);
       hasFired = false;
-      testCase.Password = "World";
+      testCase.EncryptedPassword = "World";
       Assert.IsFalse(hasFired);
     }
   }

Library/SharedAssemblyInfo.cs

@@ -14,6 +14,6 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers by using the '*'
 // as shown below: [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.6.4.404")]
-[assembly: AssemblyFileVersion("1.6.4.404")]
-[assembly: AssemblyInformationalVersion("1.6.4.404")] // a.k.a. "Product version"
+[assembly: AssemblyVersion("1.6.4.407")]
+[assembly: AssemblyFileVersion("1.6.4.407")]
+[assembly: AssemblyInformationalVersion("1.6.4.407")] // a.k.a. "Product version"

Library/WinFormControls/TimedMessage.cs

@@ -210,15 +210,6 @@ public DialogResult Show(Form owner, string message, string title, MessageBoxBut
 
       m_MessageBoxButtons = buttons;
 
-      if (!string.IsNullOrEmpty(button1Text))
-        button1.Text = button1Text;
-
-      if (!string.IsNullOrEmpty(button2Text))
-        button2.Text = button2Text;
-
-      if (!string.IsNullOrEmpty(button3Text))
-        button3.Text = button3Text;
-
       // One Button
       if (buttons == MessageBoxButtons.OK)
       {
@@ -289,6 +280,15 @@ public DialogResult Show(Form owner, string message, string title, MessageBoxBut
         CancelButton = button3;
       }
 
+      if (!string.IsNullOrEmpty(button1Text))
+        button1.Text = button1Text;
+
+      if (!string.IsNullOrEmpty(button2Text))
+        button2.Text = button2Text;
+
+      if (!string.IsNullOrEmpty(button3Text))
+        button3.Text = button3Text;
+
       if (defaultButton == MessageBoxDefaultButton.Button1)
       {
         AcceptButton = button1;