Author: nicolas
Date: Mon Apr 21 00:41:40 2008
New Revision: 650041
URL: http://svn.apache.org/viewvc?rev=650041&view=rev
Log:
fix rendering options
Modified:
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/Role.java
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/web/MonitoringServlet.java
Modified:
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/Role.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/Role.java?rev=650041&r1=650040&r2=650041&view=diff
==============================================================================
---
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/Role.java
(original)
+++
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/Role.java
Mon Apr 21 00:41:40 2008
@@ -116,4 +116,10 @@
return name.compareTo( o.name );
}
+ @Override
+ public String toString()
+ {
+ return name;
+ }
+
}
Modified:
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/web/MonitoringServlet.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/web/MonitoringServlet.java?rev=650041&r1=650040&r2=650041&view=diff
==============================================================================
---
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/web/MonitoringServlet.java
(original)
+++
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/web/MonitoringServlet.java
Mon Apr 21 00:41:40 2008
@@ -34,6 +34,7 @@
import org.apache.commons.monitoring.Monitor;
import org.apache.commons.monitoring.Repository;
+import org.apache.commons.monitoring.Role;
import org.apache.commons.monitoring.StatValue;
import org.apache.commons.monitoring.Unit;
import org.apache.commons.monitoring.Monitor.Key;
@@ -189,13 +190,23 @@
{
this.request = request;
String[] values = request.getParameterValues( "role" );
- roles = values != null ? Arrays.asList( values ) :
Collections.<String> emptyList();
+ if (values != null)
+ {
+ roles = Arrays.asList( values );
+ }
values = request.getParameterValues( "category" );
categories = values != null ? Arrays.asList( values ) :
Collections.<String> emptyList();
values = request.getParameterValues( "subsystem" );
subsystems = values != null ? Arrays.asList( values ) :
Collections.<String> emptyList();
}
+ @Override
+ public boolean renderRole( Role role )
+ {
+ return roles != null ? roles.contains( role.getName() ) : true;
+ }
+
+ @Override
public boolean render( Monitor monitor )
{
Key key = monitor.getKey();
@@ -203,9 +214,10 @@
&& ( subsystems.isEmpty() || subsystems.contains(
key.getSubsystem() ) );
}
- public boolean render( String role, String attribute )
+ @Override
+ public boolean render( Role role, String attribute )
{
- String columns = request.getParameter( role + ".columns" );
+ String columns = request.getParameter( role.getName() + ".columns"
);
if ( columns == null )
{
return true;
@@ -213,9 +225,10 @@
return columns.indexOf( attribute ) >= 0;
}
+ @Override
public Unit unitFor( StatValue value )
{
- String unitName = request.getParameter( value.getRole() + ".unit"
);
+ String unitName = request.getParameter( value.getRole().getName()
+ ".unit" );
if ( unitName != null )
{
if ( value.getUnit() != null )
