merge r98600

[mono.git] / mcs / class / System.Data / System.Data.Odbc / OdbcCategoryAttribute.cs

diff --git a/mcs/class/System.Data/System.Data.Odbc/OdbcCategoryAttribute.cs b/mcs/class/System.Data/System.Data.Odbc/OdbcCategoryAttribute.cs
index fe7f5b815dc6fa2b21622cb04e943ef169ba3431..5c8a84a14c3f302b7e3dbe9e19c7069887580a7d 100644 (file)
--- a/mcs/class/System.Data/System.Data.Odbc/OdbcCategoryAttribute.cs
+++ b/mcs/class/System.Data/System.Data.Odbc/OdbcCategoryAttribute.cs
@@ -7,10 +7,33 @@
 // Copyright (C) Novell Inc, 2004
 //
 
+//
+// 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;
 using System.ComponentModel;
 
-namespace System.Data {
+namespace System.Data.Odbc {
        [AttributeUsage (AttributeTargets.All)]
        internal sealed class OdbcCategoryAttribute : CategoryAttribute
        {
@@ -29,6 +52,14 @@ namespace System.Data {
 
                #endregion // Constructors
 
+               #region Properties
+
+               public new string Category {
+                       get { return category; }
+               }
+
+               #endregion
+
                #region Methods
 
                [MonoTODO]