merge r95486-95487

svn path=/trunk/mcs/; revision=95488

diff --git a/mcs/class/System.Web/System.Web.UI/Control.jvm.cs b/mcs/class/System.Web/System.Web.UI/Control.jvm.cs
index 7841308cce1c06383af3574468b7eb6b3b4dcda9..b5801799ae6df2d1aba66bbb73f5ebcfbde5a3d3 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/Control.jvm.cs
+++ b/mcs/class/System.Web/System.Web.UI/Control.jvm.cs
@@ -41,6 +41,8 @@ namespace System.Web.UI
        public partial class Control : UIComponent, StateHolder\r
        {\r
                ComponentChildrenList _childrenList;\r
+               HashMap _attributes;\r
+               HashMap _facets;\r
 \r
                protected override void addFacesListener (FacesListener __p1) {\r
                        throw new Exception ("The method or operation is not implemented.");\r
@@ -71,7 +73,7 @@ namespace System.Web.UI
                }\r
 \r
                public override Map getAttributes () {\r
-                       throw new Exception ("The method or operation is not implemented.");\r
+                       return _attributes ?? (_attributes = new HashMap ());\r
                }\r
 \r
                public override int getChildCount () {\r
@@ -104,7 +106,7 @@ namespace System.Web.UI
                }\r
 \r
                public override Map getFacets () {\r
-                       throw new Exception ("The method or operation is not implemented.");\r
+                       return _facets ?? (_facets = new HashMap ());\r
                }\r
 \r
                public override Iterator getFacetsAndChildren () {\r
@@ -117,7 +119,7 @@ namespace System.Web.UI
                }\r
 \r
                public override string getId () {\r
-                       throw new Exception ("The method or operation is not implemented.");\r
+                       return ID;\r
                }\r
 \r
                public override UIComponent getParent () {\r