Author: borisk
Date: 2005-05-09 04:02:22 -0400 (Mon, 09 May 2005)
New Revision: 44248
Modified:
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data/DataColumnPropertyDescriptor.cs
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data/DataRelationCollection.cs
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data/DataView.cs
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data/IDataReader2.cs
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data/IDataRecord2.cs
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data/XmlConstants.cs
Log:
Restore NET_2_0 defines. Code cleanup.
Modified:
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data/DataColumnPropertyDescriptor.cs
===================================================================
---
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data/DataColumnPropertyDescriptor.cs
2005-05-09 07:38:39 UTC (rev 44247)
+++
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data/DataColumnPropertyDescriptor.cs
2005-05-09 08:02:22 UTC (rev 44248)
@@ -75,30 +75,6 @@
propertyType = type;
}
- // FIXME : current inplementation does not use this
-// private PropertyInfo GetPropertyInfo ()
-// {
-// string defaultMemberName = "";
-// object[] attribs = componentType.GetCustomAttributes
(true);
-//
-// for (int at = 0; at < attribs.Length; at++) {
-// if (attribs[at] is DefaultMemberAttribute) {
-// defaultMemberName =
((DefaultMemberAttribute) attribs[at]).MemberName;
-// break;
-// }
-// }
-//
-// // FIXME: what do I do if a DefaultMemeberAttribute is
not found?
-// // should I try looking for
DefaultPropertyAttribute?
-// if (defaultMemberName.Equals(""))
-// throw new SystemException("Default property not
found.");
-//
-// Type[] parmTypes = new Type[1];
-// parmTypes[0] = propertyType;
-// PropertyInfo propertyInfo = componentType.GetProperty
(defaultMemberName, parmTypes);
-// return propertyInfo;
-// }
-
public override object GetValue (object component)
{
// FIXME: what is the correct way to Get a Value?
Modified:
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data/DataRelationCollection.cs
===================================================================
---
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data/DataRelationCollection.cs
2005-05-09 07:38:39 UTC (rev 44247)
+++
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data/DataRelationCollection.cs
2005-05-09 08:02:22 UTC (rev 44248)
@@ -453,8 +453,7 @@
return IndexOf(relationName, false);
}
- // TODO: promoted from private by Mordechai due to converter
bug.
- protected int IndexOf (string name, bool error)
+ private int IndexOf (string name, bool error)
{
int count = 0, match = -1;
for (int i = 0; i < List.Count; i++)
Modified:
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data/DataView.cs
===================================================================
--- branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data/DataView.cs
2005-05-09 07:38:39 UTC (rev 44247)
+++ branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data/DataView.cs
2005-05-09 08:02:22 UTC (rev 44248)
@@ -82,19 +82,6 @@
{
}
-// // This ctor() is for DataRowView.CreateChildView() support,
-// // which does not expose precise RowFilter, Sort and so on.
-// internal DataView (DataTable table, DataRow [] rows)
-// {
-// dataTable = table;
-// rowState = DataViewRowState.CurrentRows;
-// RegisterEventHandlers ();
-//
-// foreach (DataRow dr in rows)
-// rowViewPool.Add (dr, new DataRowView (this,
dr));
-// isOpen = true;
-// }
-
internal DataView (DataTable table, DataViewManager manager)
{
dataTable = table;
Modified:
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data/IDataReader2.cs
===================================================================
---
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data/IDataReader2.cs
2005-05-09 07:38:39 UTC (rev 44247)
+++
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data/IDataReader2.cs
2005-05-09 08:02:22 UTC (rev 44248)
@@ -30,8 +30,8 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
+#if NET_2_0 || TARGET_JVM
-
namespace System.Data {
public interface IDataReader2
{
@@ -43,4 +43,4 @@
}
}
-
+#endif
Modified:
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data/IDataRecord2.cs
===================================================================
---
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data/IDataRecord2.cs
2005-05-09 07:38:39 UTC (rev 44247)
+++
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data/IDataRecord2.cs
2005-05-09 08:02:22 UTC (rev 44248)
@@ -30,8 +30,8 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
+#if NET_2_0 || TARGET_JVM
-
namespace System.Data {
public interface IDataRecord2
{
@@ -52,4 +52,6 @@
}
}
+#endif
+
Modified:
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data/XmlConstants.cs
===================================================================
---
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data/XmlConstants.cs
2005-05-09 07:38:39 UTC (rev 44247)
+++
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data/XmlConstants.cs
2005-05-09 08:02:22 UTC (rev 44248)
@@ -1,5 +1,5 @@
//
-// System.Data/DataSet.cs
+// System.Data/XmlConstants.cs
//
// Author:
// Stuart Caborn <[EMAIL PROTECTED]>
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
