Author: rmannibucau
Date: Fri Aug 2 15:25:25 2013
New Revision: 1509740
URL: http://svn.apache.org/r1509740
Log:
adding icon in jmx tree
Added:
commons/sandbox/monitoring/trunk/reporting/src/main/resources/resources/images/tree-closed.gif
(with props)
commons/sandbox/monitoring/trunk/reporting/src/main/resources/resources/images/tree-opened.gif
(with props)
Modified:
commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/plugin/jmx/JMXHandler.java
commons/sandbox/monitoring/trunk/reporting/src/main/resources/resources/css/monitoring.css
commons/sandbox/monitoring/trunk/reporting/src/main/resources/templates/jmx/main.vm
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=1509740&r1=1509739&r2=1509740&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 15:25:25 2013
@@ -335,6 +335,7 @@ public class JMXHandler extends HandlerR
final List<?> values = (List<?>) type;
final CompositeData data = td.get(values.toArray(new
Object[values.size()]));
builder.append("<tr>");
+ final Set<String> dataKeys =
data.getCompositeType().keySet();
for (final String k : data.getCompositeType().keySet()) {
builder.append("<td>").append(value(data.get(k))).append("</td>");
}
Modified:
commons/sandbox/monitoring/trunk/reporting/src/main/resources/resources/css/monitoring.css
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/reporting/src/main/resources/resources/css/monitoring.css?rev=1509740&r1=1509739&r2=1509740&view=diff
==============================================================================
---
commons/sandbox/monitoring/trunk/reporting/src/main/resources/resources/css/monitoring.css
(original)
+++
commons/sandbox/monitoring/trunk/reporting/src/main/resources/resources/css/monitoring.css
Fri Aug 2 15:25:25 2013
@@ -49,12 +49,21 @@ a.nodeText {
color: #000000;
cursor: pointer;
text-decoration: none;
+ padding-left: 20px;
}
a.nodeText:hover {
text-decoration: underline;
}
+.treeClosed {
+ background: url("$mapping/resources/images/tree-closed.gif") no-repeat
center left;
+}
+
+.treeOpened {
+ background: url("$mapping/resources/images/tree-opened.gif") no-repeat
center left;
+}
+
.plot {
width: 100%;
min-width: 100px;
Added:
commons/sandbox/monitoring/trunk/reporting/src/main/resources/resources/images/tree-closed.gif
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/reporting/src/main/resources/resources/images/tree-closed.gif?rev=1509740&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
commons/sandbox/monitoring/trunk/reporting/src/main/resources/resources/images/tree-closed.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
commons/sandbox/monitoring/trunk/reporting/src/main/resources/resources/images/tree-opened.gif
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/reporting/src/main/resources/resources/images/tree-opened.gif?rev=1509740&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
commons/sandbox/monitoring/trunk/reporting/src/main/resources/resources/images/tree-opened.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified:
commons/sandbox/monitoring/trunk/reporting/src/main/resources/templates/jmx/main.vm
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/reporting/src/main/resources/templates/jmx/main.vm?rev=1509740&r1=1509739&r2=1509740&view=diff
==============================================================================
---
commons/sandbox/monitoring/trunk/reporting/src/main/resources/templates/jmx/main.vm
(original)
+++
commons/sandbox/monitoring/trunk/reporting/src/main/resources/templates/jmx/main.vm
Fri Aug 2 15:25:25 2013
@@ -47,14 +47,32 @@
var parent_li = $(this).parent('li');
parent_li.addClass('node');
+ var wrapInner;
+ if (parent_li.hasClass('leaf')) {
+ wrapInner = parent_li.wrapInner('<a class="nodeText" />')
+ } else {
+ wrapInner = parent_li.wrapInner('<a class="nodeText
treeClosed" />')
+ }
+
var sub_ul = $(this).remove();
- parent_li.wrapInner('<a class="nodeText"
/>').find('a').click(function() {
+ wrapInner.find('a').click(function() {
sub_ul.toggle();
});
+
parent_li.append(sub_ul);
});
$('ul ul').hide();
+ $('.nodeText').click(function () {
+ if ($(this).hasClass('treeClosed')) {
+ $(this).removeClass('treeClosed');
+ $(this).addClass('treeOpened');
+ } else if ($(this).hasClass('treeOpened')) {
+ $(this).removeClass('treeOpened');
+ $(this).addClass('treeClosed');
+ } // else leaf
+ });
+
$('.leaf').click(function () {
var url = '$mapping/jmx/' + $(this).attr("id");
$.get(url, function(data) {
