Author: rolf
Date: 2007-05-10 14:58:06 -0400 (Thu, 10 May 2007)
New Revision: 77150

Modified:
   trunk/mcs/class/System/System.ComponentModel/ChangeLog
   trunk/mcs/class/System/System.ComponentModel/MaskedTextProvider.cs
   trunk/mcs/class/System/Test/System.ComponentModel/ChangeLog
   trunk/mcs/class/System/Test/System.ComponentModel/MaskedTextProviderTest.cs
Log:
In Test/System.ComponentModel:
2007-05-10  Rolf Bjarne Kvinge  <[EMAIL PROTECTED]>

        * MaskedTextProviderTest.cs: New test.

In System.ComponentModel:
2007-05-10  Rolf Bjarne Kvinge  <[EMAIL PROTECTED]>

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



Modified: trunk/mcs/class/System/System.ComponentModel/ChangeLog
===================================================================
--- trunk/mcs/class/System/System.ComponentModel/ChangeLog      2007-05-10 
18:32:22 UTC (rev 77149)
+++ trunk/mcs/class/System/System.ComponentModel/ChangeLog      2007-05-10 
18:58:06 UTC (rev 77150)
@@ -1,3 +1,7 @@
+2007-05-10  Rolf Bjarne Kvinge  <[EMAIL PROTECTED]>
+
+       * MaskedTextProvider.cs: Small fix for ToString for passwords.
+
 2007-05-09 Igor Zelmanovich <[EMAIL PROTECTED]>
 
        * Win32Exception.cs:

Modified: trunk/mcs/class/System/System.ComponentModel/MaskedTextProvider.cs
===================================================================
--- trunk/mcs/class/System/System.ComponentModel/MaskedTextProvider.cs  
2007-05-10 18:32:22 UTC (rev 77149)
+++ trunk/mcs/class/System/System.ComponentModel/MaskedTextProvider.cs  
2007-05-10 18:58:06 UTC (rev 77150)
@@ -1735,7 +1735,15 @@
                                } 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);
                                                }

Modified: trunk/mcs/class/System/Test/System.ComponentModel/ChangeLog
===================================================================
--- trunk/mcs/class/System/Test/System.ComponentModel/ChangeLog 2007-05-10 
18:32:22 UTC (rev 77149)
+++ trunk/mcs/class/System/Test/System.ComponentModel/ChangeLog 2007-05-10 
18:58:06 UTC (rev 77150)
@@ -1,3 +1,7 @@
+2007-05-10  Rolf Bjarne Kvinge  <[EMAIL PROTECTED]>
+
+       * MaskedTextProviderTest.cs: New test.
+
 2007-02-27  Rolf Bjarne Kvinge  <[EMAIL PROTECTED]>
 
        * MaskedTextProviderTest.cs: Added.

Modified: 
trunk/mcs/class/System/Test/System.ComponentModel/MaskedTextProviderTest.cs
===================================================================
--- trunk/mcs/class/System/Test/System.ComponentModel/MaskedTextProviderTest.cs 
2007-05-10 18:32:22 UTC (rev 77149)
+++ trunk/mcs/class/System/Test/System.ComponentModel/MaskedTextProviderTest.cs 
2007-05-10 18:58:06 UTC (rev 77150)
@@ -38,6 +38,14 @@
                }
                
                [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 ()
                {
                        CultureInfo currentUI = 
Thread.CurrentThread.CurrentUICulture;

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to