You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sirona.apache.org by ol...@apache.org on 2014/09/05 11:24:00 UTC
svn commit: r1622653 - in /incubator/sirona/trunk/server/reporting:
reporting-api/src/main/java/org/apache/sirona/reporting/web/jmx/JMXNode.java
reporting-ui/src/main/webapp/js/app/controllers/controllers-jmx.js
Author: olamy
Date: Fri Sep 5 09:24:00 2014
New Revision: 1622653
URL: http://svn.apache.org/r1622653
Log:
fix tree display
Modified:
incubator/sirona/trunk/server/reporting/reporting-api/src/main/java/org/apache/sirona/reporting/web/jmx/JMXNode.java
incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-jmx.js
Modified: incubator/sirona/trunk/server/reporting/reporting-api/src/main/java/org/apache/sirona/reporting/web/jmx/JMXNode.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/reporting-api/src/main/java/org/apache/sirona/reporting/web/jmx/JMXNode.java?rev=1622653&r1=1622652&r2=1622653&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/reporting-api/src/main/java/org/apache/sirona/reporting/web/jmx/JMXNode.java (original)
+++ incubator/sirona/trunk/server/reporting/reporting-api/src/main/java/org/apache/sirona/reporting/web/jmx/JMXNode.java Fri Sep 5 09:24:00 2014
@@ -29,8 +29,11 @@ import java.util.TreeMap;
public class JMXNode
implements Serializable
{
+
private final String name;
+ private final String label;
+
private final Map<Key, JMXNode> children = new TreeMap<Key, JMXNode>();
private String base64 = null;
@@ -38,6 +41,7 @@ public class JMXNode
public JMXNode( final String name )
{
this.name = name;
+ this.label = name;
}
public static void addNode( final JMXNode rootNode, final String domain, final String props )
@@ -97,6 +101,11 @@ public class JMXNode
return base64;
}
+ public String getLabel()
+ {
+ return label;
+ }
+
public Collection<JMXNode> getChildren()
{
return Collections.unmodifiableCollection( children.values() );
Modified: incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-jmx.js
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-jmx.js?rev=1622653&r1=1622652&r2=1622653&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-jmx.js (original)
+++ incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-jmx.js Fri Sep 5 09:24:00 2014
@@ -32,7 +32,7 @@ define(['jquery','angular','bootstrap','
console.log("jmxHomeCtrl:");
jmx.query().$promise.then(function(result){
- $scope.treeData=result;
+ $scope.treeData=[result];
//return tree.expand_all();
});