merged Sys.Web.Services 2.0 support in my branch:

[mono.git] / mcs / class / System.Web / System.Web.UI / DataBoundLiteralControl.cs

diff --git a/mcs/class/System.Web/System.Web.UI/DataBoundLiteralControl.cs b/mcs/class/System.Web/System.Web.UI/DataBoundLiteralControl.cs
index 10aa8be81a53797c015899a20ff9e84235ea7d38..99a66a62200568cc52c70da4b0ac82d5a7776689 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/DataBoundLiteralControl.cs
+++ b/mcs/class/System.Web/System.Web.UI/DataBoundLiteralControl.cs
@@ -1,13 +1,12 @@
 //
-// System.Web.UI.DataBoundLiteralCOntrol.cs
+// System.Web.UI.DataBoundLiteralControl.cs
 //
 // Authors:
 //     Duncan Mak  (duncan@ximian.com)
 //     Gonzalo Paniagua Javier (gonzalo@ximian.com)
 //
 // (C) 2002 Ximian, Inc. (http://www.ximian.com)
-//
-
+// Copyright (C) 2005 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
@@ -29,12 +28,15 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System;
 using System.ComponentModel;
+using System.Security.Permissions;
 using System.Text;
 
 namespace System.Web.UI {
 
+       // CAS - no InheritanceDemand here as the class is sealed
+       [AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
+       // attributes
        [ToolboxItem(false)]
        public sealed class DataBoundLiteralControl : Control
 #if NET_2_0
@@ -49,7 +51,7 @@ namespace System.Web.UI {
                {
                        staticLiterals = new string [staticLiteralsCount];
                        dataBoundLiterals = new string [dataBoundLiteralCount];
-                       PreventAutoID ();
+                       AutoID = false;
                }
 
                public string Text {
@@ -111,13 +113,12 @@ namespace System.Web.UI {
                }
 
 #if NET_2_0
-               string ITextControl.Text 
-               {
+               string ITextControl.Text {
                        get {
-                               throw new NotImplementedException ();
+                               return Text;
                        }
                        set {
-                               throw new NotImplementedException ();
+                               throw new NotSupportedException ();
                        }
                }
 #endif