[prev in list] [next in list] [prev in thread] [next in thread]
List: rhq-commits
Subject: [rhq] modules/enterprise
From: mike thompson <mithomps () fedoraproject ! org>
Date: 2013-11-26 22:48:12
Message-ID: 20131126224812.2EDDF60E2F () fedorahosted ! org
[Download RAW message or body]
modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java \
| 48 +++++++++- modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/resource/ResourceMetricsPortlet.java \
| 3 2 files changed, 47 insertions(+), 4 deletions(-)
New commits:
commit 6b6f1894258cb4dcbcd2cdcf82908a1d266f3f59
Author: Mike Thompson <mithomps@redhat.com>
Date: Tue Nov 26 14:46:14 2013 -0800
[BZ 1034852] time range change in summary->activity doesn't change time range in \
monitoring->metrics
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java \
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java
index b3b734a..c1d7269 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java
@@ -33,6 +33,9 @@ import com.smartgwt.client.types.Overflow;
import com.smartgwt.client.types.VerticalAlignment;
import com.smartgwt.client.widgets.Canvas;
import com.smartgwt.client.widgets.HTMLFlow;
+import com.smartgwt.client.widgets.Window;
+import com.smartgwt.client.widgets.events.CloseClickEvent;
+import com.smartgwt.client.widgets.events.CloseClickHandler;
import com.smartgwt.client.widgets.form.DynamicForm;
import com.smartgwt.client.widgets.form.events.SubmitValuesEvent;
import com.smartgwt.client.widgets.form.events.SubmitValuesHandler;
@@ -67,7 +70,6 @@ import \
org.rhq.coregui.client.dashboard.portlets.PortletConfigurationEditorCompo import \
org.rhq.coregui.client.dashboard.portlets.PortletConfigurationEditorComponent.Constant;
import org.rhq.coregui.client.gwt.GWTServiceLookup;
import org.rhq.coregui.client.inventory.common.detail.summary.AbstractActivityView;
-import org.rhq.coregui.client.inventory.common.detail.summary.AbstractActivityView.ChartViewWindow;
import org.rhq.coregui.client.inventory.common.graph.CustomDateRangeState;
import org.rhq.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView;
import org.rhq.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3MultiLineGraph;
@@ -83,6 +85,7 @@ import org.rhq.coregui.client.util.enhanced.EnhancedVLayout;
*/
public class GroupMetricsPortlet extends EnhancedVLayout implements \
CustomSettingsPortlet, AutoRefreshPortlet {
+ public static final String CHART_TITLE = MSG.common_title_metric_chart();
private int groupId = -1;
private EntityContext context;
protected Canvas recentMeasurementsContent = new Canvas();
@@ -99,6 +102,10 @@ public class GroupMetricsPortlet extends EnhancedVLayout \
implements CustomSettin
protected Timer refreshTimer;
+ // final version needed to pass to anon classes
+ // so we can call refresh in anon callback handler
+ final protected GroupMetricsPortlet refreshablePortlet;
+
//defines the list of configuration elements to load/persist for this portlet
protected static List<String> CONFIG_INCLUDE = new ArrayList<String>();
static {
@@ -113,6 +120,7 @@ public class GroupMetricsPortlet extends EnhancedVLayout \
implements CustomSettin super();
this.groupId = context.getGroupId();
this.context = context;
+ this.refreshablePortlet = this;
}
@Override
@@ -372,7 +380,7 @@ public class GroupMetricsPortlet extends EnhancedVLayout \
implements CustomSettin
@Override
public void \
onClick(ClickEvent event) {
\
ChartViewWindow window = new ChartViewWindow(
- title);
+ title, \
"", refreshablePortlet);
\
CompositeGroupD3GraphListView graph = new \
CompositeGroupD3MultiLineGraph(
groupId, \
md.getId(), isAutoGroup);
\
window.addItem(graph); @@ -489,4 +497,40 @@ public class GroupMetricsPortlet extends \
EnhancedVLayout implements CustomSettin protected void setRefreshing(boolean \
currentlyRefreshing) { this.currentlyLoading = currentlyRefreshing;
}
+ public static class ChartViewWindow extends Window {
+
+
+ public ChartViewWindow(String title, String windowTitle,final \
GroupMetricsPortlet portlet) { + super();
+ if ((windowTitle != null) && (!windowTitle.trim().isEmpty())) {
+ setTitle(windowTitle + ": " + title);
+ } else {
+ setTitle(CHART_TITLE + ": " + title);
+ }
+ setShowMinimizeButton(false);
+ setShowMaximizeButton(false);
+ setShowCloseButton(true);
+ setIsModal(true);
+ setShowModalMask(true);
+ setWidth(950);
+ setHeight(420);
+ setShowResizer(true);
+ setCanDragResize(true);
+ centerInPage();
+
+ addCloseClickHandler(new CloseClickHandler() {
+ @Override
+ public void onCloseClick(CloseClickEvent event) {
+ try {
+ ChartViewWindow.this.destroy();
+ portlet.refresh();
+
+ } catch (Throwable e) {
+ Log.warn("Cannot destroy chart display window.", e);
+ }
+ }
+ });
+
+ }
+ }
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/resource/ResourceMetricsPortlet.java \
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/resource/ResourceMetricsPortlet.java
index 862749d..ddd70a3 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/resource/ResourceMetricsPortlet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/resource/ResourceMetricsPortlet.java
@@ -55,7 +55,6 @@ import org.rhq.coregui.client.dashboard.PortletViewFactory;
import org.rhq.coregui.client.dashboard.portlets.groups.GroupMetricsPortlet;
import org.rhq.coregui.client.gwt.GWTServiceLookup;
import org.rhq.coregui.client.inventory.common.detail.summary.AbstractActivityView;
-import org.rhq.coregui.client.inventory.common.detail.summary.AbstractActivityView.ChartViewWindow;
import org.rhq.coregui.client.inventory.common.graph.CustomDateRangeState;
import org.rhq.coregui.client.inventory.resource.detail.monitoring.D3GraphListView;
import org.rhq.coregui.client.inventory.resource.type.ResourceTypeRepository;
@@ -240,7 +239,7 @@ public class ResourceMetricsPortlet extends GroupMetricsPortlet {
link.addClickHandler(new \
ClickHandler() { @Override
public void \
onClick(ClickEvent event) {
- window = new \
ChartViewWindow(title); + \
window = new ChartViewWindow(title,"", refreshablePortlet);
graphView = \
D3GraphListView.createSingleGraph(
\
resourceComposite.getResource(), md.getId(),
_______________________________________________
rhq-commits mailing list
rhq-commits@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/rhq-commits
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic