svn commit: r707596 - in /felix/trunk/webconsole/src/main: java/org/apache/felix/webconsole/internal/misc/EventAdminServlet.java resources/res/ui/events.js

[cz...@apache.org]

Author: cziegeler
Date: Fri Oct 24 03:12:08 2008
New Revision: 707596

URL: http://svn.apache.org/viewvc?rev=707596&view=rev
Log:
FELIX-790 -Add button to clear the list

Modified:
    felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/misc/EventAdminServlet.java
    felix/trunk/webconsole/src/main/resources/res/ui/events.js

Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/misc/EventAdminServlet.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/misc/EventAdminServlet.java?rev=707596&r1=707595&r2=707596&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/misc/EventAdminServlet.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/misc/EventAdminServlet.java Fri Oct 24 03:12:08 2008
@@ -107,6 +107,22 @@
         }
     }
 
+    protected void doPost(HttpServletRequest req, HttpServletResponse resp)
+    throws ServletException, IOException
+    {
+        // for now we only have the clear action
+        if ( getParameter(req, "clear") != null )
+        {
+            synchronized ( this.events )
+            {
+                this.events.clear();
+            }
+        }
+        final String uri = req.getRequestURI();
+        resp.sendRedirect( uri );
+        return;
+    }
+
     protected void renderContent( HttpServletRequest request, HttpServletResponse response )
     throws ServletException, IOException
     {

Modified: felix/trunk/webconsole/src/main/resources/res/ui/events.js
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/resources/res/ui/events.js?rev=707596&r1=707595&r2=707596&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/resources/res/ui/events.js (original)
+++ felix/trunk/webconsole/src/main/resources/res/ui/events.js Fri Oct 24 03:12:08 2008
@@ -83,7 +83,7 @@
     var properties = dataEntry.properties;
 
     parent.appendChild( td( "content", null, [ text( new Date(dataEntry.received) ) ] ) );
-    parent.appendChild( td( "content", { "width": "20%", [ text( topic ) ] ) );
+    parent.appendChild( td( "content", { "width": "20%"}, [ text( topic ) ] ) );
 
     var tableE = createElement("table");
     var bodyE = createElement("tbody");
@@ -97,6 +97,18 @@
     parent.appendChild( td( "content", null, [tableE] ) );
 }
 
+function installForm( )
+{
+    document.write( "<tr class='content'>" );
+    document.write( "<td class='content'>&nbsp;</td>" );
+    document.write( "<td class='content'>&nbsp;</td>" );
+    document.write( "<td class='content' align='right' noWrap>" );
+    document.write( "<form method='post' enctype='multipart/form-data'>" );
+    document.write( "<input class='submit' style='width:auto' type='submit' name='clear' value='Clear List'>" );
+    document.write( "</form>" );
+    document.write( "</td>" );
+    document.write( "</tr>" );
+}
 
 
 function renderEvents( /* Array of Data Objects */ bundleData )
@@ -107,6 +119,8 @@
     
     header( columns );
 
+    installForm();
+    
     if (bundleData.error)
     {
         error( columns, bundleData.error );
@@ -116,5 +130,7 @@
         data ( bundleData.data );
     }
 
+    installForm();
+
     footer( columns );
 }