2004-05-12 Gonzalo Paniagua Javier <gonzalo@ximian.com>

	* System.Web.dll.sources: added Html32TextWriter.

	* System.Web.Compilation/AspGenerator.cs: ObjectTagBuilder do not
	override HasBody now.

	* System.Web.UI/Html32TextWriter.cs: stub contributed by Matthijs ter
	Woord [meddochat].

	* System.Web.UI/ObjectTagBuilder.cs: remove the HasBody override as MS
	does not have that.

	This makes System.Web free of errors, missing or extra stuff in the
	class status pages.

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

diff --git a/mcs/class/System.Web/ChangeLog b/mcs/class/System.Web/ChangeLog
index d7fb1a41d969bc06598ef24493e562628218edc0..030d3891ae30e49bd277e03cd2159e4c8f3b54f9 100644 (file)
--- a/mcs/class/System.Web/ChangeLog
+++ b/mcs/class/System.Web/ChangeLog
@@ -1,3 +1,7 @@
+2004-05-12  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+       * System.Web.dll.sources: added Html32TextWriter.
+
 2004-04-22  Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
        * System.Web.dll.sources: removed unused/obsolete files from

diff --git a/mcs/class/System.Web/System.Web.Compilation/AspGenerator.cs b/mcs/class/System.Web/System.Web.Compilation/AspGenerator.cs
index bf9d208476fd8ccb27bf956d89bab8bcd67fabf3..587730aaa89d88a4202144d34fa01a2acfbca3e4 100644 (file)
--- a/mcs/class/System.Web/System.Web.Compilation/AspGenerator.cs
+++ b/mcs/class/System.Web/System.Web.Compilation/AspGenerator.cs
@@ -388,7 +388,7 @@ namespace System.Web.Compilation
 
                        builder.location = location;
                        builder.ID = htable ["id"] as string;
-                       if (builder.HasBody ()) {
+                       if (builder.HasBody () && !(builder is ObjectTagBuilder)) {
                                if (builder is TemplateBuilder) {
                                //      push the id list
                                }

diff --git a/mcs/class/System.Web/System.Web.Compilation/ChangeLog b/mcs/class/System.Web/System.Web.Compilation/ChangeLog
index f7ced86ba1d720a98e278505789a0b85ae271e8f..7294493220268a690f5be4101659a6ad139ed77c 100644 (file)
--- a/mcs/class/System.Web/System.Web.Compilation/ChangeLog
+++ b/mcs/class/System.Web/System.Web.Compilation/ChangeLog
@@ -1,3 +1,7 @@
+2004-05-12  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+       * AspGenerator.cs: ObjectTagBuilder do not override HasBody now.
+
 2004-05-06  Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
        * AspParser.cs: indent a few lines.

diff --git a/mcs/class/System.Web/System.Web.UI/ChangeLog b/mcs/class/System.Web/System.Web.UI/ChangeLog
index bfa20efa3d97ce9f053d2e2a4868a771d8e56056..754d84856e62d21d5624ff519e274d26d0f55f61 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/ChangeLog
+++ b/mcs/class/System.Web/System.Web.UI/ChangeLog
@@ -1,3 +1,11 @@
+2004-05-12  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+       * Html32TextWriter.cs: stub contributed by Matthijs ter Woord
+       [meddochat].
+
+       * ObjectTagBuilder.cs: remove the HasBody override as MS does not have
+       that.
+
 2004-05-04  Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
        * SimpleWebHandlerParser.cs:

diff --git a/mcs/class/System.Web/System.Web.UI/Html32TextWriter.cs b/mcs/class/System.Web/System.Web.UI/Html32TextWriter.cs
new file mode 100644 (file)
index 0000000..829b734
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/Html32TextWriter.cs
@@ -0,0 +1,279 @@
+//
+// System.Web.UI.Html32TextWriter.cs: Provides a HtmlTextWriter which writes HTML 3.2
+//
+// Authors:
+//     Matthijs ter Woord  [meddochat]  (meddochat@zonnet.nl)
+//     Gonzalo Paniagua Javier (gonzalo@ximian.com)
+//
+// Copyright (C) Matthijs ter Woord, 2004
+// (C) 2004 Novell, Inc (http://www.novell.com)
+//
+
+using System.Globalization;
+using System.IO;
+
+namespace System.Web.UI
+{
+       [MonoTODO ("Needs work and verification.")]
+       public class Html32TextWriter : HtmlTextWriter
+       {
+               public Html32TextWriter (TextWriter writer) : base (writer)
+               {
+               }
+
+               public Html32TextWriter (TextWriter writer, string tabString) : base (writer, tabString)
+               {
+               }
+
+
+               public override void RenderBeginTag (HtmlTextWriterTag tagKey)
+               {
+                        base.RenderBeginTag (tagKey);
+               }
+
+               public override void RenderEndTag ()
+               {
+                        base.RenderEndTag ();
+               }
+
+               protected override string GetTagName (HtmlTextWriterTag tagKey)
+               {
+                       if (tagKey == HtmlTextWriterTag.Unknown ||
+                           !Enum.IsDefined (typeof (HtmlTextWriterTag), tagKey))
+                               return "";
+
+                       return tagKey.ToString ().ToLower (CultureInfo.InvariantCulture);
+                       /* The code below is here just in case we need to split things up
+                       switch (tagkey) {
+                       case HtmlTextWriterTag.Unknown:
+                               return "";
+                       case HtmlTextWriterTag.A:
+                               return "a";
+                       case HtmlTextWriterTag.Acronym:
+                               return "acronym";
+                       case HtmlTextWriterTag.Address:
+                               return "address";
+                       case HtmlTextWriterTag.Area:
+                               return "area";
+                       case HtmlTextWriterTag.B:
+                               return "b";
+                       case HtmlTextWriterTag.Base:
+                               return "base";
+                       case HtmlTextWriterTag.Basefont:
+                               return "basefont";
+                       case HtmlTextWriterTag.Bdo:
+                               return "bdo";
+                       case HtmlTextWriterTag.Bgsound:
+                               return "bgsound";
+                       case HtmlTextWriterTag.Big:
+                               return "big";
+                       case HtmlTextWriterTag.Blockquote:
+                               return "blockquote";
+                       case HtmlTextWriterTag.Body:
+                               return "body";
+                       case HtmlTextWriterTag.Br:
+                               return "br";
+                       case HtmlTextWriterTag.Button:
+                               return "button";
+                       case HtmlTextWriterTag.Caption:
+                               return "caption";
+                       case HtmlTextWriterTag.Center:
+                               return "center";
+                       case HtmlTextWriterTag.Cite:
+                               return "cite";
+                       case HtmlTextWriterTag.Code:
+                               return "code";
+                       case HtmlTextWriterTag.Col:
+                               return "col";
+                       case HtmlTextWriterTag.Colgroup:
+                               return "colgroup";
+                       case HtmlTextWriterTag.Dd:
+                               return "dd";
+                       case HtmlTextWriterTag.Del:
+                               return "del";
+                       case HtmlTextWriterTag.Dfn:
+                               return "dfn";
+                       case HtmlTextWriterTag.Dir:
+                               return "dir";
+                       case HtmlTextWriterTag.Div:
+                               return "table";
+                       case HtmlTextWriterTag.Dl:
+                               return "dl";
+                       case HtmlTextWriterTag.Dt:
+                               return "dt";
+                       case HtmlTextWriterTag.Em:
+                               return "em";
+                       case HtmlTextWriterTag.Embed:
+                               return "embed";
+                       case HtmlTextWriterTag.Fieldset:
+                               return "fieldset";
+                       case HtmlTextWriterTag.Font:
+                               return "font";
+                       case HtmlTextWriterTag.Form:
+                               return "form";
+                       case HtmlTextWriterTag.Frame:
+                               return "frame";
+                       case HtmlTextWriterTag.Frameset:
+                               return "frameset";
+                       case HtmlTextWriterTag.H1:
+                               return "h1";
+                       case HtmlTextWriterTag.H2:
+                               return "h2";
+                       case HtmlTextWriterTag.H3:
+                               return "h3";
+                       case HtmlTextWriterTag.H4:
+                               return "h4";
+                       case HtmlTextWriterTag.H5:
+                               return "h5";
+                       case HtmlTextWriterTag.H6:
+                               return "h6";
+                       case HtmlTextWriterTag.Head:
+                               return "head";
+                       case HtmlTextWriterTag.Hr:
+                               return "hr";
+                       case HtmlTextWriterTag.Html:
+                               return "html";
+                       case HtmlTextWriterTag.I:
+                               return "i";
+                       case HtmlTextWriterTag.Iframe:
+                               return "iframe";
+                       case HtmlTextWriterTag.Img:
+                               return "img";
+                       case HtmlTextWriterTag.Input:
+                               return "input";
+                       case HtmlTextWriterTag.Ins:
+                               return "ins";
+                       case HtmlTextWriterTag.Isindex:
+                               return "isindex";
+                       case HtmlTextWriterTag.Kbd:
+                               return "kbd";
+                       case HtmlTextWriterTag.Label:
+                               return "label";
+                       case HtmlTextWriterTag.Legend:
+                               return "legend";
+                       case HtmlTextWriterTag.Li:
+                               return "li";
+                       case HtmlTextWriterTag.Link:
+                               return "link";
+                       case HtmlTextWriterTag.Map:
+                               return "map";
+                       case HtmlTextWriterTag.Marquee:
+                               return "marquee";
+                       case HtmlTextWriterTag.Menu:
+                               return "menu";
+                       case HtmlTextWriterTag.Meta:
+                               return "meta";
+                       case HtmlTextWriterTag.Nobr:
+                               return "nobr";
+                       case HtmlTextWriterTag.Noframes:
+                               return "noframes";
+                       case HtmlTextWriterTag.Noscript:
+                               return "noscript";
+                       case HtmlTextWriterTag.Object:
+                               return "object";
+                       case HtmlTextWriterTag.Ol:
+                               return "ol";
+                       case HtmlTextWriterTag.Option:
+                               return "option";
+                       case HtmlTextWriterTag.P:
+                               return "p";
+                       case HtmlTextWriterTag.Param:
+                               return "param";
+                       case HtmlTextWriterTag.Pre:
+                               return "pre";
+                       case HtmlTextWriterTag.Q:
+                               return "q";
+                       case HtmlTextWriterTag.Rt:
+                               return "rt";
+                       case HtmlTextWriterTag.Ruby:
+                               return "ruby";
+                       case HtmlTextWriterTag.S:
+                               return "s";
+                       case HtmlTextWriterTag.Samp:
+                               return "samp";
+                       case HtmlTextWriterTag.Script:
+                               return "script";
+                       case HtmlTextWriterTag.Select:
+                               return "select";
+                       case HtmlTextWriterTag.Small:
+                               return "small";
+                       case HtmlTextWriterTag.Span:
+                               return "span";
+                       case HtmlTextWriterTag.Strike:
+                               return "strike";
+                       case HtmlTextWriterTag.Strong:
+                               return "strong";
+                       case HtmlTextWriterTag.Style:
+                               return "style";
+                       case HtmlTextWriterTag.Sub:
+                               return "sub";
+                       case HtmlTextWriterTag.Sup:
+                               return "sup";
+                       case HtmlTextWriterTag.Table:
+                               return "table";
+                       case HtmlTextWriterTag.Tbody:
+                               return "tbody";
+                       case HtmlTextWriterTag.Td:
+                               return "td";
+                       case HtmlTextWriterTag.Textarea:
+                               return "textarea";
+                       case HtmlTextWriterTag.Tfoot:
+                               return "tfoot";
+                       case HtmlTextWriterTag.Th:
+                               return "th";
+                       case HtmlTextWriterTag.Thead:
+                               return "thead";
+                       case HtmlTextWriterTag.Title:
+                               return "title";
+                       case HtmlTextWriterTag.Tr:
+                               return "tr";
+                       case HtmlTextWriterTag.Tt:
+                               return "tt";
+                       case HtmlTextWriterTag.U:
+                               return "u";
+                       case HtmlTextWriterTag.Ul:
+                               return "ul";
+                       case HtmlTextWriterTag.Var:
+                               return "var";
+                       case HtmlTextWriterTag.Wbr:
+                               return "wbr";
+                       case HtmlTextWriterTag.Xml:
+                               return "xml";
+                       default:
+                               return "";
+                       }
+                       */
+               }
+
+               protected override bool OnStyleAttributeRender (string name, string value, HtmlTextWriterStyle key)
+               {
+                        return base.OnStyleAttributeRender (name, value, key);
+               }
+
+               protected override bool OnTagRender (string name, HtmlTextWriterTag key)
+               {
+                        return base.OnTagRender (name, key);
+               }
+
+               protected override string RenderAfterContent ()
+               {
+                        return base.RenderAfterContent ();
+               }
+
+               protected override string RenderAfterTag ()
+               {
+                        return base.RenderAfterTag ();
+               }
+
+               protected override string RenderBeforeContent ()
+               {
+                        return base.RenderBeforeContent ();
+               }
+
+               protected override string RenderBeforeTag ()
+               {
+                        return base.RenderBeforeTag ();
+               }
+       }
+}
+

diff --git a/mcs/class/System.Web/System.Web.UI/ObjectTagBuilder.cs b/mcs/class/System.Web/System.Web.UI/ObjectTagBuilder.cs
index 97e182fb64bc5f595160eea3f13b2fef78fd9c23..5185150e5fffa4e60c8e43575851da22305a8553 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/ObjectTagBuilder.cs
+++ b/mcs/class/System.Web/System.Web.UI/ObjectTagBuilder.cs
@@ -68,11 +68,6 @@ namespace System.Web.UI
                                throw new ParseException (parser.Location, "Unknown attribute");
                }
 
-               public override bool HasBody ()
-               {
-                       return false;
-               }
-
                internal Type Type {
                        get { return type; }
                }

diff --git a/mcs/class/System.Web/System.Web.dll.sources b/mcs/class/System.Web/System.Web.dll.sources
index 3f13a1f09b26ce742c14d6623f7a90c149b342af..c15744d40a2d1220f854e474825e0ab1f606e5cd 100755 (executable)
--- a/mcs/class/System.Web/System.Web.dll.sources
+++ b/mcs/class/System.Web/System.Web.dll.sources
@@ -220,6 +220,7 @@ System.Web.UI/HtmlTextWriter.cs
 System.Web.UI/HtmlTextWriterAttribute.cs
 System.Web.UI/HtmlTextWriterStyle.cs
 System.Web.UI/HtmlTextWriterTag.cs
+System.Web.UI/Html32TextWriter.cs
 System.Web.UI/IAttributeAccessor.cs
 System.Web.UI/IDataBindingsAccessor.cs
 System.Web.UI/IgnoreUnknownContentAttribute.cs