[embjopr-commits] EMBJOPR SVN: r584 - in trunk/core/src/main: webapp/secure and 1 other directory.
Author: ips
Date: 2009-07-24 13:02:05 -0400 (Fri, 24 Jul 2009)
New Revision: 584
Modified:
trunk/core/src/main/java/org/jboss/on/embedded/ui/MetricAction.java
trunk/core/src/main/webapp/secure/resourceInstanceMetrics.xhtml
Log:
list traits in a single column on Metrics tab
(https://jira.jboss.org/jira/browse/EMBJOPR-99)
Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/MetricAction.java
===================================================================
--- trunk/core/src/main/java/org/jboss/on/embedded/ui/MetricAction.java 2009-07-24
16:05:54 UTC (rev 583)
+++ trunk/core/src/main/java/org/jboss/on/embedded/ui/MetricAction.java 2009-07-24
17:02:05 UTC (rev 584)
@@ -112,7 +112,7 @@
if (traitDataList != null)
{
traitDisplayList = new ArrayList<Map<String,
MeasurementDisplay>>();
- String[] columnNames = new String[]{"a", "b",
"c"};
+ String[] columnNames = new String[]{"a", "b"};
int columnCount = 0;
Map<String, MeasurementDisplay> currentMap = new HashMap<String,
MeasurementDisplay>();
Modified: trunk/core/src/main/webapp/secure/resourceInstanceMetrics.xhtml
===================================================================
--- trunk/core/src/main/webapp/secure/resourceInstanceMetrics.xhtml 2009-07-24 16:05:54
UTC (rev 583)
+++ trunk/core/src/main/webapp/secure/resourceInstanceMetrics.xhtml 2009-07-24 17:02:05
UTC (rev 584)
@@ -57,18 +57,14 @@
id="metricsTraitsTable"
var="trait"
columnClasses="standard-traitscolumn"
width="100%">
- <rich:column rendered="#{trait['a'] ne null}"
width="33%">
+ <rich:column rendered="#{trait['a'] ne null}"
width="50%">
<b>#{measurementDefinitionMap[trait['a'].measurementData.name].displayName}:</b>
#{trait['a'].measurementValueAndUnits}
</rich:column>
- <rich:column rendered="#{trait['b'] ne null}"
width="34%">
+ <rich:column rendered="#{trait['b'] ne null}"
width="50%">
<b>#{measurementDefinitionMap[trait['b'].measurementData.name].displayName}:</b>
#{trait['b'].measurementValueAndUnits}
</rich:column>
- <rich:column rendered="#{trait['c'] ne null}"
width="33%">
-
<b>#{measurementDefinitionMap[trait['c'].measurementData.name].displayName}:</b>
- #{trait['c'].measurementValueAndUnits}
- </rich:column>
</rich:dataTable>
<h:panelGroup layout="block" rendered="#{empty
traitDisplayList}">