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
| 6 +++-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.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
| 9 +++---
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java
| 14 +++++-----
6 files changed, 30 insertions(+), 17 deletions(-)
New commits:
commit a1999de85f349c005321de76ee58e4d1337b0561
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Thu Feb 28 15:36:20 2013 -0800
Charting - Add new Availability charts to summary sparkline popup charts.
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 591dfb7..6f3aad7 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
@@ -55,8 +55,10 @@ import
org.rhq.enterprise.gui.coregui.client.dashboard.PortletViewFactory;
import
org.rhq.enterprise.gui.coregui.client.dashboard.portlets.PortletConfigurationEditorComponent.Constant;
import
org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups.GroupMetricsPortlet;
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.D3GraphListView;
import
org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
import org.rhq.enterprise.gui.coregui.client.util.BrowserUtility;
@@ -277,6 +279,11 @@ 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());
graphView.addSetButtonClickHandler(new ClickHandler()
@@ -284,13 +291,14 @@ public class ResourceMetricsPortlet extends GroupMetricsPortlet {
@Override
public void
onClick(ClickEvent event)
{
+
availabilityGraph.drawGraph();
graphView.redrawGraphs();
}
});
+
window.addItem(graphView);
window.show();
- markForRedraw();
}
});
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 76eb8d2..dd12c72 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
@@ -33,12 +33,16 @@ 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;
+/**
+ * Provide the shared stuff for create GraphListViews like Availability graphs
+ * and User Preferences pickers for the date range.
+ */
public class AbstractD3GraphListView extends LocatableVLayout {
protected PageList<Availability> availabilityList;
protected AvailabilityD3Graph availabilityGraph;
protected static Label loadingLabel = new Label(MSG.common_msg_loading());
protected UserPreferencesMeasurementRangeEditor measurementRangeEditor;
- protected boolean monitorDetailView = false;
+ protected boolean showAvailabilityGraph = false;
public AbstractD3GraphListView(String locatorId){
super(locatorId);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java
index 80164c6..ee56f9b 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java
@@ -629,8 +629,8 @@ public abstract class AbstractActivityView extends LocatableVLayout
implements R
} else {
setTitle(CHART_TITLE + ": " + title);
}
- setShowMinimizeButton(true);
- setShowMaximizeButton(true);
+ setShowMinimizeButton(false);
+ setShowMaximizeButton(false);
setShowCloseButton(true);
setIsModal(true);
setShowModalMask(true);
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 1d4c80d..623518f 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
@@ -54,7 +54,7 @@ public class D3GroupGraphListView extends AbstractD3GraphListView {
public D3GroupGraphListView(String locatorId, ResourceGroup resourceGroup, boolean
monitorDetailView) {
super(locatorId);
this.resourceGroup = resourceGroup;
- this.monitorDetailView = monitorDetailView;
+ this.showAvailabilityGraph = monitorDetailView;
setOverflow(Overflow.AUTO);
}
@@ -65,7 +65,7 @@ public class D3GroupGraphListView extends AbstractD3GraphListView {
destroyMembers();
addMember(measurementRangeEditor);
- if (monitorDetailView) {
+ if (showAvailabilityGraph) {
availabilityGraph = new AvailabilityD3Graph("avail", new
AvailabilityLineGraphType(resourceGroup.getId()));
// first step in 2 step to create d3 chart
// create a placeholder for avail graph
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
index d67ef29..a8834c8 100644
---
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
@@ -31,6 +31,9 @@ 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 {
@@ -40,7 +43,7 @@ public class AvailabilityD3Graph extends LocatableVLayout implements
Availabilit
public AvailabilityD3Graph(String locatorId, AvailabilityLineGraphType graphType) {
super(locatorId);
this.availabilityGraphType = graphType;
- setHeight100();
+ setHeight(25);
setWidth100();
}
@@ -49,7 +52,6 @@ public class AvailabilityD3Graph extends LocatableVLayout implements
Availabilit
super.onDraw();
removeMembers(getMembers());
createGraphMarker();
- //drawGraph();
}
@Override
@@ -80,7 +82,7 @@ public class AvailabilityD3Graph extends LocatableVLayout implements
Availabilit
divAndSvgDefs.append("</svg></div>");
HTMLFlow graph = new HTMLFlow(divAndSvgDefs.toString());
graph.setWidth100();
- graph.setHeight100();
+ graph.setHeight(25);
addMember(graph);
}
@@ -94,7 +96,6 @@ public class AvailabilityD3Graph extends LocatableVLayout implements
Availabilit
*/
public void drawGraph() {
- Log.debug("*** Draw");
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 e17bddd..635c9de 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
@@ -63,15 +63,14 @@ public class D3GraphListView extends AbstractD3GraphListView {
private Resource resource;
private Set<Integer> definitionIds = null;
- private UserPreferencesMeasurementRangeEditor measurementRangeEditor;
private boolean useSummaryData = false;
private PageList<MeasurementOOBComposite> measurementOOBCompositeList;
private List<List<MeasurementDataNumericHighLowComposite>>
metricsDataList;
public static D3GraphListView createMultipleGraphs(String locatorId, Resource
resource, Set<Integer> definitionIds,
- boolean monitorDetailView) {
+ boolean showAvailabilityGraph) {
- return new D3GraphListView(locatorId, resource, definitionIds,
monitorDetailView);
+ return new D3GraphListView(locatorId, resource, definitionIds,
showAvailabilityGraph);
}
public static D3GraphListView createSummaryMultipleGraphs(String locatorId, Resource
resource,
@@ -85,18 +84,19 @@ public class D3GraphListView extends AbstractD3GraphListView {
return new D3GraphListView(locatorId, resource, definitionIds, false);
}
+
private D3GraphListView(String locatorId, Resource resource, Set<Integer>
definitionIds, boolean monitorDetailView) {
super(locatorId);
this.resource = resource;
commonConstructorSettings();
this.definitionIds = definitionIds;
- this.monitorDetailView = monitorDetailView;
+ this.showAvailabilityGraph = monitorDetailView;
}
- private D3GraphListView(String locatorId, Resource resource, boolean
monitorDetailView) {
+ private D3GraphListView(String locatorId, Resource resource, boolean
showAvailabilityGraph) {
super(locatorId);
this.resource = resource;
- this.monitorDetailView = monitorDetailView;
+ this.showAvailabilityGraph = showAvailabilityGraph;
commonConstructorSettings();
useSummaryData = true;
}
@@ -118,7 +118,7 @@ public class D3GraphListView extends AbstractD3GraphListView {
destroyMembers();
addMember(measurementRangeEditor);
- if (monitorDetailView) {
+ if (showAvailabilityGraph) {
availabilityGraph = new AvailabilityD3Graph("avail", new
AvailabilityLineGraphType(resource.getId()));
// first step in 2 step to create d3 chart
// create a placeholder for avail graph