New test.

[mono.git] / mcs / class / System.Data / System.Data.Common / DataColumnMapping.cs

diff --git a/mcs/class/System.Data/System.Data.Common/DataColumnMapping.cs b/mcs/class/System.Data/System.Data.Common/DataColumnMapping.cs
index b1bcc68641b8e2225bead6356928b8d5bb689ce1..974e1fc43a28bc3fcc5760e9e74070b7f6db0a2f 100644 (file)
--- a/mcs/class/System.Data/System.Data.Common/DataColumnMapping.cs
+++ b/mcs/class/System.Data/System.Data.Common/DataColumnMapping.cs
@@ -9,6 +9,29 @@
 // Copyright (C) Tim Coleman, 2002-2003
 //
 
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+// 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.
+//
+
 using System.ComponentModel;
 using System.Data;
 
@@ -41,14 +64,18 @@ namespace System.Data.Common {
 
                #region Properties
 
+#if !NET_2_0
                [DataSysDescription ("DataColumn.ColumnName")]
+#endif
                [DefaultValue ("")]
                public string DataSetColumn {
                        get { return dataSetColumn; }
                        set { dataSetColumn = value; }
                }
 
+#if !NET_2_0
                [DataSysDescription ("Source column name - case sensitive.")]
+#endif
                [DefaultValue ("")]
                public string SourceColumn {
                        get { return sourceColumn; }
@@ -73,6 +100,7 @@ namespace System.Data.Common {
 
 #if NET_2_0
                [MonoTODO]
+               [EditorBrowsable (EditorBrowsableState.Advanced)]
                public static DataColumn GetDataColumnBySchemaAction (string sourceColumn, string dataSetColumn, DataTable dataTable, Type dataType, MissingSchemaAction schemaAction)
                {
                        throw new NotImplementedException ();