In Test/System.ComponentModel:

2007-05-10  Rolf Bjarne Kvinge  <RKvinge@novell.com>

	* MaskedTextProviderTest.cs: New test.

In System.ComponentModel:
2007-05-10  Rolf Bjarne Kvinge  <RKvinge@novell.com>

	* MaskedTextProvider.cs: Small fix for ToString for passwords.

svn path=/trunk/mcs/; revision=77150

diff --git a/mcs/class/System/System.ComponentModel/ChangeLog b/mcs/class/System/System.ComponentModel/ChangeLog
index 7b586d2628249125481fe1dd8e5ecb674851a0a7..b623af612a06a644cc812841ccae1e938a59d850 100644 (file)
--- a/mcs/class/System/System.ComponentModel/ChangeLog
+++ b/mcs/class/System/System.ComponentModel/ChangeLog
@@ -1,3 +1,7 @@
+2007-05-10  Rolf Bjarne Kvinge  <RKvinge@novell.com>
+
+       * MaskedTextProvider.cs: Small fix for ToString for passwords.
+
 2007-05-09 Igor Zelmanovich <igorz@mainsoft.com>
 
        * Win32Exception.cs:

diff --git a/mcs/class/System/System.ComponentModel/MaskedTextProvider.cs b/mcs/class/System/System.ComponentModel/MaskedTextProvider.cs
index 564436f02cf05f3f38ca7e7199824de865267e97..546136bcca68179ad56a774220bd5f1f1a7d610b 100644 (file)
--- a/mcs/class/System/System.ComponentModel/MaskedTextProvider.cs
+++ b/mcs/class/System/System.ComponentModel/MaskedTextProvider.cs
@@ -1735,7 +1735,15 @@ namespace System.ComponentModel {
                                } else if (ed.Editable) {
                                        if (IsPassword) {
                                                if (ignorePasswordChar) {
-                                                       result.Append (ed.Input);
+                                                       if (!ed.FilledIn) {
+                                                               if (includePrompt) {
+                                                                       result.Append (PromptChar);
+                                                               } else {
+                                                                       result.Append (" ");
+                                                               }
+                                                       } else {
+                                                               result.Append (ed.Input);
+                                                       }
                                                } else {
                                                        result.Append (PasswordChar);
                                                }

diff --git a/mcs/class/System/Test/System.ComponentModel/ChangeLog b/mcs/class/System/Test/System.ComponentModel/ChangeLog
index d85fc9e3a2b53434792c15ab03ae3b043c1c34fe..39823cdaf691d72ff9f7a3e3705c2280c6bee39d 100644 (file)
--- a/mcs/class/System/Test/System.ComponentModel/ChangeLog
+++ b/mcs/class/System/Test/System.ComponentModel/ChangeLog
@@ -1,3 +1,7 @@
+2007-05-10  Rolf Bjarne Kvinge  <RKvinge@novell.com>
+
+       * MaskedTextProviderTest.cs: New test.
+
 2007-02-27  Rolf Bjarne Kvinge  <RKvinge@novell.com>
 
        * MaskedTextProviderTest.cs: Added.

diff --git a/mcs/class/System/Test/System.ComponentModel/MaskedTextProviderTest.cs b/mcs/class/System/Test/System.ComponentModel/MaskedTextProviderTest.cs
index feeb84ebf5d4b9f5980504fb13d2aa3f2094b568..90a1c51422a400ba1c1b9e2aa916a19b769fe92e 100644 (file)
--- a/mcs/class/System/Test/System.ComponentModel/MaskedTextProviderTest.cs
+++ b/mcs/class/System/Test/System.ComponentModel/MaskedTextProviderTest.cs
@@ -37,6 +37,14 @@ namespace MonoTests.System.ComponentModel
                        Thread.CurrentThread.CurrentCulture = current_culture;
                }
                
+               [Test]
+               public void PasswordTest ()
+               {
+
+                       MaskedTextProvider mtp = new MaskedTextProvider ("abcd", CultureInfo.GetCultureInfo ("es-AR"), false, '>', '^', false); 
+                       Assert.AreEqual (" bcd", mtp.ToString (), "#A1");
+                       
+               }
                [Test]
                public void DefaultCultureTest ()
                {