Author: jpobst
Date: 2007-05-17 11:08:33 -0400 (Thu, 17 May 2007)
New Revision: 77568
Added:
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/TreeViewImageIndexConverterTest.cs
Modified:
trunk/mcs/class/Managed.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeViewImageIndexConverter.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms_test.dll.sources
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog
Log:
2007-05-17 Jonathan Pobst <[EMAIL PROTECTED]>
* TreeViewImageIndexConverter.cs: Add 2.0 methods.
2007-05-17 Jonathan Pobst <[EMAIL PROTECTED]>
* System.Windows.Forms_test.dll.sources: Add
TreeViewImageIndexConverterTest.cs.
2007-05-17 Jonathan Pobst <[EMAIL PROTECTED]>
* TreeViewImageIndexConverterTest.cs: Added.
Modified: trunk/mcs/class/Managed.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/ChangeLog 2007-05-17 14:59:01 UTC
(rev 77567)
+++ trunk/mcs/class/Managed.Windows.Forms/ChangeLog 2007-05-17 15:08:33 UTC
(rev 77568)
@@ -1,3 +1,7 @@
+2007-05-17 Jonathan Pobst <[EMAIL PROTECTED]>
+
+ * System.Windows.Forms_test.dll.sources: Add
TreeViewImageIndexConverterTest.cs.
+
2007-05-16 Jonathan Pobst <[EMAIL PROTECTED]>
* System.Windows.Forms.dll.sources: Add ImageKeyConverter.cs,
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2007-05-17 14:59:01 UTC (rev 77567)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2007-05-17 15:08:33 UTC (rev 77568)
@@ -1,5 +1,9 @@
2007-05-17 Jonathan Pobst <[EMAIL PROTECTED]>
+ * TreeViewImageIndexConverter.cs: Add 2.0 methods.
+
+2007-05-17 Jonathan Pobst <[EMAIL PROTECTED]>
+
* ToolStripTextBox.cs: Wire up new 2.0 Textbox methods/properties.
2007-05-16 Everaldo Canuto <[EMAIL PROTECTED]>
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeViewImageIndexConverter.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeViewImageIndexConverter.cs
2007-05-17 14:59:01 UTC (rev 77567)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeViewImageIndexConverter.cs
2007-05-17 15:08:33 UTC (rev 77568)
@@ -26,6 +26,7 @@
using System;
using System.Drawing;
using System.Collections;
+using System.ComponentModel;
namespace System.Windows.Forms {
@@ -36,10 +37,55 @@
{
}
+ #region Protected Properties
protected override bool IncludeNoneAsStandardValue {
get { return false; }
}
+ #endregion
+
+ #region Public Methods
+#if NET_2_0
+ public override object ConvertFrom
(System.ComponentModel.ITypeDescriptorContext context,
System.Globalization.CultureInfo culture, object value)
+ {
+ string indexStr;
+
+ if (value != null && value is string) {
+ indexStr = (string)value;
+
+ if (indexStr.Equals ("(default)",
StringComparison.InvariantCultureIgnoreCase))
+ return -1;
+ else if (indexStr.Equals ("(none)",
StringComparison.InvariantCultureIgnoreCase))
+ return -2;
+
+ return Int32.Parse (indexStr);
+ } else
+ return base.ConvertFrom (context, culture,
value);
+ }
+
+ public override object ConvertTo
(System.ComponentModel.ITypeDescriptorContext context,
System.Globalization.CultureInfo culture, object value, Type destinationType)
+ {
+ if (destinationType == typeof (string)) {
+ if (value == null)
+ return string.Empty;
+ else if (value is int && (int)value == -1)
+ return "(default)";
+ else if (value is int && (int)value == -2)
+ return "(none)";
+ else if (value is string &&
((string)value).Length == 0)
+ return string.Empty;
+ else
+ return value.ToString ();
+ } else
+ return base.ConvertTo (context, culture, value,
destinationType);
+ }
+
+ public override StandardValuesCollection GetStandardValues
(System.ComponentModel.ITypeDescriptorContext context)
+ {
+ int[] stdVal = new int[] { -1, -2 };
+ return new TypeConverter.StandardValuesCollection
(stdVal);
+ }
+#endif
+ #endregion
}
-
}
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms_test.dll.sources
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms_test.dll.sources
2007-05-17 14:59:01 UTC (rev 77567)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms_test.dll.sources
2007-05-17 15:08:33 UTC (rev 77568)
@@ -138,6 +138,7 @@
System.Windows.Forms/TreeNodeTest.cs
System.Windows.Forms/TreeViewHitTestInfoTest.cs
System.Windows.Forms/TreeViewImageKeyConverterTest.cs
+System.Windows.Forms/TreeViewImageIndexConverterTest.cs
System.Windows.Forms/TreeViewTest.cs
System.Windows.Forms/UpDownTest.cs
System.Windows.Forms/UserControlTest.cs
Modified:
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog
2007-05-17 14:59:01 UTC (rev 77567)
+++ trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog
2007-05-17 15:08:33 UTC (rev 77568)
@@ -1,5 +1,9 @@
2007-05-17 Jonathan Pobst <[EMAIL PROTECTED]>
+ * TreeViewImageIndexConverterTest.cs: Added.
+
+2007-05-17 Jonathan Pobst <[EMAIL PROTECTED]>
+
* ToolStripTextBoxTest.cs: Enable tests for auto complete and shortcuts
enabled stuff.
Added:
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/TreeViewImageIndexConverterTest.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/TreeViewImageIndexConverterTest.cs
2007-05-17 14:59:01 UTC (rev 77567)
+++
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/TreeViewImageIndexConverterTest.cs
2007-05-17 15:08:33 UTC (rev 77568)
@@ -0,0 +1,84 @@
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+// Copyright (c) 2007 Novell, Inc.
+//
+
+#if NET_2_0
+
+using System;
+using System.ComponentModel;
+using System.Globalization;
+using System.Windows.Forms;
+using System.Windows.Forms.Layout;
+using NUnit.Framework;
+
+namespace MonoTests.System.Windows.Forms
+{
+ [TestFixture]
+ public class TreeViewImageIndexConverterTest
+ {
+ [Test]
+ public void PropertyIncludeNoneAsStandardValue ()
+ {
+ PublicImageIndexConverter c = new
PublicImageIndexConverter ();
+ Assert.AreEqual (false,
c.PublicIncludeNoneAsStandardValue, "A1");
+ }
+
+ private class PublicImageIndexConverter :
TreeViewImageIndexConverter
+ {
+ public bool PublicIncludeNoneAsStandardValue { get {
return base.IncludeNoneAsStandardValue; } }
+ }
+
+ [Test]
+ public void GetStandardValues ()
+ {
+ TreeViewImageIndexConverter c = new
TreeViewImageIndexConverter ();
+ Assert.AreEqual (2, c.GetStandardValues (null).Count,
"B1");
+ Assert.AreEqual ("-1", c.GetStandardValues
(null)[0].ToString (), "B2");
+ Assert.AreEqual ("-2", c.GetStandardValues
(null)[1].ToString (), "B3");
+ }
+
+ [Test]
+ public void ConvertFrom ()
+ {
+ TreeViewImageIndexConverter iic = new
TreeViewImageIndexConverter ();
+ Assert.AreEqual (-1, iic.ConvertFrom (null,
CultureInfo.CurrentCulture, "(default)"), "N1");
+ Assert.AreEqual (-1, iic.ConvertFrom (null,
CultureInfo.CurrentCulture, "(DEFAULT)"), "N1-1");
+ Assert.AreEqual (-2, iic.ConvertFrom (null,
CultureInfo.CurrentCulture, "(none)"), "N2");
+ Assert.AreEqual (-2, iic.ConvertFrom (null,
CultureInfo.CurrentCulture, "(nONE)"), "N2-1");
+ Assert.AreEqual (0, iic.ConvertFrom (null,
CultureInfo.CurrentCulture, "0"), "N3");
+ Assert.AreEqual (6, iic.ConvertFrom (null,
CultureInfo.CurrentCulture, "6"), "N4");
+ Assert.AreEqual (-1, iic.ConvertFrom (null,
CultureInfo.CurrentCulture, "-1"), "N5");
+ Assert.AreEqual (-2, iic.ConvertFrom (null,
CultureInfo.CurrentCulture, "-2"), "N6");
+ }
+
+ [Test]
+ public void ConvertTo ()
+ {
+ TreeViewImageIndexConverter iic = new
TreeViewImageIndexConverter ();
+ Assert.AreEqual (string.Empty, iic.ConvertTo (null,
null, string.Empty, typeof (string)), "N1");
+ Assert.AreEqual (string.Empty, iic.ConvertTo (null,
null, null, typeof (string)), "N2");
+ Assert.AreEqual ("6", iic.ConvertTo (null, null, 6,
typeof (string)), "N3");
+ Assert.AreEqual ("(default)", iic.ConvertTo (null,
null, -1, typeof (string)), "N4");
+ Assert.AreEqual ("(none)", iic.ConvertTo (null, null,
-2, typeof (string)), "N5");
+ }
+ }
+}
+#endif
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
