modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractD3GraphListView.java
| 17 --
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java
| 55 +++---
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java
| 1
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java
| 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3MultiLineGraph.java
| 10 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupMultiLineGraphListView.java
| 79 ----------
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMeasurementTableView.java
| 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/AvailabilityD3GraphView.java
| 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java
| 2
9 files changed, 41 insertions(+), 131 deletions(-)
New commits:
commit 9578cd367d1fdb028f2f38cff56135d410c8bc3e
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Wed Sep 25 15:43:20 2013 -0700
Add Date/Time range feedback of period being selected for charting. In addition to
showing the time range (i.e., X - Y) also show the length of the interval (i.e, '4
hours'). This applies to all chart types: resource, group, and multi-line.
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 451659b..077a504 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
@@ -18,7 +18,6 @@
*/
package org.rhq.enterprise.gui.coregui.client.inventory.common;
-import java.util.Date;
import java.util.List;
import com.google.gwt.user.client.Timer;
@@ -28,7 +27,6 @@ import org.rhq.core.domain.common.EntityContext;
import org.rhq.core.domain.measurement.Availability;
import org.rhq.core.domain.resource.group.composite.ResourceGroupAvailability;
import org.rhq.enterprise.gui.coregui.client.UserSessionManager;
-import
org.rhq.enterprise.gui.coregui.client.components.measurement.AbstractMeasurementRangeEditor;
import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil;
import org.rhq.enterprise.gui.coregui.client.inventory.AutoRefresh;
import
org.rhq.enterprise.gui.coregui.client.inventory.common.graph.ButtonBarDateTimeRangeEditor;
@@ -48,11 +46,11 @@ public abstract class AbstractD3GraphListView extends EnhancedVLayout
implements
protected static final Label loadingLabel = new Label(MSG.common_msg_loading());
protected List<Availability> availabilityList;
protected List<ResourceGroupAvailability> groupAvailabilityList;
- protected AvailabilityD3GraphView availabilityGraph;
+ protected static AvailabilityD3GraphView availabilityGraph;
protected final MeasurementUserPreferences measurementUserPrefs;
protected boolean showAvailabilityGraph = false;
protected final ButtonBarDateTimeRangeEditor buttonBarDateTimeRangeEditor;
- protected Timer refreshTimer;
+ protected static Timer refreshTimer;
protected boolean isRefreshing;
public AbstractD3GraphListView() {
@@ -90,7 +88,7 @@ public abstract class AbstractD3GraphListView extends EnhancedVLayout
implements
if (isVisible() && !isRefreshing()) {
isRefreshing = true;
try {
- updateTimeRangeToNow();
+ buttonBarDateTimeRangeEditor.updateTimeRangeToNow();
refreshData();
} finally {
isRefreshing = false;
@@ -98,13 +96,4 @@ public abstract class AbstractD3GraphListView extends EnhancedVLayout
implements
}
}
- protected void updateTimeRangeToNow() {
- Date now = new Date();
- AbstractMeasurementRangeEditor.MetricRangePreferences metricRangePreferences =
measurementUserPrefs
- .getMetricRangePreferences();
- long timeRange = metricRangePreferences.end - metricRangePreferences.begin;
- Date newStartDate = new Date(now.getTime() - timeRange);
- buttonBarDateTimeRangeEditor.updateDateTimeRangeDisplay(newStartDate, now);
- buttonBarDateTimeRangeEditor.saveDateRange(newStartDate.getTime(),
now.getTime());
- }
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java
index 5a81ab3..778bbb2 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java
@@ -20,7 +20,6 @@ package org.rhq.enterprise.gui.coregui.client.inventory.common.graph;
import java.util.Date;
-import com.google.gwt.i18n.client.DateTimeFormat;
import com.smartgwt.client.types.FormErrorOrientation;
import com.smartgwt.client.types.SelectionType;
import com.smartgwt.client.types.VerticalAlignment;
@@ -58,11 +57,11 @@ public class ButtonBarDateTimeRangeEditor extends EnhancedVLayout {
private static final String TIMERANGE = "graphtimerange";
private static final int BUTTON_WIDTH = 28;
+ public final String DATE_TIME_FORMAT =
MSG.common_buttonbar_datetime_format_moment_js();
private MeasurementUserPreferences measurementUserPreferences;
private Refreshable d3GraphListView;
private Label dateRangeLabel;
- private static final DateTimeFormat fmt =
DateTimeFormat.getFormat(MSG.common_buttonbar_datetime_format());
private DateTimeButtonBarClickHandler dateTimeButtonBarClickHandler;
private AbstractMeasurementRangeEditor.MetricRangePreferences prefs;
final private ButtonBarDateTimeRangeEditor self;
@@ -80,8 +79,6 @@ public class ButtonBarDateTimeRangeEditor extends EnhancedVLayout {
dateTimeButtonBarClickHandler = new DateTimeButtonBarClickHandler();
prefs = measurementUserPreferences.getMetricRangePreferences();
- Log.debug("ButtonBarDateTimeRangeEditor initialized with start Date: "
+ new Date(prefs.begin) + " end Date: "
- + new Date(prefs.end));
}
@@ -123,7 +120,7 @@ public class ButtonBarDateTimeRangeEditor extends EnhancedVLayout {
dateRangeLabel = new Label();
dateRangeLabel.setWidth(400);
dateRangeLabel.addStyleName("graphDateTimeRangeLabel");
- updateDateTimeRangeDisplay(new Date(prefs.begin), new Date(prefs.end));
+ showUserFriendlyTimeRange(new Date(prefs.begin).getTime(), new
Date(prefs.end).getTime());
toolStrip.addMember(dateRangeLabel);
toolStrip.addSpacer(20);
@@ -151,10 +148,6 @@ public class ButtonBarDateTimeRangeEditor extends EnhancedVLayout {
createButtons();
}
- public Label getDateRangeLabel() {
- return dateRangeLabel;
- }
-
public Long getStartTime() {
return measurementUserPreferences.getMetricRangePreferences().begin;
}
@@ -175,11 +168,24 @@ public class ButtonBarDateTimeRangeEditor extends EnhancedVLayout {
return new Date(endDate.getTime() - dateTimeOffset);
}
- public void updateDateTimeRangeDisplay(Date startDate, Date endDate) {
- String rangeString = fmt.format(startDate) + " - " +
fmt.format(endDate);
- if (null != dateRangeLabel) {
- dateRangeLabel.setContents(rangeString);
- }
+ public native void showUserFriendlyTimeRange(double startTime, double endTime) /*-{
+ "use strict";
+ var startDateMoment = $wnd.moment(startTime),
+ endDateMoment = $wnd.moment(endTime),
+ dateTimeFormat =
this.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.ButtonBarDateTimeRangeEditor::DATE_TIME_FORMAT,
+ formattedDateRange = startDateMoment.format(dateTimeFormat) + ' - '
+ endDateMoment.format(dateTimeFormat),
+ timeRange = endDateMoment.from(startDateMoment,true);
+ $wnd.jQuery('.graphDateTimeRangeLabel').text(formattedDateRange+'
('+timeRange+')');
+ }-*/;
+
+ public void updateTimeRangeToNow() {
+ Log.debug("Updating timerange to now");
+ Date now = new Date();
+ AbstractMeasurementRangeEditor.MetricRangePreferences metricRangePreferences =
measurementUserPreferences.getMetricRangePreferences();
+ long timeRange = metricRangePreferences.end - metricRangePreferences.begin;
+ Date newStartDate = new Date(now.getTime() - timeRange);
+ showUserFriendlyTimeRange(newStartDate.getTime(), now.getTime());
+ saveDateRange(newStartDate.getTime(), now.getTime());
}
/**
@@ -190,8 +196,7 @@ public class ButtonBarDateTimeRangeEditor extends EnhancedVLayout {
* @param endTime double because JSNI doesn't support long
*/
public void saveDateRange(double startTime, double endTime) {
- final boolean advanced = true;
- prefs.explicitBeginEnd = advanced;
+ prefs.explicitBeginEnd = true; // default to advanced
prefs.begin = (long) startTime;
prefs.end = (long) endTime;
if (null != prefs.begin && null != prefs.end && prefs.begin >
prefs.end) {
@@ -208,10 +213,11 @@ public class ButtonBarDateTimeRangeEditor extends EnhancedVLayout {
public void onClick(ClickEvent clickEvent) {
IButton button = (IButton) clickEvent.getSource();
String selectedDateTimeRange = button.getTitle();
- Date calculatedStartDateTime = calculateStartDate(new Date(),
selectedDateTimeRange);
- saveDateRange(calculatedStartDateTime.getTime(), new Date().getTime());
+ Date now = new Date();
+ Date calculatedStartDateTime = calculateStartDate(now,
selectedDateTimeRange);
+ saveDateRange(calculatedStartDateTime.getTime(), now.getTime());
redrawGraphs();
- updateDateTimeRangeDisplay(calculatedStartDateTime, new Date());
+ showUserFriendlyTimeRange(calculatedStartDateTime.getTime(), now.getTime());
}
}
@@ -226,19 +232,10 @@ public class ButtonBarDateTimeRangeEditor extends EnhancedVLayout {
private final String label;
private final long timeSpanInSeconds;
- private final ClickHandler clickHandler;
DateTimeButton(String label, long timeSpanInSeconds) {
this.label = label;
this.timeSpanInSeconds = timeSpanInSeconds;
- this.clickHandler = new ClickHandler() {
- @Override
- public void onClick(ClickEvent clickEvent) {
- IButton button = (IButton) clickEvent.getSource();
-
- }
- };
-
}
}
@@ -307,7 +304,7 @@ public class ButtonBarDateTimeRangeEditor extends EnhancedVLayout {
.getMinutes());
buttonBarDateTimeRangeEditor.saveDateRange(newStartDate.getTime(),
newEndDate.getTime());
redrawGraphs();
- updateDateTimeRangeDisplay(startDateItem.getValueAsDate(),
endDateItem.getValueAsDate());
+ showUserFriendlyTimeRange(startDateItem.getValueAsDate().getTime(),
endDateItem.getValueAsDate().getTime());
CustomDateRangeWindow.this.destroy();
}
});
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 bcb223a..dcfb744 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
@@ -141,6 +141,7 @@ public final class D3GroupGraphListView extends
AbstractD3GraphListView implemen
@Override
public void run() {
availabilityGraph.drawJsniChart();
+ buttonBarDateTimeRangeEditor.updateTimeRangeToNow();
}
}.schedule(150);
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java
index 274354a..013696f 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java
@@ -103,6 +103,7 @@ public abstract class CompositeGroupD3GraphListView extends
EnhancedVLayout impl
}
public void populateData() {
+ buttonBarDateTimeRangeEditor.updateTimeRangeToNow();
ResourceGroupGWTServiceAsync groupService =
GWTServiceLookup.getResourceGroupService();
ResourceGroupCriteria criteria = new ResourceGroupCriteria();
@@ -142,6 +143,7 @@ public abstract class CompositeGroupD3GraphListView extends
EnhancedVLayout impl
Log.warn("# of charted graphs: " +
measurementForEachResource.size());
}
drawGraph();
+ buttonBarDateTimeRangeEditor.updateTimeRangeToNow();
}
});
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3MultiLineGraph.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3MultiLineGraph.java
index b89cc71..063cfdf 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3MultiLineGraph.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3MultiLineGraph.java
@@ -31,7 +31,7 @@ public class CompositeGroupD3MultiLineGraph extends
CompositeGroupD3GraphListVie
@Override
public native void drawJsniChart() /*-{
- console.log("Draw d3 MultiLine jsni chart");
+ //console.log("Draw d3 MultiLine jsni chart");
var MultiLineChartContext = function (chartId, chartHeight, metricsData,
xAxisLabel, chartTitle, yAxisUnits, minChartTitle, avgChartTitle, peakChartTitle,
dateLabel, timeLabel, chartHoverTimeFormat, chartHoverDateFormat, isPortalGraph, portalId,
buttonBarDateTimeFormat, chartXaxisTimeFormatHours, chartXaxisTimeFormatHoursMinutes) {
"use strict";
@@ -104,7 +104,7 @@ public class CompositeGroupD3MultiLineGraph extends
CompositeGroupD3GraphListVie
function determineScale() {
var xTicks, xTickSubDivide;
- console.log("DetermineScale for # resources: "+
chartContext.data.length);
+ //console.log("DetermineScale for # resources: "+
chartContext.data.length);
if (chartContext.data.length > 0) {
xTicks = 8;
@@ -299,16 +299,16 @@ public class CompositeGroupD3MultiLineGraph extends
CompositeGroupD3GraphListVie
draw: function (chartContext) {
"use strict";
// Guard condition that can occur when a portlet has not been
configured yet
- console.log("multi-resource chart handle:" +
chartContext.chartHandle);
+ //console.log("multi-resource chart handle:" +
chartContext.chartHandle);
if (chartContext.data.length > 0) {
- console.log("Creating MultiLine Chart: " +
chartContext.chartSelection + " --> " + chartContext.chartTitle);
+ //console.log("Creating MultiLine Chart: " +
chartContext.chartSelection + " --> " + chartContext.chartTitle);
determineScale();
createHeader(chartContext.chartTitle);
createYAxisGridLines();
createMultiLines(chartContext);
createXandYAxes();
createLegend();
- console.log("finished drawing multi-line graph");
+ //console.log("finished drawing multi-line graph");
}
}
}; // end public closure
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupMultiLineGraphListView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupMultiLineGraphListView.java
deleted file mode 100644
index 101df60..0000000
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupMultiLineGraphListView.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * 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 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.groups.detail.monitoring.table;
-
-
-import org.rhq.enterprise.gui.coregui.client.CoreGUI;
-import org.rhq.enterprise.gui.coregui.client.Messages;
-
-/**
- * A MultiLine version of the Composite group single metric multiple resource charts.
- *
- * @author Mike Thompson
- */
-public final class CompositeGroupMultiLineGraphListView extends
CompositeGroupD3GraphListView
-{
- private static final Messages MSG = CoreGUI.getMessages();
-
- public CompositeGroupMultiLineGraphListView(int groupId, int defId, boolean
isAutogroup)
- {
- super(groupId, defId, isAutogroup);
- }
-
-
-
- @Override
- public native void drawJsniChart() /*-{
- console.log("Draw nvd3 charts for composite multiline graph");
- var chartId =
global.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getChartId()(),
- chartHandle = "#mChart-"+chartId,
- chartSelection = chartHandle + " svg",
- yAxisUnits =
this.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getYAxisUnits()(),
- xAxisLabel =
this.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getXAxisTitle()(),
- xAxisTimeFormat =
this.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupMultiLineGraphListView::getXAxisTimeFormatHoursMinutes()();
- json =
eval(this.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getJsonMetrics()());
-
- $wnd.nv.addGraph(function() {
- var chart = $wnd.nv.models.lineChart();
-
- chart.xAxis.axisLabel(xAxisLabel)
- .tickFormat(function(d) { return
$wnd.d3.time.format(xAxisTimeFormat)(new Date(d)) });
-
- chart.yAxis
- .axisLabel(yAxisUnits)
- .tickFormat($wnd.d3.format('.02f'));
-
- $wnd.d3.select(chartSelection)
- .datum(json)
- .transition().duration(300)
- .call(chart);
-
- $wnd.nv.utils.windowResize(chart.update);
-
- return chart;
- });
-
- }-*/;
-
-
-
- public String getXAxisTimeFormatHoursMinutes() {
- return MSG.chart_xaxis_time_format_hours_minutes();
- }
-}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMeasurementTableView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMeasurementTableView.java
index b29e59a..eb0540a 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMeasurementTableView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMeasurementTableView.java
@@ -97,7 +97,7 @@ public class GroupMeasurementTableView extends
Table<GroupMetricsTableDataSource
AbstractMeasurementRangeEditor.MetricRangePreferences metricRangePreferences
= measurementUserPrefs.getMetricRangePreferences();
long timeRange = metricRangePreferences.end - metricRangePreferences.begin;
Date newStartDate = new Date(now.getTime() - timeRange);
- buttonBarDateTimeRangeEditor.updateDateTimeRangeDisplay(newStartDate, now);
+
buttonBarDateTimeRangeEditor.showUserFriendlyTimeRange(newStartDate.getTime(),
now.getTime());
buttonBarDateTimeRangeEditor.saveDateRange(newStartDate.getTime(),
now.getTime());
refreshData();
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/AvailabilityD3GraphView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/AvailabilityD3GraphView.java
index b914cd4..d46aa8c 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/AvailabilityD3GraphView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/AvailabilityD3GraphView.java
@@ -47,8 +47,8 @@ public class AvailabilityD3GraphView<T extends
AvailabilityGraphType> extends En
}
@Override
- protected void onDraw() {
- super.onDraw();
+ protected void onInit() {
+ super.onInit();
removeMembers(getMembers());
addGraphMarkerComponent();
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java
index f68e844..c8d56d3 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java
@@ -73,7 +73,6 @@ public class MetricsResourceView extends AbstractD3GraphListView
implements
public void onInit() {
super.onInit();
- updateTimeRangeToNow();
final ResourceMetricAvailabilityView availabilityDetails = new
ResourceMetricAvailabilityView(resource);
availabilityDetails.hide();
@@ -162,6 +161,7 @@ public class MetricsResourceView extends AbstractD3GraphListView
implements
@Override
public void run() {
availabilityGraph.drawJsniChart();
+ buttonBarDateTimeRangeEditor.updateTimeRangeToNow();
}
}.schedule(150);