Merge pull request #4453 from lambdageek/bug-49721

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

diff --git a/mcs/class/System.Web/System.Web.UI/ChtmlTextWriter.cs b/mcs/class/System.Web/System.Web.UI/ChtmlTextWriter.cs
index 6bcdf6536a5b52f3add859c9dda0276009977a95..e443504fd112cc73b728faac6c82c34392a12a10 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/ChtmlTextWriter.cs
+++ b/mcs/class/System.Web/System.Web.UI/ChtmlTextWriter.cs
@@ -6,7 +6,7 @@
 //
 
 //
-// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
+// Copyright (C) 2006-2010 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
@@ -28,8 +28,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
-
 using System;
 using System.IO;
 using System.Collections;
@@ -161,24 +159,22 @@ namespace System.Web.UI {
 
                Hashtable attr_render = new Hashtable ();
 
-               [MonoTODO]
                protected override bool OnAttributeRender (string name, string value, HtmlTextWriterAttribute key)
                {
+                       // FIXME:
                        // I checked every possible HtmlTextWriterAttribute key
                        // and always throws ArgumentNullException.
                        return (bool) attr_render [null];
                }
 
-               protected override bool OnStyleAttributeRender (string styleAttrName, string value, HtmlTextWriterStyle key)
+               protected override bool OnStyleAttributeRender (string name, string value, HtmlTextWriterStyle key)
                {
                        return key == HtmlTextWriterStyle.Display;
                }
 
-               protected override bool OnTagRender (string name, HtmlTextWriterTag tag)
+               protected override bool OnTagRender (string name, HtmlTextWriterTag key)
                {
-                       return tag != HtmlTextWriterTag.Span;
+                       return key != HtmlTextWriterTag.Span;
                }
        }
 }
-
-#endif