Merge pull request #2542 from akoeplinger/remove-changelog

[mono.git] / mcs / class / System.Web / System.Web.Handlers / TraceHandler.cs

diff --git a/mcs/class/System.Web/System.Web.Handlers/TraceHandler.cs b/mcs/class/System.Web/System.Web.Handlers/TraceHandler.cs
index 7845d42604e5c9c1e66a1c8db26f4bf6294e0e6b..6b5ee22baed383d560ec48ec6bd66ab90a9e185b 100644 (file)
--- a/mcs/class/System.Web/System.Web.Handlers/TraceHandler.cs
+++ b/mcs/class/System.Web/System.Web.Handlers/TraceHandler.cs
@@ -39,9 +39,7 @@ using System.Web.UI.WebControls;
 
 namespace System.Web.Handlers
 {
-#if NET_2_0
        [Serializable]
-#endif
        class TraceNotAvailableException : HttpException
        {
                bool notLocal;
@@ -74,11 +72,12 @@ namespace System.Web.Handlers
                        // but doesn't specify which one it is (tests shows it's UnmanagedCode)
                }
 
-#if NET_2_0
-               public void ProcessRequest (HttpContext context)
-#else
                void IHttpHandler.ProcessRequest (HttpContext context)
-#endif
+               {
+                       ProcessRequest (context);
+               }
+
+               protected void ProcessRequest (HttpContext context)
                {
                        TraceManager manager = HttpRuntime.TraceManager;
 
@@ -87,8 +86,10 @@ namespace System.Web.Handlers
                                
                        HtmlTextWriter output = new HtmlTextWriter (context.Response.Output);
 
-                       if (context.Request.QueryString ["clear"] != null)
+                       if (context.Request.QueryString ["clear"] != null) {
                                manager.Clear ();
+                               context.Response.Redirect (context.Request.FilePath);
+                       }
                        
                        string id_str = context.Request.QueryString ["id"];
                        int id = -1;
@@ -104,17 +105,17 @@ namespace System.Web.Handlers
                                
                }
 
-#if NET_2_0
-               public bool IsReusable {
-#else
                bool IHttpHandler.IsReusable {
-#endif
+                       get { return IsReusable; }
+               }
+
+               protected bool IsReusable {
                        get {
                                return false;
                        }
                }
 
-               private void RenderMenu (TraceManager manager, HtmlTextWriter output, string dir)
+               void RenderMenu (TraceManager manager, HtmlTextWriter output, string dir)
                {
                        
                        output.RenderBeginTag (HtmlTextWriterTag.Html);
@@ -153,7 +154,7 @@ namespace System.Web.Handlers
                        output.RenderEndTag ();
                }
 
-               private void RenderHeader (HtmlTextWriter output, string dir)
+               void RenderHeader (HtmlTextWriter output, string dir)
                {
                        Table table = TraceData.CreateTable ();
                        TableRow row1 = new TableRow ();
@@ -184,30 +185,23 @@ namespace System.Web.Handlers
                        table.RenderControl (output);
                }
                
-               private void RenderItem (TraceManager manager, HtmlTextWriter output, int item)
+               void RenderItem (TraceManager manager, HtmlTextWriter output, int item)
                {
                        manager.TraceData [item - 1].Render (output);
                }
 
-               [MonoTODO ("Appears in class status, but...")]
+               [MonoLimitation ("Not implemented, does nothing")]
                protected void ShowDetails (DataSet data)
                {
                }
-#if NET_2_0
-               [MonoTODO ("Appears in class status, but...")]
+               [MonoLimitation ("Not implemented, does nothing")]
                protected void ShowRequests (IList data)
                {
                }
 
-               [MonoTODO]
+               [MonoLimitation ("Not implemented, does nothing")]
                protected void ShowVersionDetails ()
                {
                }
-#else
-               [MonoTODO ("Appears in class status, but...")]
-               protected void ShowRequests (ArrayList list)
-               {
-               }
-#endif
        }
 }