merge -r 53370:58178

[mono.git] / mcs / class / Managed.Windows.Forms / System.Windows.Forms / CurrencyManager.cs

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/CurrencyManager.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/CurrencyManager.cs
index 6270bb76e6641019d022d4d309d05c3f4a24d7b1..23a214175fd57e569c280a09ed0d1f9dc2ef3995 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/CurrencyManager.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/CurrencyManager.cs
@@ -39,12 +39,12 @@ namespace System.Windows.Forms {
                private IList list;
                private bool binding_suspended;
 
-               internal CurrencyManager (object data_source, string data_member)
-               {
-                       if (data_source is IList) {
-                               list = (IList) data_source;
-                       } else if (data_source is IListSource) {
+               internal CurrencyManager (object data_source)
+               {                       
+                       if (data_source is IListSource) {
                                list = ((IListSource) data_source).GetList ();
+                       } else if (data_source is IList) {
+                               list = (IList) data_source;
                        } else {
                                throw new Exception ("Attempted to create currency manager " +
                                        "from invalid type: " + data_source.GetType ());
@@ -64,20 +64,7 @@ namespace System.Windows.Forms {
                        if (table == null && data_source is DataView)
                                table = ((DataView) data_source).Table;
 
-                       
-                       if (table == null) {
-                               DataSet dataset = data_source as DataSet;
-                               int sp = data_member.IndexOf ('.');
-                               if (sp != -1) {
-                                       data_member = data_member.Substring (0, sp);
-                               }
-                               if (dataset != null) {
-                                       table = dataset.Tables [data_member];
-                               }
-                       }
-
                        if (table != null) {
-                               list = new DataView (table);
                                table.Columns.CollectionChanged  += new CollectionChangeEventHandler (MetaDataChangedHandler);
                                table.ChildRelations.CollectionChanged  += new CollectionChangeEventHandler (MetaDataChangedHandler);
                                table.ParentRelations.CollectionChanged  += new CollectionChangeEventHandler (MetaDataChangedHandler);