[rhq] Branch 'mtho11/d3-charts-master' - 4 commits - modules/enterprise
by mike thompson
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceGraphPortlet.java | 16 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceMetricsPortlet.java | 10
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractD3GraphListView.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AbstractGraph.java | 9
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AvailabilityLineGraphType.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/HasD3MetricJsniChart.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java | 21 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricLineGraph.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricNvd3BarChartGraph.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/AvailabilityD3Graph.java | 120 ----------
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java | 19 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3Graph.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/AvailabilityBarView.java | 28 --
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/AvailabilityD3Graph.java | 116 +++++++++
modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js | 13 -
17 files changed, 174 insertions(+), 202 deletions(-)
New commits:
commit 8e7025535b08e84dff3077f76ec99d2c8b73e7f7
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Tue Mar 5 11:53:08 2013 -0800
Charting - Add entity name to dashboard charts. Rename yAxisTitle to chartTitle to reflect its real purpose.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceGraphPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceGraphPortlet.java
index 0eb2cd5..482c650 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceGraphPortlet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceGraphPortlet.java
@@ -154,6 +154,7 @@ public class ResourceGraphPortlet extends ResourceMetricD3Graph implements Custo
Log.debug("Found portlet measurement definition !" + def);
getJsniChart().setEntityId(resource.getId());
+ getJsniChart().setEntityName(resource.getName());
getJsniChart().setDefinition(def);
queryMetricsDataForDashboardGraphs(resource.getId(), def);
break;
@@ -196,14 +197,18 @@ public class ResourceGraphPortlet extends ResourceMetricD3Graph implements Custo
@Override
public void onFailure(Throwable caught) {
CoreGUI.getErrorHandler().handleError(MSG.view_resource_monitor_graphs_loadFailed(), caught);
- countDownLatch.countDown();
+ if(countDownLatch != null){
+ countDownLatch.countDown();
+ }
}
@Override
public void onSuccess(final List<List<MeasurementDataNumericHighLowComposite>> measurementData) {
Log.debug("Dashboard Metric data in: " + (System.currentTimeMillis() - startTime) + " ms.");
graph.getMetricGraphData().setMetricData(measurementData.get(0));
- countDownLatch.countDown();
+ if(countDownLatch != null){
+ countDownLatch.countDown();
+ }
}
});
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AbstractGraph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AbstractGraph.java
index bfe5878..0559732 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AbstractGraph.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AbstractGraph.java
@@ -20,7 +20,6 @@ package org.rhq.enterprise.gui.coregui.client.inventory.common.charttype;
import java.util.List;
-import org.rhq.core.domain.measurement.Availability;
import org.rhq.core.domain.measurement.MeasurementDefinition;
import org.rhq.core.domain.measurement.composite.MeasurementDataNumericHighLowComposite;
import org.rhq.core.domain.measurement.composite.MeasurementOOBComposite;
@@ -60,6 +59,10 @@ public abstract class AbstractGraph implements HasD3MetricJsniChart {
public String getEntityName() {
return metricGraphData.getEntityName();
}
+ @Override
+ public void setEntityName(String entityName) {
+ metricGraphData.setEntityName(entityName);
+ }
public int getDefinitionId() {
return metricGraphData.getDefinitionId();
@@ -159,8 +162,8 @@ public abstract class AbstractGraph implements HasD3MetricJsniChart {
metricGraphData.setChartHeight(chartHeight);
}
- public String getYAxisTitle() {
- return metricGraphData != null ? metricGraphData.getYAxisTitle() : "";
+ public String getChartTitle() {
+ return metricGraphData != null ? metricGraphData.getChartTitle() : "";
}
public String getYAxisUnits() {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/HasD3MetricJsniChart.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/HasD3MetricJsniChart.java
index 1d7e222..4ae5b59 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/HasD3MetricJsniChart.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/HasD3MetricJsniChart.java
@@ -32,6 +32,8 @@ public interface HasD3MetricJsniChart
{
void drawJsniChart();
void setEntityId(int entityId) ;
+ void setEntityName(String entityName) ;
+ //@todo: defId is redundant to MD
void setDefinitionId(int definitionId) ;
void setDefinition(MeasurementDefinition measurementDefinition) ;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java
index 48d892c..bc90a9b 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java
@@ -112,6 +112,11 @@ public class MetricGraphData implements JsonMetricProducer {
return entityName;
}
+ public void setEntityName(String entityName) {
+ this.entityName = entityName;
+ //this.definition = null;
+ }
+
public int getDefinitionId() {
return definitionId;
}
@@ -207,18 +212,10 @@ public class MetricGraphData implements JsonMetricProducer {
this.chartHeight = chartHeight;
}
- public String getYAxisTitle() {
+ public String getChartTitle() {
+
+ return entityName + " - "+definition.getDisplayName();
- //Log.debug("** Definition: " + definition + ", id: " + definitionId);
- if (null != definition.getDisplayName() && definition.getDisplayName().length() > 55) {
- return definition.getDisplayName().substring(0, 55) + "...";
- } else {
- if (definition == null) {
- return "";
- } else {
- return definition.getDisplayName();
- }
- }
}
/**
@@ -229,7 +226,7 @@ public class MetricGraphData implements JsonMetricProducer {
*/
public String getYAxisUnits() {
if (adjustedMeasurementUnits == null) {
- Log.error("AbstractMetricD3GraphView.adjustedMeasurementUnits is populated by getJsonMetrics. Make sure it is called first.");
+ Log.warn("AbstractMetricD3GraphView.adjustedMeasurementUnits is populated by getJsonMetrics. Make sure it is called first.");
return "";
} else {
return adjustedMeasurementUnits.toString();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricLineGraph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricLineGraph.java
index 304cd0a..1fa2902 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricLineGraph.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricLineGraph.java
@@ -43,7 +43,7 @@ public final class MetricLineGraph extends AbstractGraph {
chartHandle = "#rChart-"+chartId,
chartSelection = chartHandle + " svg",
json = $wnd.jQuery.parseJSON(global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricGraphData::getJsonMetrics()()),
- yAxisLabel = global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricGraphData::getYAxisTitle()(),
+ yAxisLabel = global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricGraphData::getChartTitle()(),
yAxisUnits = global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricGraphData::getYAxisUnits()(),
xAxisLabel = global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricGraphData::getXAxisTitle()();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricNvd3BarChartGraph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricNvd3BarChartGraph.java
index a98005c..9d1165e 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricNvd3BarChartGraph.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricNvd3BarChartGraph.java
@@ -44,7 +44,7 @@ public final class MetricNvd3BarChartGraph extends AbstractGraph
chartHandle = "#rChart-"+chartId,
chartSelection = chartHandle + " svg",
json = $wnd.jQuery.parseJSON(global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricGraphData::getJsonMetrics()()),
- yAxisLabel = global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricGraphData::getYAxisTitle()(),
+ yAxisLabel = global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricGraphData::getChartTitle()(),
yAxisUnits = global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricGraphData::getYAxisUnits()(),
xAxisLabel = global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricGraphData::getXAxisTitle()(),
displayDayOfWeek = global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricGraphData::shouldDisplayDayOfWeekInXAxisLabel()(),
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java
index 3a29511..86c1891 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java
@@ -50,7 +50,7 @@ public final class MetricStackedBarGraph extends AbstractGraph {
global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartHeight()(),
global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getJsonMetrics()(),
global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getXAxisTitle()(),
- global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getYAxisTitle()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartTitle()(),
global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getYAxisUnits()(),
global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartTitleMinLabel()(),
global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartTitleAvgLabel()(),
@@ -573,7 +573,7 @@ public final class MetricStackedBarGraph extends AbstractGraph {
console.log("chart id: " + chartContext.chartSelection);
//console.log("Json Data:\n"+chartContext.data);
- createHeader(chartContext.yAxisLabel);
+ createHeader(chartContext.chartTitle);
createMinAvgPeakSidePanel(chartContext.minChartTitle, min, chartContext.avgChartTitle, avg, chartContext.peakChartTitle, peak, chartContext.yAxisUnits );
createYAxisGridLines();
createStackedBars();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3Graph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3Graph.java
index fdf5617..682dd0f 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3Graph.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3Graph.java
@@ -23,7 +23,7 @@ import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.Abstract
import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.HasD3MetricJsniChart;
/**
- * A D3 graph representation for graphing metrics.
+ * A D3 graph implementation for graphing metrics.
*/
public class ResourceMetricD3Graph extends AbstractMetricD3GraphView {
@@ -34,13 +34,11 @@ public class ResourceMetricD3Graph extends AbstractMetricD3GraphView {
*/
public ResourceMetricD3Graph(String locatorId) {
super(locatorId);
- //setChartHeight("150px");
}
public ResourceMetricD3Graph(String locatorId, AbstractGraph graph) {
super(locatorId, graph);
- //setChartHeight("150px");
}
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js b/modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js
index 88268e5..6cd3a08 100644
--- a/modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js
+++ b/modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js
@@ -9,7 +9,7 @@
* A ChartContext can be passed to multiple chart renders to display different chart types
* of that data.
*/
-var ChartContext = function (chartId, chartHeight, metricsData, xAxisLabel, yAxisLabel, yAxisUnits, minChartTitle, avgChartTitle, peakChartTitle, dateLabel, timeLabel, downLabel, unknownLabel, noDataLabel, hoverStartLabel,hoverEndLabel, hoverPeriodLabel, hoverBarLabel)
+var ChartContext = function (chartId, chartHeight, metricsData, xAxisLabel, chartTitle, yAxisUnits, minChartTitle, avgChartTitle, peakChartTitle, dateLabel, timeLabel, downLabel, unknownLabel, noDataLabel, hoverStartLabel,hoverEndLabel, hoverPeriodLabel, hoverBarLabel)
{
"use strict";
if(!(this instanceof ChartContext)){
@@ -21,7 +21,7 @@ var ChartContext = function (chartId, chartHeight, metricsData, xAxisLabel, yAxi
this.chartHeight = chartHeight;
this.data = jQuery.parseJSON(metricsData); // make into json
this.xAxisLabel = xAxisLabel;
- this.yAxisLabel = yAxisLabel;
+ this.chartTitle = chartTitle;
this.yAxisUnits = yAxisUnits;
this.minChartTitle = minChartTitle;
this.avgChartTitle = avgChartTitle;
@@ -35,14 +35,7 @@ var ChartContext = function (chartId, chartHeight, metricsData, xAxisLabel, yAxi
this.hoverEndLabel = hoverEndLabel;
this.hoverPeriodLabel = hoverPeriodLabel;
this.hoverBarLabel = hoverBarLabel;
- /**
- * Can be called to validate the charting arguments.
- * @return {boolean}
- */
- this.validate = function ()
- {
- return this.chartId !== undefined && this.data !== undefined;
- };
+
},
AvailChartContext = function (chartId, availData, dateLabel, timeLabel, hoverStartLabel, hoverEndLabel, hoverBarLabel, availabilityLabel) {
"use strict";
commit 911a5d1aecc873a681d1701dbe4bf360df3ea0bd
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Tue Mar 5 09:20:39 2013 -0800
Charting - Remove chart.drawChart() and use existing chart.drawJsni() instead.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceGraphPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceGraphPortlet.java
index b2a168e..0eb2cd5 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceGraphPortlet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceGraphPortlet.java
@@ -215,6 +215,8 @@ public class ResourceGraphPortlet extends ResourceMetricD3Graph implements Custo
@Override
protected void onDraw() {
+ Log.debug("ResourceGraphPortlet.onDraw()");
+
DashboardPortlet storedPortlet = portletWindow.getStoredPortlet();
PropertySimple simple = storedPortlet.getConfiguration().getSimple(CFG_RESOURCE_ID);
@@ -297,7 +299,7 @@ public class ResourceGraphPortlet extends ResourceMetricD3Graph implements Custo
@Override
public void redraw() {
- Log.debug("Redraw Portlet and set data");
+ Log.debug("Redraw Portlet Graph and set data");
super.redraw();
removeMembers(getMembers());
@@ -311,7 +313,8 @@ public class ResourceGraphPortlet extends ResourceMetricD3Graph implements Custo
graph.getMetricGraphData().setEntityId(simple.getIntegerValue());
PropertySimple simpleDefId = storedPortlet.getConfiguration().getSimple(CFG_DEFINITION_ID);
graph.getMetricGraphData().setDefinitionId(simpleDefId.getIntegerValue());
- drawGraph();
+ drawJsniChart();
+ markForRedraw();
}
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java
index 4954dda..7f58cf2 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java
@@ -137,7 +137,7 @@ public class D3GroupGraphListView extends AbstractD3GraphListView {
}
availabilityGraph.setMetricData(result.get(0));
availabilityGraph.setAvailabilityList(availabilityList);
- availabilityGraph.drawGraph();
+ availabilityGraph.drawJsniChart();
}
}
});
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java
index 4602043..5b997b4 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java
@@ -141,7 +141,7 @@ public class D3GraphListView extends AbstractD3GraphListView {
public void redrawGraphs() {
this.onDraw();
- availabilityGraph.drawGraph();
+ availabilityGraph.drawJsniChart();
}
/**
@@ -215,7 +215,7 @@ public class D3GraphListView extends AbstractD3GraphListView {
// availability data set in there for the dropdowns already
availabilityGraph.setMetricData(metricsDataList.get(0));
availabilityGraph.setAvailabilityList(availabilityList);
- availabilityGraph.drawGraph();
+ availabilityGraph.drawJsniChart();
}
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/AvailabilityD3Graph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/AvailabilityD3Graph.java
index fc98af5..8e05abf 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/AvailabilityD3Graph.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/AvailabilityD3Graph.java
@@ -59,7 +59,7 @@ public class AvailabilityD3Graph extends LocatableVLayout implements Availabilit
super.parentResized();
removeMembers(getMembers());
createGraphMarker();
- drawGraph();
+ drawJsniChart();
}
public void setMetricData(List<MeasurementDataNumericHighLowComposite> metricData) {
@@ -71,8 +71,13 @@ public class AvailabilityD3Graph extends LocatableVLayout implements Availabilit
}
/**
- * Create the graph marker to be later filled in with a graph from d3.
+ * Setup the page elements especially the div and svg elements that serve as
+ * placeholders for the d3 stuff to grab onto and add svg tags to render the chart.
+ * Later the drawJsniGraph() is called to actually fill in the div/svg element
+ * created here with the actual svg element.
+ *
*/
+
public void createGraphMarker() {
Log.debug("drawGraph marker in AvailabilityD3Graph for: " + availabilityGraphType.getChartId());
@@ -87,17 +92,6 @@ public class AvailabilityD3Graph extends LocatableVLayout implements Availabilit
}
- /**
- * Setup the page elements especially the div and svg elements that serve as
- * placeholders for the d3 stuff to grab onto and add svg tags to render the chart.
- * Later the drawJsniGraph() is called to actually fill in the div/svg element
- * created here with the actual svg element.
- *
- */
- public void drawGraph() {
-
- drawJsniChart();
- }
@Override
public void destroy() {
@@ -109,6 +103,8 @@ public class AvailabilityD3Graph extends LocatableVLayout implements Availabilit
super.hide();
}
+
+
/**
* Delegate the call to rendering the JSNI chart.
* This way the chart type can be swapped out at any time.
commit 8cd6f96eb42cc3044f3edab51ac37db60b9ea726
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Tue Mar 5 09:09:00 2013 -0800
Charting - Deprecate AvailabilityBarView replaced with AvailabilityD3Graph.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/AvailabilityBarView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/AvailabilityBarView.java
index 97e9c8a..5d40b1b 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/AvailabilityBarView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/AvailabilityBarView.java
@@ -45,6 +45,7 @@ import org.rhq.enterprise.gui.coregui.client.util.MeasurementConverterClient;
*
* @author Greg Hinkle
*/
+@Deprecated
public class AvailabilityBarView extends HLayout {
Messages MSG = CoreGUI.getMessages();
@@ -72,7 +73,6 @@ public class AvailabilityBarView extends HLayout {
}
public void onSuccess(PageList<Availability> result) {
- Log.info("\n\n******Dude avail I have: "+result.size());
update(result);
}
});
@@ -133,31 +133,5 @@ public class AvailabilityBarView extends HLayout {
Img rightCap = new Img("availBar/rightCap.png", 8, 28);
addMember(rightCap);
- /* StringBuffer buf = new StringBuffer("<table cellpadding=\"0\" cellspacing=\"0\" width=\"100%\"><tr height=\"28\">");
-
- buf.append("<td width=\"8px\" class=\"availBarLeftCap\"> </td>");
-
-
- for (Availability a : result) {
-
- long endTime = a.getEndTime() != null ? a.getEndTime().getTime() : System.currentTimeMillis();
-
-
- double width = (((double) (endTime - a.getStartTime().getTime()) / diff) * 100);
- String widthString = width + "%";
- if (width == 0) {
- widthString = "2px";
- }
-
- buf.append("<td width=\"" + widthString + "\" class=\"" + (a.getAvailabilityType() == AvailabilityType.UP ? "availBarUp" : "availBarDown") + "\"> </td>");
- }
- buf.append("<td width=\"8px\" class=\"availBarRightCap\"> </td>");
- buf.append("</tr></table>");
-
-
- HTMLFlow bar = new HTMLFlow(buf.toString());
-
- addMember(bar);*/
-
}
}
commit 5b308aa4e3cb7106a79e3f9725ee8a72fa676c35
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Tue Mar 5 09:07:57 2013 -0800
Charting - Make availability chart an option on Factory constructor to include availability or not when creating a D3GraphListView. Move AvailabilityD3Graph to avail directory.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceMetricsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceMetricsPortlet.java
index 6f3aad7..9dc6fa3 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceMetricsPortlet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceMetricsPortlet.java
@@ -58,7 +58,7 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AvailabilityLineGraphType;
import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.summary.AbstractActivityView;
import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.summary.AbstractActivityView.ChartViewWindow;
-import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.AvailabilityD3Graph;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.avail.AvailabilityD3Graph;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.D3GraphListView;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
import org.rhq.enterprise.gui.coregui.client.util.BrowserUtility;
@@ -279,21 +279,15 @@ public class ResourceMetricsPortlet extends GroupMetricsPortlet {
ChartViewWindow window = new ChartViewWindow(
recentMeasurementsContent
.extendLocatorId("ChartWindow"), title);
- final AvailabilityD3Graph availabilityGraph = new AvailabilityD3Graph("avail", new AvailabilityLineGraphType(resource.getId()));
- // first step in 2 step to create d3 chart
- // create a placeholder for avail graph
- availabilityGraph.createGraphMarker();
final D3GraphListView graphView = D3GraphListView.createSingleGraph(extendLocatorId("D3Graphs"),
- resourceComposite.getResource(), md.getId());
+ resourceComposite.getResource(), md.getId(),true);
graphView.addSetButtonClickHandler(new ClickHandler()
{
@Override
public void onClick(ClickEvent event)
{
- availabilityGraph.drawGraph();
graphView.redrawGraphs();
-
}
});
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractD3GraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractD3GraphListView.java
index 6ca58c0..0b9613c 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractD3GraphListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractD3GraphListView.java
@@ -28,7 +28,7 @@ import org.rhq.core.domain.util.PageOrdering;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.components.measurement.UserPreferencesMeasurementRangeEditor;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
-import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.AvailabilityD3Graph;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.avail.AvailabilityD3Graph;
import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.async.CountDownLatch;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
@@ -78,7 +78,6 @@ public abstract class AbstractD3GraphListView extends LocatableVLayout {
for (Availability availability : availList) {
availabilityList.add(availability);
}
- Log.debug("avail list size: " + availabilityList.size());
if (countDownLatch != null) {
countDownLatch.countDown();
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AvailabilityLineGraphType.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AvailabilityLineGraphType.java
index 30c7b8b..6ef2cde 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AvailabilityLineGraphType.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AvailabilityLineGraphType.java
@@ -86,9 +86,10 @@ public class AvailabilityLineGraphType {
break;
}
else if (availability.getEndTime() == null) {
+ // we are in the last, unbounded avail interval so assume that the end is now
+ Date now = new Date();
sb.append(" \"availType\":\"" + availability.getAvailabilityType() + "\", ");
sb.append(" \"availStart\":" + availability.getStartTime() + ", ");
- Date now = new Date();
sb.append(" \"availEnd\":" + now.getTime() + ",");
long availDuration = (new Date()).getTime() - availability.getStartTime();
String availDurationString = MeasurementConverterClient.format((double)availDuration,
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java
index e23a127..4954dda 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java
@@ -39,7 +39,7 @@ import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.Availabi
import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricGraphData;
import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricStackedBarGraph;
import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractD3GraphListView;
-import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.AvailabilityD3Graph;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.avail.AvailabilityD3Graph;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.ResourceMetricD3Graph;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/AvailabilityD3Graph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/AvailabilityD3Graph.java
deleted file mode 100644
index a8834c8..0000000
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/AvailabilityD3Graph.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2013 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring;
-
-import java.util.List;
-
-import com.smartgwt.client.widgets.HTMLFlow;
-
-import org.rhq.core.domain.measurement.Availability;
-import org.rhq.core.domain.measurement.composite.MeasurementDataNumericHighLowComposite;
-import org.rhq.core.domain.util.PageList;
-import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AvailabilityGraph;
-import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AvailabilityLineGraphType;
-import org.rhq.enterprise.gui.coregui.client.util.Log;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
-
-/**
- * A special graph implementation just for representing Availability (with hovers) for
- * a resource or resource group.
- *
- * @author Mike Thompson
- */
-public class AvailabilityD3Graph extends LocatableVLayout implements AvailabilityGraph {
-
- protected AvailabilityLineGraphType availabilityGraphType;
-
- public AvailabilityD3Graph(String locatorId, AvailabilityLineGraphType graphType) {
- super(locatorId);
- this.availabilityGraphType = graphType;
- setHeight(25);
- setWidth100();
- }
-
- @Override
- protected void onDraw() {
- super.onDraw();
- removeMembers(getMembers());
- createGraphMarker();
- }
-
- @Override
- public void parentResized() {
- super.parentResized();
- removeMembers(getMembers());
- createGraphMarker();
- drawGraph();
- }
-
- public void setMetricData(List<MeasurementDataNumericHighLowComposite> metricData) {
- availabilityGraphType.setMetricData(metricData);
- }
-
- public void setAvailabilityList(PageList<Availability> availabilityList) {
- availabilityGraphType.setAvailabilityList(availabilityList);
- }
-
- /**
- * Create the graph marker to be later filled in with a graph from d3.
- */
- public void createGraphMarker() {
- Log.debug(" *** drawGraph marker in AvailabilityD3Graph for: " + availabilityGraphType.getChartId());
-
- StringBuilder divAndSvgDefs = new StringBuilder();
- divAndSvgDefs.append("<div id=\"availChart-" + availabilityGraphType.getChartId()
- + "\" ><svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" style=\"height:20px;\">");
- divAndSvgDefs.append("</svg></div>");
- HTMLFlow graph = new HTMLFlow(divAndSvgDefs.toString());
- graph.setWidth100();
- graph.setHeight(25);
- addMember(graph);
-
- }
-
- /**
- * Setup the page elements especially the div and svg elements that serve as
- * placeholders for the d3 stuff to grab onto and add svg tags to render the chart.
- * Later the drawJsniGraph() is called to actually fill in the div/svg element
- * created here with the actual svg element.
- *
- */
- public void drawGraph() {
-
- drawJsniChart();
- }
-
- @Override
- public void destroy() {
- super.destroy();
- }
-
- @Override
- public void hide() {
- super.hide();
- }
-
- /**
- * Delegate the call to rendering the JSNI chart.
- * This way the chart type can be swapped out at any time.
- */
- public void drawJsniChart() {
- availabilityGraphType.drawJsniChart();
- }
-
-}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java
index dfb6afa..4602043 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java
@@ -45,6 +45,7 @@ import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractD3GraphLis
import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AvailabilityLineGraphType;
import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricGraphData;
import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricStackedBarGraph;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.avail.AvailabilityD3Graph;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.async.Command;
@@ -78,19 +79,25 @@ public class D3GraphListView extends AbstractD3GraphListView {
return new D3GraphListView(locatorId, resource, monitorDetailView);
}
- public static D3GraphListView createSingleGraph(String locatorId, Resource resource, Integer measurementId) {
+ public static D3GraphListView createSingleGraph(String locatorId, Resource resource,
+ Integer measurementId, boolean showAvailabilityGraph) {
TreeSet<Integer> definitionIds = new TreeSet<Integer>();
definitionIds.add(measurementId);
- return new D3GraphListView(locatorId, resource, definitionIds, false);
+ return new D3GraphListView(locatorId, resource, definitionIds, showAvailabilityGraph);
+
+ }
+
+ public static D3GraphListView createSingleGraph(String locatorId, Resource resource, Integer measurementId) {
+ return D3GraphListView.createSingleGraph(locatorId,resource,measurementId,false);
}
- private D3GraphListView(String locatorId, Resource resource, Set<Integer> definitionIds, boolean monitorDetailView) {
+ private D3GraphListView(String locatorId, Resource resource, Set<Integer> definitionIds, boolean showAvailabilityGraph) {
super(locatorId);
this.resource = resource;
commonConstructorSettings();
this.definitionIds = definitionIds;
- this.showAvailabilityGraph = monitorDetailView;
+ this.showAvailabilityGraph = showAvailabilityGraph;
}
private D3GraphListView(String locatorId, Resource resource, boolean showAvailabilityGraph) {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/AvailabilityD3Graph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/AvailabilityD3Graph.java
new file mode 100644
index 0000000..fc98af5
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/AvailabilityD3Graph.java
@@ -0,0 +1,120 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2013 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.avail;
+
+import java.util.List;
+
+import com.smartgwt.client.widgets.HTMLFlow;
+
+import org.rhq.core.domain.measurement.Availability;
+import org.rhq.core.domain.measurement.composite.MeasurementDataNumericHighLowComposite;
+import org.rhq.core.domain.util.PageList;
+import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AvailabilityGraph;
+import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AvailabilityLineGraphType;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
+
+/**
+ * A special graph implementation just for representing Availability (with hovers) for
+ * a resource or resource group.
+ *
+ * @author Mike Thompson
+ */
+public class AvailabilityD3Graph extends LocatableVLayout implements AvailabilityGraph {
+
+ protected AvailabilityLineGraphType availabilityGraphType;
+
+ public AvailabilityD3Graph(String locatorId, AvailabilityLineGraphType graphType) {
+ super(locatorId);
+ this.availabilityGraphType = graphType;
+ setHeight(25);
+ setWidth100();
+ }
+
+ @Override
+ protected void onDraw() {
+ super.onDraw();
+ removeMembers(getMembers());
+ createGraphMarker();
+ }
+
+ @Override
+ public void parentResized() {
+ super.parentResized();
+ removeMembers(getMembers());
+ createGraphMarker();
+ drawGraph();
+ }
+
+ public void setMetricData(List<MeasurementDataNumericHighLowComposite> metricData) {
+ availabilityGraphType.setMetricData(metricData);
+ }
+
+ public void setAvailabilityList(PageList<Availability> availabilityList) {
+ availabilityGraphType.setAvailabilityList(availabilityList);
+ }
+
+ /**
+ * Create the graph marker to be later filled in with a graph from d3.
+ */
+ public void createGraphMarker() {
+ Log.debug("drawGraph marker in AvailabilityD3Graph for: " + availabilityGraphType.getChartId());
+
+ StringBuilder divAndSvgDefs = new StringBuilder();
+ divAndSvgDefs.append("<div id=\"availChart-" + availabilityGraphType.getChartId()
+ + "\" ><svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" style=\"height:20px;\">");
+ divAndSvgDefs.append("</svg></div>");
+ HTMLFlow graph = new HTMLFlow(divAndSvgDefs.toString());
+ graph.setWidth100();
+ graph.setHeight(25);
+ addMember(graph);
+
+ }
+
+ /**
+ * Setup the page elements especially the div and svg elements that serve as
+ * placeholders for the d3 stuff to grab onto and add svg tags to render the chart.
+ * Later the drawJsniGraph() is called to actually fill in the div/svg element
+ * created here with the actual svg element.
+ *
+ */
+ public void drawGraph() {
+
+ drawJsniChart();
+ }
+
+ @Override
+ public void destroy() {
+ super.destroy();
+ }
+
+ @Override
+ public void hide() {
+ super.hide();
+ }
+
+ /**
+ * Delegate the call to rendering the JSNI chart.
+ * This way the chart type can be swapped out at any time.
+ */
+ public void drawJsniChart() {
+ availabilityGraphType.drawJsniChart();
+ }
+
+}
11 years, 2 months
[rhq] 2 commits - modules/core modules/enterprise
by Jay Shaughnessy
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/JPADriftChangeSetCriteria.java | 5 +++
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/JPADriftCriteria.java | 16 ++++++----
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceAlreadyExistsException.java | 9 +++++
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceTypeAlreadyExistsException.java | 7 ++++
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupAlreadyExistsException.java | 7 ++++
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupManagerRemote.java | 6 +++
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupUpdateException.java | 8 +++++
7 files changed, 52 insertions(+), 6 deletions(-)
New commits:
commit 9d56ea4c0431e91ffb25ca1fab29e7fc17305534
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Tue Mar 5 14:41:13 2013 -0500
Several of our Exception classes need to be annotated as ApplicationExceptions.
This prevents them from being wrapped as EJBExceptions when returned out of
a transaction context (and therefore more easily caught as the expected exception type).
Most of these, the specific "return-value-oriented" AlreadyExists exceptions should not
mark the Txc for rollback.
More general exceptions can still be marked as ApplicationException, to avoid the
wrapping, but should in fact rollback the Tx, because the problem is not specific and
may be terminal to the logical operation.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceAlreadyExistsException.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceAlreadyExistsException.java
index 1afef20..6660e93 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceAlreadyExistsException.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceAlreadyExistsException.java
@@ -18,7 +18,14 @@
*/
package org.rhq.enterprise.server.resource;
-public class ResourceAlreadyExistsException extends Exception {
+import javax.ejb.ApplicationException;
+
+/**
+ * Declare this an {@link ApplicationException} because we don't want these to be wrapped or to rollback an ongoing
+ * transaction.
+ */
+@ApplicationException(rollback = false, inherited = true)
+public class ResourceAlreadyExistsException extends RuntimeException {
private static final long serialVersionUID = -8394759185254688952L;
public ResourceAlreadyExistsException() {
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceTypeAlreadyExistsException.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceTypeAlreadyExistsException.java
index 1a65ed7..d0c4b97 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceTypeAlreadyExistsException.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceTypeAlreadyExistsException.java
@@ -18,6 +18,13 @@
*/
package org.rhq.enterprise.server.resource;
+import javax.ejb.ApplicationException;
+
+/**
+ * Declare this an {@link ApplicationException} because we don't want these to be wrapped or to rollback an ongoing
+ * transaction.
+ */
+@ApplicationException(rollback = false, inherited = true)
public class ResourceTypeAlreadyExistsException extends RuntimeException {
private static final long serialVersionUID = 1169791095984659926L;
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupAlreadyExistsException.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupAlreadyExistsException.java
index ddbd79f..eeedd2d 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupAlreadyExistsException.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupAlreadyExistsException.java
@@ -18,6 +18,13 @@
*/
package org.rhq.enterprise.server.resource.group;
+import javax.ejb.ApplicationException;
+
+/**
+ * Declare this an {@link ApplicationException} because we don't want these to be wrapped or to rollback an ongoing
+ * transaction.
+ */
+@ApplicationException(rollback = false, inherited = true)
public class ResourceGroupAlreadyExistsException extends ResourceGroupUpdateException {
private static final long serialVersionUID = 1L;
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupManagerRemote.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupManagerRemote.java
index ceffcac..6e40bb5 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupManagerRemote.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupManagerRemote.java
@@ -35,6 +35,12 @@ public interface ResourceGroupManagerRemote {
void addResourcesToGroup(Subject subject, int groupId, int[] resourceIds);
+ /**
+ * @param subject
+ * @param resourceGroup
+ * @return The new ResourceGroup
+ * @throws ResourceGroupAlreadyExistsException
+ */
ResourceGroup createResourceGroup(Subject subject, ResourceGroup resourceGroup);
void deleteResourceGroup(Subject subject, int groupId) throws ResourceGroupNotFoundException,
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupUpdateException.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupUpdateException.java
index 7dd0701..c0dc346 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupUpdateException.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupUpdateException.java
@@ -18,6 +18,14 @@
*/
package org.rhq.enterprise.server.resource.group;
+import javax.ejb.ApplicationException;
+
+/**
+ * Declare this an {@link ApplicationException} because we don't want these to be wrapped. But, this is a general
+ * exception, so do allow the Tx to be marked for rollback. Only certain specific exceptions should allow the Tx to
+ * continue.
+ */
+@ApplicationException(rollback = true, inherited = true)
public class ResourceGroupUpdateException extends RuntimeException {
private static final long serialVersionUID = 9079807311008826697L;
commit 92386ac7ed74e3ed05c80fd184733db794c9c197
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Tue Mar 5 14:37:24 2013 -0500
Add some overrides for unsupported global Criteria methods on the
drift criteria classes that must conform to the server plugin's interface.
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/JPADriftChangeSetCriteria.java b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/JPADriftChangeSetCriteria.java
index b6c02da..97ce68b 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/JPADriftChangeSetCriteria.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/JPADriftChangeSetCriteria.java
@@ -292,6 +292,11 @@ public class JPADriftChangeSetCriteria extends Criteria implements DriftChangeSe
}
@Override
+ public void addSortId(PageOrdering pageOrdering) {
+ throw new UnsupportedOperationException("The sort is not supported by DriftChangeSetCriteria.");
+ }
+
+ @Override
public void addFilterIds(Integer... filterIds) {
throw new UnsupportedOperationException("The filter is not supported by DriftChangeSetCriteria.");
}
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/JPADriftCriteria.java b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/JPADriftCriteria.java
index b222b58..56f0ddf 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/JPADriftCriteria.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/JPADriftCriteria.java
@@ -107,11 +107,6 @@ public class JPADriftCriteria extends Criteria implements DriftCriteria {
}
@Override
- public void addFilterIds(Integer... filterIds) {
- throw new UnsupportedOperationException("The filter is not supported by DriftCriteria.");
- }
-
- @Override
public String getFilterId() {
return (null == filterId) ? null : filterId.toString();
}
@@ -248,4 +243,15 @@ public class JPADriftCriteria extends Criteria implements DriftCriteria {
public PageOrdering getSortCtime() {
return sortCtime;
}
+
+ @Override
+ public void addFilterIds(Integer... filterIds) {
+ throw new UnsupportedOperationException("The filter is not supported by DriftCriteria.");
+ }
+
+ @Override
+ public void addSortId(PageOrdering pageOrdering) {
+ throw new UnsupportedOperationException("The sort is not supported by DriftCriteria.");
+ }
+
}
11 years, 2 months
[rhq] 3 commits - modules/core modules/enterprise
by Jay Shaughnessy
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/Criteria.java | 6 ++--
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/JPADriftChangeSetCriteria.java | 14 ++++++---
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/JPADriftCriteria.java | 15 ++++++----
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java | 3 +-
4 files changed, 23 insertions(+), 15 deletions(-)
New commits:
commit 2ddc360da4203e3324b8aeb70726ab0106c26d13
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Tue Mar 5 12:20:32 2013 -0500
Add Unsupported exceptions for global filters
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/JPADriftChangeSetCriteria.java b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/JPADriftChangeSetCriteria.java
index bd86eb9..b6c02da 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/JPADriftChangeSetCriteria.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/JPADriftChangeSetCriteria.java
@@ -291,4 +291,9 @@ public class JPADriftChangeSetCriteria extends Criteria implements DriftChangeSe
return (filterId == null) ? null : filterId.toString();
}
+ @Override
+ public void addFilterIds(Integer... filterIds) {
+ throw new UnsupportedOperationException("The filter is not supported by DriftChangeSetCriteria.");
+ }
+
}
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/JPADriftCriteria.java b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/JPADriftCriteria.java
index 2d993b0..b222b58 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/JPADriftCriteria.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/JPADriftCriteria.java
@@ -107,6 +107,11 @@ public class JPADriftCriteria extends Criteria implements DriftCriteria {
}
@Override
+ public void addFilterIds(Integer... filterIds) {
+ throw new UnsupportedOperationException("The filter is not supported by DriftCriteria.");
+ }
+
+ @Override
public String getFilterId() {
return (null == filterId) ? null : filterId.toString();
}
commit f83221007972fe95022be238f4d22a563276eee4
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Tue Mar 5 12:10:14 2013 -0500
Fix issue with global filterId support for the JPA impls of the generic Drift
criterias. Don't have redundant filter fields and make sure the
copy constructor sets the filter. Also, allow null to be set on the filter.
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/Criteria.java b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/Criteria.java
index e2d435c..abd05c4 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/Criteria.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/Criteria.java
@@ -120,13 +120,13 @@ public abstract class Criteria implements Serializable, BaseCriteria {
private String searchExpression;
// All Criteria support sorting on ID
- private PageOrdering sortId;
+ protected PageOrdering sortId;
// All Criteria support filtering on ID
- private Integer filterId;
+ protected Integer filterId;
// All Criteria support filtering on IDs
- private List<Integer> filterIds;
+ protected List<Integer> filterIds;
/**
* This default constructor will set default paging to avoid unintended fetch of huge results. The default is:
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/JPADriftChangeSetCriteria.java b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/JPADriftChangeSetCriteria.java
index 4b6a24b..bd86eb9 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/JPADriftChangeSetCriteria.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/JPADriftChangeSetCriteria.java
@@ -43,7 +43,6 @@ import org.rhq.core.domain.util.PageOrdering;
public class JPADriftChangeSetCriteria extends Criteria implements DriftChangeSetCriteria {
private static final long serialVersionUID = 1L;
- private Integer filterId;
private Integer filterInitial; // needs override
private Integer filterResourceId; // needs override
private Integer filterDriftDefinitionId; // needs override
@@ -91,6 +90,7 @@ public class JPADriftChangeSetCriteria extends Criteria implements DriftChangeSe
+ " WHERE drift.path like ? )"); // note, this uses 'like' on purpose, it is always substring
if (null != changeSetCriteria) {
+ this.addFilterId(changeSetCriteria.getFilterId());
this.addFilterCategory(changeSetCriteria.getFilterCategory());
this.addFilterCreatedAfter(changeSetCriteria.getFilterCreatedAfter());
this.addFilterCreatedBefore(changeSetCriteria.getFilterCreatedBefore());
@@ -283,13 +283,12 @@ public class JPADriftChangeSetCriteria extends Criteria implements DriftChangeSe
@Override
public void addFilterId(String filterId) {
- if (filterId != null) {
- this.filterId = Integer.parseInt(filterId);
- }
+ this.filterId = (filterId == null) ? null : Integer.parseInt(filterId);
}
@Override
public String getFilterId() {
- return filterId == null ? null : filterId.toString();
+ return (filterId == null) ? null : filterId.toString();
}
+
}
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/JPADriftCriteria.java b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/JPADriftCriteria.java
index 468d9b3..2d993b0 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/JPADriftCriteria.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/JPADriftCriteria.java
@@ -26,8 +26,8 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import org.rhq.core.domain.drift.DriftCategory;
-import org.rhq.core.domain.drift.JPADrift;
import org.rhq.core.domain.drift.DriftConfigurationDefinition.DriftHandlingMode;
+import org.rhq.core.domain.drift.JPADrift;
import org.rhq.core.domain.util.CriteriaUtils;
import org.rhq.core.domain.util.PageOrdering;
@@ -41,7 +41,6 @@ import org.rhq.core.domain.util.PageOrdering;
public class JPADriftCriteria extends Criteria implements DriftCriteria {
private static final long serialVersionUID = 1L;
- private Integer filterId;
private List<DriftCategory> filterCategories = new ArrayList<DriftCategory>();
private Integer filterChangeSetId; // needs override
private Integer filterChangeSetStartVersion; // needs override
@@ -77,6 +76,7 @@ public class JPADriftCriteria extends Criteria implements DriftCriteria {
if (null != driftCriteria) {
this.fetchChangeSet(driftCriteria.isFetchChangeSet());
+ this.addFilterId(driftCriteria.getFilterId());
this.addFilterCategories(driftCriteria.getFilterCategories());
this.addFilterChangeSetId(driftCriteria.getFilterChangeSetId());
this.addFilterChangeSetStartVersion(driftCriteria.getFilterChangeSetStartVersion());
@@ -103,14 +103,12 @@ public class JPADriftCriteria extends Criteria implements DriftCriteria {
@Override
public void addFilterId(String filterId) {
- if (filterId != null) {
- this.filterId = Integer.parseInt(filterId);
- }
+ this.filterId = (null == filterId) ? null : Integer.parseInt(filterId);
}
@Override
public String getFilterId() {
- return filterId == null ? null : filterId.toString();
+ return (null == filterId) ? null : filterId.toString();
}
@Override
commit 72e569540bdac7ea857b76a8b55203fba14e4d2e
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Tue Mar 5 12:06:57 2013 -0500
Make this a little more efficient.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java
index 67b6316..8f0d2cc 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java
@@ -569,6 +569,7 @@ public final class CriteriaQueryGenerator {
List<Field> results = new ArrayList<Field>();
Class<?> currentLevelClass = criteria.getClass();
+ List<String> globalFields = fieldType.getGlobalFields();
boolean isCriteriaClass = false;
do {
@@ -577,7 +578,7 @@ public final class CriteriaQueryGenerator {
for (Field field : currentLevelClass.getDeclaredFields()) {
field.setAccessible(true);
if (isCriteriaClass) {
- if (fieldType.getGlobalFields().contains(field.getName()))
+ if (globalFields.contains(field.getName()))
results.add(field);
} else if (field.getName().startsWith(prefix)) {
11 years, 2 months
[rhq] Branch 'feature/cassandra-backend' - modules/helpers
by John Sanda
modules/helpers/metrics-simulator/src/main/assembly/bin/rhq-ms-env.sh | 5
modules/helpers/metrics-simulator/src/main/assembly/bin/rhq-ms.sh | 2
modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/SimulatorThreadFactory.java | 62 ++++++++++
3 files changed, 68 insertions(+), 1 deletion(-)
New commits:
commit 2056abe3baf2c7196821c000e735e6c38b73f65c
Author: John Sanda <jsanda(a)redhat.com>
Date: Tue Mar 5 10:11:26 2013 -0500
previously forgot to commit SimulatorThreadFactory
diff --git a/modules/helpers/metrics-simulator/src/main/assembly/bin/rhq-ms-env.sh b/modules/helpers/metrics-simulator/src/main/assembly/bin/rhq-ms-env.sh
new file mode 100755
index 0000000..8bfcb0b
--- /dev/null
+++ b/modules/helpers/metrics-simulator/src/main/assembly/bin/rhq-ms-env.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+#RHQ_MS_JAVA_OPTS="-Xms64M -Xmx64M -Djava.net.preferIPv4Stack=true"
+
+#RHQ_MS_ADDITIONAL_JAVA_OPTS="-agentlib:jdwp=transport=dt_socket,address=7979,server=y,suspend=y"
diff --git a/modules/helpers/metrics-simulator/src/main/assembly/bin/rhq-ms.sh b/modules/helpers/metrics-simulator/src/main/assembly/bin/rhq-ms.sh
index 32319ee..0171a5a 100644
--- a/modules/helpers/metrics-simulator/src/main/assembly/bin/rhq-ms.sh
+++ b/modules/helpers/metrics-simulator/src/main/assembly/bin/rhq-ms.sh
@@ -12,7 +12,7 @@ popd
prepare_java()
{
if [ -z "$JAVA_HOME" ]; then
- echo "$JAVA_HOME must be set"
+ echo "JAVA_HOME must be set"
exit 1
fi
RHQ_MS_JAVA_EXE=$JAVA_HOME/bin/java
diff --git a/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/SimulatorThreadFactory.java b/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/SimulatorThreadFactory.java
new file mode 100644
index 0000000..dd492e7
--- /dev/null
+++ b/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/SimulatorThreadFactory.java
@@ -0,0 +1,62 @@
+/*
+ *
+ * * RHQ Management Platform
+ * * Copyright (C) 2005-2012 Red Hat, Inc.
+ * * All rights reserved.
+ * *
+ * * This program is free software; you can redistribute it and/or modify
+ * * it under the terms of the GNU General Public License, version 2, as
+ * * published by the Free Software Foundation, and/or the GNU Lesser
+ * * General Public License, version 2.1, also as published by the Free
+ * * Software Foundation.
+ * *
+ * * This program is distributed in the hope that it will be useful,
+ * * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * * GNU General Public License and the GNU Lesser General Public License
+ * * for more details.
+ * *
+ * * You should have received a copy of the GNU General Public License
+ * * and the GNU Lesser General Public License along with this program;
+ * * if not, write to the Free Software Foundation, Inc.,
+ * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+package org.rhq.metrics.simulator;
+
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * @author John Sanda
+ */
+public class SimulatorThreadFactory implements ThreadFactory, Thread.UncaughtExceptionHandler {
+
+ private final Log log;
+
+ private AtomicInteger threadNumber = new AtomicInteger(0);
+
+ private String poolName = "SimulatorThreadPool";
+
+ public SimulatorThreadFactory() {
+ log = LogFactory.getLog(poolName);
+ }
+
+ @Override
+ public Thread newThread(Runnable r) {
+ Thread t = new Thread(r, poolName + "-" + threadNumber.getAndIncrement());
+ t.setDaemon(true);
+ t.setUncaughtExceptionHandler(this);
+
+ return t;
+ }
+
+ @Override
+ public void uncaughtException(Thread t, Throwable e) {
+ log.error("Uncaught exception on scheduled thread [" + t.getName() + "]", e);
+ }
+}
11 years, 2 months
[rhq] modules/core
by Jiri Kremser
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AbstractConfigurationUpdateCriteria.java | 8 ++++++++
1 file changed, 8 insertions(+)
New commits:
commit 57a1d2701b3c249e1f56e34fad3cd355b4193d31
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Tue Mar 5 16:09:06 2013 +0100
Deprecating inconsistent method (addFilterIds(List<Integer> filterIds)) since all the other criteria classes use the addFilterIds(Integer... filterIds)
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AbstractConfigurationUpdateCriteria.java b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AbstractConfigurationUpdateCriteria.java
index b58f221..fbec172 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AbstractConfigurationUpdateCriteria.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AbstractConfigurationUpdateCriteria.java
@@ -58,6 +58,14 @@ public abstract class AbstractConfigurationUpdateCriteria extends Criteria {
filterOverrides.put("endTime", "createdTime <= ?");
filterOverrides.put("statuses", "status IN ( ? )");
}
+
+ /**
+ * @param filterIds list of ids to filter
+ * @deprecated since 4.7.0 use {@link Criteria#addFilterIds(Integer... filterIds)} instead
+ */
+ public void addFilterIds(List<Integer> filterIds) {
+ super.addFilterIds(filterIds != null ? filterIds.toArray(new Integer[filterIds.size()]) : null);
+ }
public void addFilterStartTime(Long filterStartTime) {
this.filterStartTime = filterStartTime;
11 years, 2 months
[rhq] Changes to 'feature/provision/plugin-api'
by lkrejci
New branch 'feature/provision/plugin-api' available with the following commits:
commit 2c805e64abd1d8462da8affc6f149109a677b3a1
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Tue Mar 5 15:19:24 2013 +0100
First stab at the plugin API of the new provisioning subsystem.
11 years, 2 months
[rhq] Branch 'release/jon3.1.x' - 2 commits - modules/plugins
by Thomas Segismont
modules/plugins/jmx/src/test/java/org/rhq/plugins/jmx/test/JMXPluginTest.java | 20 +++++-----
1 file changed, 11 insertions(+), 9 deletions(-)
New commits:
commit 9e26c8474a297cf93136ba1cc47ef61de5bc93ef
Author: Thomas Segismont <tsegismo(a)redhat.com>
Date: Thu Feb 14 18:23:36 2013 +0100
Fix JMX plugin test failure
Cherry-picked from 42593fc
diff --git a/modules/plugins/jmx/src/test/java/org/rhq/plugins/jmx/test/JMXPluginTest.java b/modules/plugins/jmx/src/test/java/org/rhq/plugins/jmx/test/JMXPluginTest.java
index b841a38..9757c7a 100644
--- a/modules/plugins/jmx/src/test/java/org/rhq/plugins/jmx/test/JMXPluginTest.java
+++ b/modules/plugins/jmx/src/test/java/org/rhq/plugins/jmx/test/JMXPluginTest.java
@@ -72,8 +72,6 @@ import org.rhq.plugins.jmx.util.JvmResourceKey;
* @author Greg Hinkle
* @author Ian Springer
*/
-// Disabled until we find a fix for Sigar getProcCredName issue
-@Test(enabled = false)
public class JMXPluginTest {
private static final int JMX_REMOTING_PORT1 = 9921;
@@ -95,8 +93,9 @@ public class JMXPluginTest {
this.testServerJvms.add(startTestServerJvm("-Dcom.sun.management.jmxremote.port=" + JMX_REMOTING_PORT1,
"-Dcom.sun.management.jmxremote.ssl=false", "-Dcom.sun.management.jmxremote.authenticate=false"));
- this.testServerJvms.add(startTestServerJvm("-D" + JMXDiscoveryComponent.SYSPROP_RHQ_RESOURCE_KEY + "="
- + EXPLICIT_RESOURCE_KEY1));
+ // FIXME: Disabled until we find a fix for Sigar getProcCredName issue
+ // this.testServerJvms.add(startTestServerJvm("-D" + JMXDiscoveryComponent.SYSPROP_RHQ_RESOURCE_KEY + "="
+ // + EXPLICIT_RESOURCE_KEY1));
this.testServerJvms.add(startTestServerJvm("-Dcom.sun.management.jmxremote.port=" + JMX_REMOTING_PORT2,
"-Dcom.sun.management.jmxremote.ssl=false", "-Dcom.sun.management.jmxremote.authenticate=false",
@@ -206,7 +205,8 @@ public class JMXPluginTest {
}
}
assert foundJmxRemotingServer : "JMX Remoting server not found.";
- assert foundExplicitKey1Server : "Explicit key server not found.";
+ // FIXME: Disabled until we find a fix for Sigar getProcCredName issue
+ //assert foundExplicitKey1Server : "Explicit key server not found.";
assert foundExplicitKey2Server : "JMX Remoting + explicit key server not found.";
}
commit 9cc646d966f7fe6c728c5c55aebbc867d291b030
Author: Thomas Segismont <tsegismo(a)redhat.com>
Date: Tue Feb 12 10:29:18 2013 +0100
Disable JMXPluginTest (Sigar getProcCredName issue)
Cherry-picked from bc2c090
diff --git a/modules/plugins/jmx/src/test/java/org/rhq/plugins/jmx/test/JMXPluginTest.java b/modules/plugins/jmx/src/test/java/org/rhq/plugins/jmx/test/JMXPluginTest.java
index ee172ba..b841a38 100644
--- a/modules/plugins/jmx/src/test/java/org/rhq/plugins/jmx/test/JMXPluginTest.java
+++ b/modules/plugins/jmx/src/test/java/org/rhq/plugins/jmx/test/JMXPluginTest.java
@@ -39,22 +39,20 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.rhq.core.domain.configuration.Configuration;
-import org.rhq.core.domain.resource.ResourceCategory;
-import org.rhq.core.domain.resource.ResourceType;
-import org.rhq.plugins.jmx.JMXDiscoveryComponent;
-import org.rhq.plugins.jmx.util.JvmResourceKey;
import org.testng.annotations.AfterSuite;
import org.testng.annotations.BeforeSuite;
import org.testng.annotations.Test;
import org.rhq.core.clientapi.server.discovery.InventoryReport;
+import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.domain.measurement.AvailabilityType;
import org.rhq.core.domain.measurement.DataType;
import org.rhq.core.domain.measurement.MeasurementData;
import org.rhq.core.domain.measurement.MeasurementReport;
import org.rhq.core.domain.measurement.MeasurementScheduleRequest;
import org.rhq.core.domain.resource.Resource;
+import org.rhq.core.domain.resource.ResourceCategory;
+import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.pc.PluginContainer;
import org.rhq.core.pc.PluginContainerConfiguration;
import org.rhq.core.pc.inventory.InventoryManager;
@@ -65,6 +63,8 @@ import org.rhq.core.pc.util.InventoryPrinter;
import org.rhq.core.pluginapi.inventory.ResourceComponent;
import org.rhq.core.pluginapi.measurement.MeasurementFacet;
import org.rhq.core.pluginapi.operation.OperationFacet;
+import org.rhq.plugins.jmx.JMXDiscoveryComponent;
+import org.rhq.plugins.jmx.util.JvmResourceKey;
/**
* Integration test for the JMX plugin.
@@ -72,6 +72,8 @@ import org.rhq.core.pluginapi.operation.OperationFacet;
* @author Greg Hinkle
* @author Ian Springer
*/
+// Disabled until we find a fix for Sigar getProcCredName issue
+@Test(enabled = false)
public class JMXPluginTest {
private static final int JMX_REMOTING_PORT1 = 9921;
@@ -85,7 +87,7 @@ public class JMXPluginTest {
private List<Process> testServerJvms = new ArrayList<Process>();
private InventoryManager inventoryManager;
-
+
@BeforeSuite
public void start() {
try {
11 years, 2 months
[rhq] modules/plugins
by Thomas Segismont
modules/plugins/netservices/pom.xml | 4 ----
modules/plugins/netservices/src/test/java/org/rhq/plugins/netservices/itest/PortNetServiceComponentTest.java | 9 +++++----
2 files changed, 5 insertions(+), 8 deletions(-)
New commits:
commit 04cdaa393c5b10441d246d09a3290504fb289c3e
Author: Thomas Segismont <tsegismont(a)gmail.com>
Date: Tue Mar 5 10:39:39 2013 +0100
Fix netservices itest failure
INetAddress.getLocalhostAddress was used to bind the server socket instead of INetAddress.getLoopbackAddress
Removed pom commented section and let unit and integration tests be deactivated by default like in all other modules
diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml
index 8a69866..03a4cbd 100644
--- a/modules/plugins/netservices/pom.xml
+++ b/modules/plugins/netservices/pom.xml
@@ -101,10 +101,6 @@
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
- <!-- TODO: Move this test execution to a profile or respect skipTests
- <skipTests>false</skipTests>
- <skipITs>false</skipITs>
- -->
<includes>
<!-- only include integration tests; normal unit tests are handled above by surefire plugin -->
<include>org/rhq/plugins/netservices/itest/**/*Test.java</include>
diff --git a/modules/plugins/netservices/src/test/java/org/rhq/plugins/netservices/itest/PortNetServiceComponentTest.java b/modules/plugins/netservices/src/test/java/org/rhq/plugins/netservices/itest/PortNetServiceComponentTest.java
index f97b222..75a9370 100644
--- a/modules/plugins/netservices/src/test/java/org/rhq/plugins/netservices/itest/PortNetServiceComponentTest.java
+++ b/modules/plugins/netservices/src/test/java/org/rhq/plugins/netservices/itest/PortNetServiceComponentTest.java
@@ -60,7 +60,7 @@ public class PortNetServiceComponentTest extends NetServiceComponentTest {
private static final String SERVICE_NAME = "PortService";
- private static final String LOOPBACK = "127.0.0.1";
+ private static final InetAddress LOOPBACK_ADDRESS = InetAddress.getLoopbackAddress();
private PortNetServiceComponent portNetServiceComponent;
@@ -76,10 +76,11 @@ public class PortNetServiceComponentTest extends NetServiceComponentTest {
public void startSocketServer() throws Exception {
LOG.info("Setting up a socket server");
// Let's bind a server socket to any available port
- serverSocket = new ServerSocket(0, 50, InetAddress.getLocalHost());
+ serverSocket = new ServerSocket(0, 50, LOOPBACK_ADDRESS);
// Do not block indefinitely on call to #accept
serverSocket.setSoTimeout(1000);
serverSocketLocalPort = serverSocket.getLocalPort();
+ LOG.info("Using port " + serverSocketLocalPort + " for socket server");
acceptorThread = new Thread(new Runnable() {
@Override
public void run() {
@@ -109,7 +110,7 @@ public class PortNetServiceComponentTest extends NetServiceComponentTest {
@Test(dependsOnMethods = "testPluginLoad")
public void testManualAdd() throws Exception {
Configuration configuration = new Configuration();
- configuration.setSimpleValue(ConfigKeys.ADDRESS, LOOPBACK);
+ configuration.setSimpleValue(ConfigKeys.ADDRESS, LOOPBACK_ADDRESS.getHostAddress());
configuration.setSimpleValue(ConfigKeys.PORT, String.valueOf(serverSocketLocalPort));
MergeResourceResponse response = getInventoryManager().manuallyAddResource(
getPluginManager().getMetadataManager().getType(SERVICE_NAME, PLUGIN_NAME), getPlatform().getId(),
@@ -143,7 +144,7 @@ public class PortNetServiceComponentTest extends NetServiceComponentTest {
for (MeasurementData data : report.getTraitData()) {
datas.put(data.getName(), data.getValue());
}
- assertEquals(getTrait(datas, "ipAddress"), LOOPBACK);
+ assertEquals(getTrait(datas, "ipAddress"), LOOPBACK_ADDRESS.getHostAddress());
assertTrue(StringUtil.isNotBlank(getTrait(datas, "hostName")));
assertTrue(getMetric(datas, "connectTime") >= 0);
}
11 years, 2 months
[rhq] Branch 'mtho11/d3-charts-master' - modules/enterprise
by mike thompson
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractD3GraphListView.java | 4 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/AbstractTwoLevelTabSetView.java | 15 ++----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java | 7 --
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java | 24 +++++-----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java | 13 ++++-
5 files changed, 33 insertions(+), 30 deletions(-)
New commits:
commit dddb8e54eddabc90e48aa4f913ee207ffa58f579
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Mon Mar 4 16:14:46 2013 -0800
Charting - Replace the AbstractD3GraphListView with Generics version in AbstractTwoLevelTabSetView.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractD3GraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractD3GraphListView.java
index dd12c72..6ca58c0 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractD3GraphListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractD3GraphListView.java
@@ -37,7 +37,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
* Provide the shared stuff for create GraphListViews like Availability graphs
* and User Preferences pickers for the date range.
*/
-public class AbstractD3GraphListView extends LocatableVLayout {
+public abstract class AbstractD3GraphListView extends LocatableVLayout {
protected PageList<Availability> availabilityList;
protected AvailabilityD3Graph availabilityGraph;
protected static Label loadingLabel = new Label(MSG.common_msg_loading());
@@ -49,6 +49,8 @@ public class AbstractD3GraphListView extends LocatableVLayout {
measurementRangeEditor = new UserPreferencesMeasurementRangeEditor(this.getLocatorId());
}
+ public abstract void redrawGraphs();
+
protected void queryAvailability(final int resourceId, final CountDownLatch countDownLatch) {
final long startTime = System.currentTimeMillis();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/AbstractTwoLevelTabSetView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/AbstractTwoLevelTabSetView.java
index cb8d857..adf8a78 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/AbstractTwoLevelTabSetView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/AbstractTwoLevelTabSetView.java
@@ -42,6 +42,7 @@ import org.rhq.enterprise.gui.coregui.client.components.tab.TwoLevelTabSelectedE
import org.rhq.enterprise.gui.coregui.client.components.tab.TwoLevelTabSelectedHandler;
import org.rhq.enterprise.gui.coregui.client.components.tab.TwoLevelTabSet;
import org.rhq.enterprise.gui.coregui.client.components.view.ViewFactory;
+import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractD3GraphListView;
import org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.D3GroupGraphListView;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.D3GraphListView;
import org.rhq.enterprise.gui.coregui.client.util.Log;
@@ -51,7 +52,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
* @author Greg Hinkle
* @author Ian Springer
*/
-public abstract class AbstractTwoLevelTabSetView<T, U extends Layout> extends LocatableVLayout implements
+public abstract class AbstractTwoLevelTabSetView<T, U extends Layout, V extends AbstractD3GraphListView> extends LocatableVLayout implements
BookmarkableView, TwoLevelTabSelectedHandler {
private String baseViewPath;
@@ -60,8 +61,7 @@ public abstract class AbstractTwoLevelTabSetView<T, U extends Layout> extends Lo
private String subTabName;
private U titleBar;
protected Set<Permission> globalPermissions;
- protected D3GraphListView d3GraphListView;
- protected D3GroupGraphListView d3GroupGraphListView;
+ protected V graphListView;
public AbstractTwoLevelTabSetView(String locatorId, String baseViewPath) {
super(locatorId);
@@ -92,11 +92,11 @@ public abstract class AbstractTwoLevelTabSetView<T, U extends Layout> extends Lo
public abstract Integer getSelectedItemId();
protected abstract U createTitleBar();
+ protected abstract V createD3GraphListView();
protected abstract List<TwoLevelTab> createTabs();
/**
- * TODO
*
* @param itemId
* @param viewPath
@@ -236,11 +236,8 @@ public abstract class AbstractTwoLevelTabSetView<T, U extends Layout> extends Lo
// safely rendered. Make sure to notify even on failure.
try {
this.selectTab(this.tabName, this.subTabName, viewPath);
- if(null != d3GraphListView){
- d3GraphListView.redrawGraphs();
- }
- if(null != d3GroupGraphListView){
- d3GroupGraphListView.redrawGraphs();
+ if(null != graphListView){
+ graphListView.redrawGraphs();
}
} finally {
notifyViewRenderedListeners();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java
index 6c775cf..e23a127 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java
@@ -74,19 +74,16 @@ public class D3GroupGraphListView extends AbstractD3GraphListView {
}
if (resourceGroup != null) {
- buildGraphs();
+ redrawGraphs();
}
}
- public void redrawGraphs(){
- buildGraphs();
- }
/**
* Build whatever graph metrics (MeasurementDefinitions) are defined for the resource.
*/
- private void buildGraphs() {
+ public void redrawGraphs() {
List<Long> startEndList = measurementRangeEditor.getBeginEndTimes();
final long startTime = startEndList.get(0);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
index 753e203..d5f341f 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
@@ -87,7 +87,7 @@ import java.util.Set;
* @author Jay Shaughnessy
* @author Ian Springer
*/
-public class ResourceGroupDetailView extends AbstractTwoLevelTabSetView<ResourceGroupComposite, ResourceGroupTitleBar> {
+public class ResourceGroupDetailView extends AbstractTwoLevelTabSetView<ResourceGroupComposite, ResourceGroupTitleBar,D3GroupGraphListView> {
public static final String AUTO_CLUSTER_VIEW = "ResourceGroup/AutoCluster";
public static final String AUTO_GROUP_VIEW = "Resource/AutoGroup";
@@ -164,6 +164,12 @@ public class ResourceGroupDetailView extends AbstractTwoLevelTabSetView<Resource
}
@Override
+ protected D3GroupGraphListView createD3GraphListView() {
+ graphListView = new D3GroupGraphListView(monitoringTab.extendLocatorId("NewGraphs"), groupComposite.getResourceGroup(), true);
+ return graphListView;
+ }
+
+ @Override
protected List<TwoLevelTab> createTabs() {
List<TwoLevelTab> tabs = new ArrayList<TwoLevelTab>();
@@ -324,9 +330,7 @@ public class ResourceGroupDetailView extends AbstractTwoLevelTabSetView<Resource
viewFactory = (!visibleToIE8) ? null : new ViewFactory() {
@Override
public Canvas createView() {
- d3GroupGraphListView = new D3GroupGraphListView(monitoringTab.extendLocatorId("NewGraphs"), groupComposite.getResourceGroup(), true);
- return d3GroupGraphListView;
-
+ return createD3GraphListView();
}
};
@@ -599,11 +603,8 @@ public class ResourceGroupDetailView extends AbstractTwoLevelTabSetView<Resource
group.setResourceType(type);
updateTabContent(groupComposite, viewPath.isRefresh());
selectTab(getTabName(), getSubTabName(), viewPath);
- Log.debug(" **** 1 *****"+d3GroupGraphListView);
- if(null != d3GroupGraphListView){
- Log.debug(" *** Refreshing Group D3 Graphs");
- d3GroupGraphListView.redrawGraphs();
- Log.debug(" **** 2 *****");
+ if(null != graphListView){
+ graphListView.redrawGraphs();
}
} finally {
notifyViewRenderedListeners();
@@ -614,9 +615,8 @@ public class ResourceGroupDetailView extends AbstractTwoLevelTabSetView<Resource
try {
updateTabContent(groupComposite, viewPath.isRefresh());
selectTab(getTabName(), getSubTabName(), viewPath);
- Log.debug(" **** 3 *****");
- if(null != d3GroupGraphListView){
- d3GroupGraphListView.redrawGraphs();
+ if(null != graphListView){
+ graphListView.redrawGraphs();
}
} finally {
notifyViewRenderedListeners();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
index ec1560f..52eb5bc 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
@@ -87,7 +87,7 @@ import org.rhq.enterprise.gui.coregui.client.util.message.Message;
* @author Jay Shaughnessy
* @author Greg Hinkle
*/
-public class ResourceDetailView extends AbstractTwoLevelTabSetView<ResourceComposite, ResourceTitleBar> {
+public class ResourceDetailView extends AbstractTwoLevelTabSetView<ResourceComposite, ResourceTitleBar, D3GraphListView> {
private static final String BASE_VIEW_PATH = "Resource";
@@ -286,6 +286,12 @@ public class ResourceDetailView extends AbstractTwoLevelTabSetView<ResourceCompo
}
@Override
+ protected D3GraphListView createD3GraphListView() {
+ graphListView = D3GraphListView.createSummaryMultipleGraphs(monitoringTab.extendLocatorId("NewGraphs"), resourceComposite.getResource(), true);
+ return graphListView;
+ }
+
+ @Override
protected void updateTabContent(ResourceComposite resourceComposite, boolean isRefresh) {
super.updateTabContent(resourceComposite, isRefresh);
@@ -434,8 +440,9 @@ public class ResourceDetailView extends AbstractTwoLevelTabSetView<ResourceCompo
viewFactory = (!visibleToIE8) ? null : new ViewFactory() {
@Override
public Canvas createView() {
- d3GraphListView = D3GraphListView.createSummaryMultipleGraphs(monitoringTab.extendLocatorId("NewGraphs"), resourceComposite.getResource(), true);
- return d3GraphListView;
+ //d3GraphListView = D3GraphListView.createSummaryMultipleGraphs(monitoringTab.extendLocatorId("NewGraphs"), resourceComposite.getResource(), true);
+ //return d3GraphListView;
+ return createD3GraphListView();
}
};
updateSubTab(this.monitoringTab, this.monitorNewGraphs, visible, visibleToIE8, viewFactory);
11 years, 2 months