New test.

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

diff --git a/mcs/class/System/System.ComponentModel/Component.cs b/mcs/class/System/System.ComponentModel/Component.cs
index e0651ee64cba94fa86cce8f0294ce77ad0fe9e69..fe90205480ecb4b9d1c95909a8de3d2769262978 100644 (file)
--- a/mcs/class/System/System.ComponentModel/Component.cs
+++ b/mcs/class/System/System.ComponentModel/Component.cs
@@ -9,18 +9,32 @@
 // (C) 2003 Andreas Nahr
 //
 
+//
+// 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.ComponentModel {
 
-       // <summary>
-       //   Component class.
-       // </summary>
-       //
-       // <remarks>
-       //   Longer description
-       // </remarks>
        [DesignerCategory ("Component")]
        public class Component : MarshalByRefObject, IComponent, IDisposable
        {
@@ -29,17 +43,11 @@ namespace System.ComponentModel {
                private ISite mySite;
                private object disposedEvent = new object ();
 
-               // <summary>
-               //   Component Constructor
-               // </summary>
                public Component ()
                {
                        event_handlers = null;
                }
 
-               // <summary>
-               //   Get IContainer of this Component
-               // </summary>
                [Browsable (false), DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
                public IContainer Container {
                        get {
@@ -84,14 +92,18 @@ namespace System.ComponentModel {
                        Dispose (false);
                }
 
-               // <summary>
-               //   Dispose resources used by this component
-               // </summary>
+#if TARGET_JVM
+               public virtual void Dispose ()
+               {
+                       Dispose (true);
+               }
+#else
                public void Dispose ()
                {
                        Dispose (true);
                        GC.SuppressFinalize (this);
                }
+#endif
 
                // <summary>
                //   Controls disposal of resources used by this.
@@ -114,14 +126,12 @@ namespace System.ComponentModel {
                        mySite = null;
                }
 
-               // <summary>
-               //   Implements the IServiceProvider interface
-               // </summary>
-               [MonoTODO]
                protected virtual object GetService (Type service)
                {
-                       // FIXME: Not sure what this should do.
-                       return null;
+                       if (mySite != null) {
+                               return mySite.GetService(service); 
+                       }
+                       return null; 
                }
 
                public override string ToString ()
@@ -131,9 +141,6 @@ namespace System.ComponentModel {
                        return String.Format ("{0} [{1}]", mySite.Name, GetType ().ToString ());
                }
 
-               // <summary>
-               //   This event is called when the component is explicitly disposed.
-               // </summary>
                [Browsable (false), EditorBrowsable (EditorBrowsableState.Advanced)]
                public event EventHandler Disposed {
                        add { Events.AddHandler (disposedEvent, value); }