svn commit: r1509669 - /commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/plugin/jmx/JMXHandler.java

[rmannibucau]

Author: rmannibucau
Date: Fri Aug  2 12:46:36 2013
New Revision: 1509669

URL: http://svn.apache.org/r1509669
Log:
better TabularData support

Modified:
    
commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/plugin/jmx/JMXHandler.java

Modified: 
commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/plugin/jmx/JMXHandler.java
URL: 
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/plugin/jmx/JMXHandler.java?rev=1509669&r1=1509668&r2=1509669&view=diff
==============================================================================
--- 
commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/plugin/jmx/JMXHandler.java
 (original)
+++ 
commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/plugin/jmx/JMXHandler.java
 Fri Aug  2 12:46:36 2013
@@ -330,19 +330,15 @@ public class JMXHandler extends HandlerR
 
             if (TabularData.class.isInstance(value)) {
                 final TabularData td = TabularData.class.cast(value);
-                final List<String> keys = td.getTabularType().getIndexNames();
-                final int number = keys.size();
-
                 final StringBuilder builder = new 
StringBuilder().append("<table class=\"table table-condensed\">");
                 for (final Object type : td.keySet()) {
                     final List<?> values = (List<?>) type;
-                    for (int i = 0; i < number; i++) {
-                        builder.append("<tr>")
-                            
.append("<td>").append(value(keys.get(i))).append("</td>")
-                            
.append("<td>").append(value(values.get(i))).append("</td>")
-                            .append("</tr>");
+                    final CompositeData data = td.get(values.toArray(new 
Object[values.size()]));
+                    builder.append("<tr>");
+                    for (final String k : data.getCompositeType().keySet()) {
+                        
builder.append("<td>").append(value(data.get(k))).append("</td>");
                     }
-
+                    builder.append("</tr>");
                 }
                 builder.append("</table>");