for TARGET_J2EE only:

[mono.git] / mcs / class / System / System.ComponentModel / DecimalConverter.cs

diff --git a/mcs/class/System/System.ComponentModel/DecimalConverter.cs b/mcs/class/System/System.ComponentModel/DecimalConverter.cs
index e9063a11ea6db5c38af37246044e8e346882dbb2..b2bcd81792cfcd3fd88c2647b629fba108cbc36c 100644 (file)
--- a/mcs/class/System/System.ComponentModel/DecimalConverter.cs
+++ b/mcs/class/System/System.ComponentModel/DecimalConverter.cs
@@ -36,13 +36,17 @@ using System.ComponentModel.Design.Serialization;
 
 namespace System.ComponentModel
 {
-    public class DecimalConverter : BaseNumberConverter
+       public class DecimalConverter : BaseNumberConverter
        {
                public DecimalConverter()
                {
                        InnerType = typeof(Decimal);
                }
 
+               internal override bool SupportHex {
+                       get { return false; }
+               }
+
                public override bool CanConvertTo (ITypeDescriptorContext context,
                        Type destinationType)
                {
@@ -59,8 +63,18 @@ namespace System.ComponentModel
                                ConstructorInfo ctor = typeof(Decimal).GetConstructor (new Type[] {typeof(int[])});
                                return new InstanceDescriptor (ctor, new object[] {Decimal.GetBits (cval)});
                        }
-                       Console.WriteLine (Environment.StackTrace);
+
                        return base.ConvertTo(context, culture, value, destinationType);
                }
+
+               internal override string ConvertToString (object value, NumberFormatInfo format)
+               {
+                       return ((decimal) value).ToString ("G", format);
+               }
+
+               internal override object ConvertFromString (string value, NumberFormatInfo format)
+               {
+                       return decimal.Parse (value, NumberStyles.Float, format);
+               }
        }
 }