modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/AutoRefreshPortlet.java | 22 -- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/AutoRefreshPortletUtil.java | 75 --------- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/AutoRefreshUtil.java | 76 ++++++++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/FavoriteGroupsPortlet.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupBundleDeploymentsPortlet.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupConfigurationUpdatesPortlet.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupEventsPortlet.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOobsPortlet.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOperationsPortlet.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupPkgHistoryPortlet.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/groups/graph/ResourceGroupD3GraphPortlet.java | 10 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/queue/AutodiscoveryPortlet.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/FavoriteResourcesPortlet.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceD3GraphPortlet.java | 9 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/AbstractRecentAlertsPortlet.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/drift/AbstractRecentDriftsPortlet.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourcesPortlet.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/AbstractOperationHistoryPortlet.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationSchedulePortlet.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/InventorySummaryPortlet.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/AutoRefresh.java | 45 +++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractD3GraphListView.java | 34 ++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AvailabilityLineGraphType.java | 15 + modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java | 25 ++- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/ResourceGroupMetricD3GraphView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java | 14 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3Graph.java | 30 +++ modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 1 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties | 1 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties | 1 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties | 1 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties | 1 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties | 1 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties | 1 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties | 1 38 files changed, 291 insertions(+), 180 deletions(-)
New commits: commit 5c8056dad2e0bbc236ae98fa5483bf11e46d7912 Author: Mike Thompson mithomps@redhat.com Date: Wed Apr 3 15:31:37 2013 -0700
[BZ 948080] Add AutoRefresh capability to graphs other than portlet graphs. Refactored Auto refresh capability to be more generic so that it could be used for more than just portlets.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/AutoRefreshPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/AutoRefreshPortlet.java index e577230..c122620 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/AutoRefreshPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/AutoRefreshPortlet.java @@ -23,26 +23,16 @@ package org.rhq.enterprise.gui.coregui.client.dashboard;
+import org.rhq.enterprise.gui.coregui.client.inventory.AutoRefresh; + /** + * An AutoRefreshPortlet has the capabilities of both a Portlet and AutoRefresh interface. + * * @author Simeon Pinder */ -public interface AutoRefreshPortlet extends Portlet { - - /** - * Each portlet implements to define the refresh cycle. Note that once refresh is started it - * should be canceled when the portlet goes out of scope (typically in an onDestroy() override). - */ - void startRefreshCycle(); +public interface AutoRefreshPortlet extends Portlet,AutoRefresh {
- /** - * @return true if the portlet is currently responding to a refresh (i.e. reloading data). This can be used - * to ignore refresh requests until a prior request is completed. - */ - boolean isRefreshing(); + // All method signatures come from extension of parent Interfaces.
- /** - * Refresh this portlet, reload data, redraw widgets, whatever is needed to refresh the portlet - */ - void refresh();
} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/AutoRefreshPortletUtil.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/AutoRefreshPortletUtil.java deleted file mode 100644 index 8f0ca51..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/AutoRefreshPortletUtil.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2009 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.dashboard; - -import com.google.gwt.user.client.Timer; -import com.smartgwt.client.widgets.Canvas; - -import org.rhq.enterprise.gui.coregui.client.UserSessionManager; -import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility; - -/** - * @author Jay Shaughnessy - */ -public class AutoRefreshPortletUtil { - - public static Timer startRefreshCycle(final AutoRefreshPortlet autoRefreshPortlet, - final Canvas autoRefreshPortletCanvas, Timer refreshTimer) { - - final int refreshInterval = UserSessionManager.getUserPreferences().getPageRefreshInterval(); - - //cancel any existing timer - if (null != refreshTimer) { - refreshTimer.cancel(); - refreshTimer = null; - } - - if (refreshInterval >= MeasurementUtility.MINUTES) { - - refreshTimer = new Timer() { - public void run() { - - // if the portlet is already refreshing or if the portlet is not currently on screen then - // don't bother doing the work. this protects against unnecessary or unwanted db queries - // being performed in the background. - if (!autoRefreshPortlet.isRefreshing() && autoRefreshPortletCanvas.isDrawn() - && autoRefreshPortletCanvas.isVisible()) { - - autoRefreshPortlet.refresh(); - } - } - }; - - refreshTimer.scheduleRepeating(refreshInterval); - } - - return refreshTimer; - } - - public static void onDestroy(final Canvas portlet, Timer refreshTimer) { - - if (refreshTimer != null) { - - refreshTimer.cancel(); - } - - } - -} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/AutoRefreshUtil.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/AutoRefreshUtil.java new file mode 100644 index 0000000..4c7a651 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/AutoRefreshUtil.java @@ -0,0 +1,76 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2009 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.dashboard; + +import com.google.gwt.user.client.Timer; +import com.smartgwt.client.widgets.Canvas; + +import org.rhq.enterprise.gui.coregui.client.UserSessionManager; +import org.rhq.enterprise.gui.coregui.client.inventory.AutoRefresh; +import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility; + +/** + * @author Jay Shaughnessy + */ +public class AutoRefreshUtil { + + public static Timer startRefreshCycle(final AutoRefresh autoRefresh, + final Canvas autoRefreshCanvas, Timer refreshTimer) { + + final int refreshInterval = UserSessionManager.getUserPreferences().getPageRefreshInterval(); + + //cancel any existing timer + if (null != refreshTimer) { + refreshTimer.cancel(); + refreshTimer = null; + } + + if (refreshInterval >= MeasurementUtility.MINUTES) { + + refreshTimer = new Timer() { + public void run() { + + // if the autoRefresh component is already refreshing or is not currently on screen then + // don't bother doing the work. this protects against unnecessary or unwanted db queries + // being performed in the background. + if (!autoRefresh.isRefreshing() && autoRefreshCanvas.isDrawn() + && autoRefreshCanvas.isVisible()) { + + autoRefresh.refresh(); + } + } + }; + + refreshTimer.scheduleRepeating(refreshInterval); + } + + return refreshTimer; + } + + public static void onDestroy(Timer refreshTimer) { + + if (refreshTimer != null) { + + refreshTimer.cancel(); + } + + } + +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/FavoriteGroupsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/FavoriteGroupsPortlet.java index 406c1fa..e9ab2c5 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/FavoriteGroupsPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/FavoriteGroupsPortlet.java @@ -38,7 +38,7 @@ import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.domain.dashboard.DashboardPortlet; import org.rhq.enterprise.gui.coregui.client.UserSessionManager; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortletUtil; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; import org.rhq.enterprise.gui.coregui.client.dashboard.Portlet; import org.rhq.enterprise.gui.coregui.client.dashboard.PortletViewFactory; import org.rhq.enterprise.gui.coregui.client.dashboard.PortletWindow; @@ -127,12 +127,12 @@ public class FavoriteGroupsPortlet extends ResourceGroupListView implements Auto }
public void startRefreshCycle() { - refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer); + refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); }
@Override protected void onDestroy() { - AutoRefreshPortletUtil.onDestroy(this, refreshTimer); + AutoRefreshUtil.onDestroy( refreshTimer);
super.onDestroy(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupBundleDeploymentsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupBundleDeploymentsPortlet.java index 71c4b6c..6432aa3 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupBundleDeploymentsPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupBundleDeploymentsPortlet.java @@ -44,7 +44,7 @@ import org.rhq.core.domain.util.PageList; import org.rhq.core.domain.util.PageOrdering; import org.rhq.enterprise.gui.coregui.client.LinkManager; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortletUtil; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; import org.rhq.enterprise.gui.coregui.client.dashboard.CustomSettingsPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.Portlet; import org.rhq.enterprise.gui.coregui.client.dashboard.PortletViewFactory; @@ -263,12 +263,12 @@ public class GroupBundleDeploymentsPortlet extends EnhancedVLayout implements Cu }
public void startRefreshCycle() { - refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer); + refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); }
@Override protected void onDestroy() { - AutoRefreshPortletUtil.onDestroy(this, refreshTimer); + AutoRefreshUtil.onDestroy(refreshTimer);
super.onDestroy(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupConfigurationUpdatesPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupConfigurationUpdatesPortlet.java index 9966490..7c3bbb3 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupConfigurationUpdatesPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupConfigurationUpdatesPortlet.java @@ -50,7 +50,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.CustomConfigMeasurementRangeEditor; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortletUtil; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; import org.rhq.enterprise.gui.coregui.client.dashboard.CustomSettingsPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.Portlet; import org.rhq.enterprise.gui.coregui.client.dashboard.PortletViewFactory; @@ -236,12 +236,12 @@ public class GroupConfigurationUpdatesPortlet extends EnhancedVLayout implements
@Override public void startRefreshCycle() { - refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer); + refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); }
@Override protected void onDestroy() { - AutoRefreshPortletUtil.onDestroy(this, refreshTimer); + AutoRefreshUtil.onDestroy(refreshTimer);
super.onDestroy(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupEventsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupEventsPortlet.java index b62cfae..fc9205e 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupEventsPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupEventsPortlet.java @@ -40,7 +40,7 @@ import org.rhq.enterprise.gui.coregui.client.ImageManager; import org.rhq.enterprise.gui.coregui.client.LinkManager; import org.rhq.enterprise.gui.coregui.client.components.measurement.CustomConfigMeasurementRangeEditor; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortletUtil; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; import org.rhq.enterprise.gui.coregui.client.dashboard.CustomSettingsPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.Portlet; import org.rhq.enterprise.gui.coregui.client.dashboard.PortletViewFactory; @@ -288,12 +288,12 @@ public class GroupEventsPortlet extends EnhancedVLayout implements CustomSetting }
public void startRefreshCycle() { - refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer); + refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); }
@Override protected void onDestroy() { - AutoRefreshPortletUtil.onDestroy(this, refreshTimer); + AutoRefreshUtil.onDestroy(refreshTimer);
super.onDestroy(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java index e3c45ec..e025bdc 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java @@ -59,7 +59,7 @@ import org.rhq.enterprise.gui.coregui.client.LinkManager; import org.rhq.enterprise.gui.coregui.client.components.FullHTMLPane; import org.rhq.enterprise.gui.coregui.client.components.measurement.CustomConfigMeasurementRangeEditor; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortletUtil; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; import org.rhq.enterprise.gui.coregui.client.dashboard.CustomSettingsPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.Portlet; import org.rhq.enterprise.gui.coregui.client.dashboard.PortletViewFactory; @@ -517,7 +517,7 @@ public class GroupMetricsPortlet extends EnhancedVLayout implements CustomSettin
@Override public void startRefreshCycle() { - refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer); + refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer);
//call out to 3rd party javascript lib BrowserUtility.graphSparkLines(); @@ -526,7 +526,7 @@ public class GroupMetricsPortlet extends EnhancedVLayout implements CustomSettin
@Override protected void onDestroy() { - AutoRefreshPortletUtil.onDestroy(this, refreshTimer); + AutoRefreshUtil.onDestroy(refreshTimer);
super.onDestroy(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOobsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOobsPortlet.java index 00e8f3a..2be2613 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOobsPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOobsPortlet.java @@ -43,7 +43,7 @@ import org.rhq.core.domain.measurement.composite.MeasurementOOBComposite; import org.rhq.core.domain.util.PageList; import org.rhq.enterprise.gui.coregui.client.components.FullHTMLPane; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortletUtil; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; import org.rhq.enterprise.gui.coregui.client.dashboard.CustomSettingsPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.Portlet; import org.rhq.enterprise.gui.coregui.client.dashboard.PortletViewFactory; @@ -266,14 +266,14 @@ public class GroupOobsPortlet extends EnhancedVLayout implements CustomSettingsP }
public void startRefreshCycle() { - refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer); + refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); recentOobContent.markForRedraw(); markForRedraw(); }
@Override protected void onDestroy() { - AutoRefreshPortletUtil.onDestroy(this, refreshTimer); + AutoRefreshUtil.onDestroy(refreshTimer);
super.onDestroy(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOperationsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOperationsPortlet.java index b75c572..09abd44 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOperationsPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOperationsPortlet.java @@ -49,7 +49,7 @@ import org.rhq.core.domain.util.PageList; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.components.measurement.CustomConfigMeasurementRangeEditor; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortletUtil; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; import org.rhq.enterprise.gui.coregui.client.dashboard.CustomSettingsPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.Portlet; import org.rhq.enterprise.gui.coregui.client.dashboard.PortletViewFactory; @@ -304,12 +304,12 @@ public class GroupOperationsPortlet extends EnhancedVLayout implements CustomSet }
public void startRefreshCycle() { - refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer); + refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); }
@Override protected void onDestroy() { - AutoRefreshPortletUtil.onDestroy(this, refreshTimer); + AutoRefreshUtil.onDestroy(refreshTimer);
super.onDestroy(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupPkgHistoryPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupPkgHistoryPortlet.java index d8dc0a4..f6a89c3 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupPkgHistoryPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupPkgHistoryPortlet.java @@ -42,7 +42,7 @@ import org.rhq.core.domain.util.PageControl; import org.rhq.core.domain.util.PageList; import org.rhq.core.domain.util.PageOrdering; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortletUtil; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; import org.rhq.enterprise.gui.coregui.client.dashboard.CustomSettingsPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.Portlet; import org.rhq.enterprise.gui.coregui.client.dashboard.PortletViewFactory; @@ -260,12 +260,12 @@ public class GroupPkgHistoryPortlet extends EnhancedVLayout implements CustomSet }
public void startRefreshCycle() { - refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer); + refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); }
@Override protected void onDestroy() { - AutoRefreshPortletUtil.onDestroy(this, refreshTimer); + AutoRefreshUtil.onDestroy(refreshTimer);
super.onDestroy(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/groups/graph/ResourceGroupD3GraphPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/groups/graph/ResourceGroupD3GraphPortlet.java index 992df3f..279dfea 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/groups/graph/ResourceGroupD3GraphPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/groups/graph/ResourceGroupD3GraphPortlet.java @@ -18,7 +18,6 @@ */ package org.rhq.enterprise.gui.coregui.client.dashboard.portlets.inventory.groups.graph;
-import com.google.gwt.user.client.Timer; import com.smartgwt.client.data.Criteria; import com.smartgwt.client.types.Overflow; import com.smartgwt.client.types.TitleOrientation; @@ -40,7 +39,7 @@ import org.rhq.enterprise.gui.coregui.client.components.form.SortedSelectItem; import org.rhq.enterprise.gui.coregui.client.components.selector.AssignedItemsChangedEvent; import org.rhq.enterprise.gui.coregui.client.components.selector.AssignedItemsChangedHandler; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortletUtil; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; import org.rhq.enterprise.gui.coregui.client.dashboard.CustomSettingsPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.Portlet; import org.rhq.enterprise.gui.coregui.client.dashboard.PortletViewFactory; @@ -50,7 +49,6 @@ import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricSt import org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.ResourceGroupMetricD3GraphView; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.ResourceScheduledMetricDatasource; import org.rhq.enterprise.gui.coregui.client.inventory.resource.selection.SingleResourceGroupSelector; -import org.rhq.enterprise.gui.coregui.client.util.BrowserUtility;
/** * @author Greg Hinkle @@ -66,7 +64,7 @@ public class ResourceGroupD3GraphPortlet extends ResourceGroupMetricD3GraphView
// set on initial configuration, the window for this portlet view. private PortletWindow portletWindow; - private Timer refreshTimer; +
public static final String CFG_RESOURCE_GROUP_ID = "resourceGroupId"; public static final String CFG_DEFINITION_ID = "definitionId"; @@ -205,12 +203,12 @@ public class ResourceGroupD3GraphPortlet extends ResourceGroupMetricD3GraphView } } public void startRefreshCycle() { - refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer); + refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); }
@Override protected void onDestroy() { - AutoRefreshPortletUtil.onDestroy(this, refreshTimer); + AutoRefreshUtil.onDestroy(refreshTimer);
super.onDestroy(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/queue/AutodiscoveryPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/queue/AutodiscoveryPortlet.java index 22f0556..3c8b127 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/queue/AutodiscoveryPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/queue/AutodiscoveryPortlet.java @@ -33,7 +33,7 @@ import org.rhq.core.domain.common.EntityContext; import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.domain.dashboard.DashboardPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortletUtil; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; import org.rhq.enterprise.gui.coregui.client.dashboard.CustomSettingsPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.Portlet; import org.rhq.enterprise.gui.coregui.client.dashboard.PortletViewFactory; @@ -204,12 +204,12 @@ public class AutodiscoveryPortlet extends ResourceAutodiscoveryView implements C }
public void startRefreshCycle() { - refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer); + refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); }
@Override protected void onDestroy() { - AutoRefreshPortletUtil.onDestroy(this, refreshTimer); + AutoRefreshUtil.onDestroy( refreshTimer);
super.onDestroy(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/FavoriteResourcesPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/FavoriteResourcesPortlet.java index 8bdbdfd..2aa99c9 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/FavoriteResourcesPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/FavoriteResourcesPortlet.java @@ -38,7 +38,7 @@ import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.domain.dashboard.DashboardPortlet; import org.rhq.enterprise.gui.coregui.client.UserSessionManager; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortletUtil; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; import org.rhq.enterprise.gui.coregui.client.dashboard.Portlet; import org.rhq.enterprise.gui.coregui.client.dashboard.PortletViewFactory; import org.rhq.enterprise.gui.coregui.client.dashboard.PortletWindow; @@ -130,12 +130,12 @@ public class FavoriteResourcesPortlet extends ResourceSearchView implements Auto }
public void startRefreshCycle() { - refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer); + refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); }
@Override protected void onDestroy() { - AutoRefreshPortletUtil.onDestroy(this, refreshTimer); + AutoRefreshUtil.onDestroy(refreshTimer);
super.onDestroy(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceD3GraphPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceD3GraphPortlet.java index 84c5c54..f461f25 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceD3GraphPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceD3GraphPortlet.java @@ -23,7 +23,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map;
-import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.rpc.AsyncCallback; import com.smartgwt.client.data.Criteria; import com.smartgwt.client.types.Overflow; @@ -48,7 +47,7 @@ import org.rhq.core.domain.util.PageList; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.components.lookup.ResourceLookupComboBoxItem; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortletUtil; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; import org.rhq.enterprise.gui.coregui.client.dashboard.CustomSettingsPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.Portlet; import org.rhq.enterprise.gui.coregui.client.dashboard.PortletViewFactory; @@ -61,7 +60,6 @@ import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.ResourceMetricD3Graph; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.ResourceScheduledMetricDatasource; import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository; -import org.rhq.enterprise.gui.coregui.client.util.BrowserUtility; import org.rhq.enterprise.gui.coregui.client.util.Log; import org.rhq.enterprise.server.measurement.util.MeasurementUtils;
@@ -80,7 +78,6 @@ public class ResourceD3GraphPortlet extends ResourceMetricD3Graph implements Aut public static final String CFG_DEFINITION_ID = "definitionId"; // set on initial configuration, the window for this portlet view. private PortletWindow portletWindow; - private Timer refreshTimer;
public ResourceD3GraphPortlet() { super(); @@ -306,12 +303,12 @@ public class ResourceD3GraphPortlet extends ResourceMetricD3Graph implements Aut }
public void startRefreshCycle() { - refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer); + refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); }
@Override protected void onDestroy() { - AutoRefreshPortletUtil.onDestroy(this, refreshTimer); + AutoRefreshUtil.onDestroy(refreshTimer);
super.onDestroy(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/AbstractRecentAlertsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/AbstractRecentAlertsPortlet.java index e6bd976..6075763 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/AbstractRecentAlertsPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/AbstractRecentAlertsPortlet.java @@ -39,7 +39,7 @@ import org.rhq.enterprise.gui.coregui.client.alert.AlertHistoryView; import org.rhq.enterprise.gui.coregui.client.components.measurement.CustomConfigMeasurementRangeEditor; import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortletUtil; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; import org.rhq.enterprise.gui.coregui.client.dashboard.CustomSettingsPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.PortletWindow; import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.PortletConfigurationEditorComponent; @@ -295,7 +295,7 @@ public abstract class AbstractRecentAlertsPortlet extends AlertHistoryView imple }
public void startRefreshCycle() { - refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer); + refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); }
public boolean isRefreshing() { @@ -304,7 +304,7 @@ public abstract class AbstractRecentAlertsPortlet extends AlertHistoryView imple
@Override protected void onDestroy() { - AutoRefreshPortletUtil.onDestroy(this, refreshTimer); + AutoRefreshUtil.onDestroy(refreshTimer);
super.onDestroy(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/drift/AbstractRecentDriftsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/drift/AbstractRecentDriftsPortlet.java index 85c0b92..319222c 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/drift/AbstractRecentDriftsPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/drift/AbstractRecentDriftsPortlet.java @@ -34,7 +34,7 @@ import org.rhq.core.domain.util.PageList; import org.rhq.core.domain.util.PageOrdering; import org.rhq.enterprise.gui.coregui.client.components.measurement.CustomConfigMeasurementRangeEditor; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortletUtil; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; import org.rhq.enterprise.gui.coregui.client.dashboard.CustomSettingsPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.PortletWindow; import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.PortletConfigurationEditorComponent; @@ -303,7 +303,7 @@ public abstract class AbstractRecentDriftsPortlet extends DriftHistoryView imple }
public void startRefreshCycle() { - refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer); + refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); }
public boolean isRefreshing() { @@ -312,7 +312,7 @@ public abstract class AbstractRecentDriftsPortlet extends DriftHistoryView imple
@Override protected void onDestroy() { - AutoRefreshPortletUtil.onDestroy(this, refreshTimer); + AutoRefreshUtil.onDestroy(refreshTimer);
super.onDestroy(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourcesPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourcesPortlet.java index 40d08d2..275932d 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourcesPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourcesPortlet.java @@ -41,7 +41,7 @@ import org.rhq.core.domain.dashboard.DashboardPortlet; import org.rhq.enterprise.gui.coregui.client.components.HeaderLabel; import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortletUtil; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; import org.rhq.enterprise.gui.coregui.client.dashboard.CustomSettingsPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.Portlet; import org.rhq.enterprise.gui.coregui.client.dashboard.PortletViewFactory; @@ -253,12 +253,12 @@ public class RecentlyAddedResourcesPortlet extends EnhancedVLayout implements Cu }
public void startRefreshCycle() { - refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer); + refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); }
@Override protected void onDestroy() { - AutoRefreshPortletUtil.onDestroy(this, refreshTimer); + AutoRefreshUtil.onDestroy(refreshTimer);
super.onDestroy(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/AbstractOperationHistoryPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/AbstractOperationHistoryPortlet.java index 83a89fb..2a8a520 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/AbstractOperationHistoryPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/AbstractOperationHistoryPortlet.java @@ -33,7 +33,7 @@ import org.rhq.core.domain.util.PageOrdering; import org.rhq.enterprise.gui.coregui.client.LinkManager; import org.rhq.enterprise.gui.coregui.client.components.measurement.CustomConfigMeasurementRangeEditor; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortletUtil; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; import org.rhq.enterprise.gui.coregui.client.dashboard.CustomSettingsPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.PortletWindow; import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.PortletConfigurationEditorComponent; @@ -270,7 +270,7 @@ public abstract class AbstractOperationHistoryPortlet extends OperationHistoryVi }
public void startRefreshCycle() { - refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer); + refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); }
public boolean isRefreshing() { @@ -286,7 +286,7 @@ public abstract class AbstractOperationHistoryPortlet extends OperationHistoryVi
@Override protected void onDestroy() { - AutoRefreshPortletUtil.onDestroy(this, refreshTimer); + AutoRefreshUtil.onDestroy(refreshTimer);
super.onDestroy(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationSchedulePortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationSchedulePortlet.java index 80c991b..949df1a 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationSchedulePortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationSchedulePortlet.java @@ -47,7 +47,7 @@ import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.LinkManager; import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortletUtil; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; import org.rhq.enterprise.gui.coregui.client.dashboard.CustomSettingsPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.Portlet; import org.rhq.enterprise.gui.coregui.client.dashboard.PortletViewFactory; @@ -377,12 +377,12 @@ public class OperationSchedulePortlet extends EnhancedVLayout implements CustomS }
public void startRefreshCycle() { - refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer); + refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); }
@Override protected void onDestroy() { - AutoRefreshPortletUtil.onDestroy(this, refreshTimer); + AutoRefreshUtil.onDestroy(refreshTimer);
super.onDestroy(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java index 7562953..518ac29 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java @@ -53,7 +53,7 @@ import org.rhq.enterprise.gui.coregui.client.components.table.IconField; import org.rhq.enterprise.gui.coregui.client.components.table.Table; import org.rhq.enterprise.gui.coregui.client.components.table.TableWidget; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortletUtil; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; import org.rhq.enterprise.gui.coregui.client.dashboard.CustomSettingsPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.Portlet; import org.rhq.enterprise.gui.coregui.client.dashboard.PortletViewFactory; @@ -336,12 +336,12 @@ public class ProblemResourcesPortlet extends Table<ProblemResourcesDataSource> i }
public void startRefreshCycle() { - refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer); + refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); }
@Override protected void onDestroy() { - AutoRefreshPortletUtil.onDestroy(this, refreshTimer); + AutoRefreshUtil.onDestroy(refreshTimer);
super.onDestroy(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/InventorySummaryPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/InventorySummaryPortlet.java index b9bdc5c..6c05c9b 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/InventorySummaryPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/InventorySummaryPortlet.java @@ -43,7 +43,7 @@ import org.rhq.core.domain.dashboard.DashboardPortlet; import org.rhq.core.domain.resource.InventorySummary; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet; -import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortletUtil; +import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; import org.rhq.enterprise.gui.coregui.client.dashboard.Portlet; import org.rhq.enterprise.gui.coregui.client.dashboard.PortletViewFactory; import org.rhq.enterprise.gui.coregui.client.dashboard.PortletWindow; @@ -161,12 +161,12 @@ public class InventorySummaryPortlet extends EnhancedVLayout implements AutoRefr }
public void startRefreshCycle() { - refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer); + refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); }
@Override protected void onDestroy() { - AutoRefreshPortletUtil.onDestroy(this, refreshTimer); + AutoRefreshUtil.onDestroy(refreshTimer);
super.onDestroy(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/AutoRefresh.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/AutoRefresh.java new file mode 100644 index 0000000..b2ae5e8 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/AutoRefresh.java @@ -0,0 +1,45 @@ +/* + * 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; + +/** + * @author Simeon Pinder + * @author Mike Thompson + */ +public interface AutoRefresh { + + /** + * Each item implements to define the refresh cycle. Note that once refresh is started it + * should be canceled when the portlet goes out of scope (typically in an onDestroy() override). + */ + void startRefreshCycle(); + + /** + * @return true if the widget is currently responding to a refresh (i.e. reloading data). This can be used + * to ignore refresh requests until a prior request is completed. + */ + boolean isRefreshing(); + + /** + * Refresh this widget, reload data, redraw widgets, whatever is needed to refresh the page + */ + void refresh(); + + +} 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 12ff64f..d682a24 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 @@ -20,12 +20,15 @@ package org.rhq.enterprise.gui.coregui.client.inventory.common;
import java.util.List;
+import com.google.gwt.user.client.Timer; import com.smartgwt.client.widgets.Label;
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.components.measurement.UserPreferencesMeasurementRangeEditor; +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.resource.detail.monitoring.avail.AvailabilityD3Graph; import org.rhq.enterprise.gui.coregui.client.util.async.CountDownLatch; import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout; @@ -34,17 +37,21 @@ import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout; * Provide the shared stuff for create GraphListViews like Availability graphs * and User Preferences pickers for the date range. */ -public abstract class AbstractD3GraphListView extends EnhancedVLayout { +public abstract class AbstractD3GraphListView extends EnhancedVLayout implements AutoRefresh { + protected static int SINGLE_CHART_HEIGHT = 225; + protected static int MULTI_CHART_HEIGHT = 195; protected List<Availability> availabilityList; protected List<ResourceGroupAvailability> groupAvailabilityList; protected AvailabilityD3Graph availabilityGraph; protected static Label loadingLabel = new Label(MSG.common_msg_loading()); protected UserPreferencesMeasurementRangeEditor measurementRangeEditor; protected boolean showAvailabilityGraph = false; + protected Timer refreshTimer;
public AbstractD3GraphListView() { super(); measurementRangeEditor = new UserPreferencesMeasurementRangeEditor(); + startRefreshCycle(); }
public abstract void redrawGraphs(); @@ -52,4 +59,29 @@ public abstract class AbstractD3GraphListView extends EnhancedVLayout { protected abstract void queryAvailability(final EntityContext context, Long startTime, Long endTime, final CountDownLatch countDownLatch);
+ + @Override + public void startRefreshCycle() { + refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); + } + + @Override + protected void onDestroy() { + AutoRefreshUtil.onDestroy( refreshTimer); + + super.onDestroy(); + } + + @Override + public boolean isRefreshing() { + return false; + } + + //Custom refresh operation as we are not directly extending Table + @Override + public void refresh() { + if (isVisible() && !isRefreshing()) { + redrawGraphs(); + } + } } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java index 251f5f9..2818b86 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java @@ -40,6 +40,7 @@ public abstract class AbstractMetricD3GraphView extends EnhancedVLayout { private int entityId; private int definitionId; private HTMLFlow graphDiv = null; + protected Timer refreshTimer;
public AbstractMetricD3GraphView() { super(); @@ -73,7 +74,8 @@ public abstract class AbstractMetricD3GraphView extends EnhancedVLayout { + " <pattern id="downStripes" patternUnits="userSpaceOnUse" x="0" y="0"" + " width="6" height="3">" + " <path d="M 0 0 6 0" style="stroke:#ff8a9a; fill:none;"/>" - + " </pattern>" + "</defs>"; + + " </pattern>" + + "</defs>"; }
@Override 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 d49b533..1d88a64 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 @@ -38,6 +38,7 @@ import org.rhq.core.domain.resource.group.ResourceGroup; import org.rhq.core.domain.resource.group.composite.ResourceGroupAvailability; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; +import org.rhq.enterprise.gui.coregui.client.inventory.AutoRefresh; import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractD3GraphListView; import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AvailabilityLineGraphType; import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricGraphData; @@ -52,7 +53,7 @@ import org.rhq.enterprise.gui.coregui.client.util.async.CountDownLatch; * Build the Group version of the View that shows the individual graph views. * @author Mike Thompson */ -public final class D3GroupGraphListView extends AbstractD3GraphListView { +public final class D3GroupGraphListView extends AbstractD3GraphListView implements AutoRefresh{
private ResourceGroup resourceGroup; private VLayout graphsVLayout; @@ -83,15 +84,21 @@ public final class D3GroupGraphListView extends AbstractD3GraphListView { graphsVLayout.setWidth100();
if (resourceGroup != null) { - redrawGraphs(); + buildGraphs(); } addMember(graphsVLayout); }
+ + public void redrawGraphs() { + this.onDraw(); + availabilityGraph.drawJsniChart(); + } + /** * Build whatever graph metrics (MeasurementDefinitions) are defined for the resource. */ - public void redrawGraphs() { + private void buildGraphs() {
queryAvailability(EntityContext.forGroup(resourceGroup), measurementRangeEditor.getStartTime(), measurementRangeEditor.getEndTime(), null); @@ -140,8 +147,11 @@ public final class D3GroupGraphListView extends AbstractD3GraphListView { for (List<MeasurementDataNumericHighLowComposite> data : result) { buildIndividualGraph(measurementDefinitions.get(i++), data); } - availabilityGraph.setGroupAvailabilityList(groupAvailabilityList); - availabilityGraph.drawJsniChart(); + // There is a weird timing case when availabilityGraph can be null + if (availabilityGraph != null) { + availabilityGraph.setGroupAvailabilityList(groupAvailabilityList); + availabilityGraph.drawJsniChart(); + } } } }); @@ -188,10 +198,13 @@ public final class D3GroupGraphListView extends AbstractD3GraphListView { ResourceMetricD3Graph graphView = new ResourceMetricD3Graph(graph);
graphView.setWidth("95%"); - graphView.setHeight(225); + graphView.setHeight(MULTI_CHART_HEIGHT);
if(graphsVLayout != null){ graphsVLayout.addMember(graphView); } } + + + } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/ResourceGroupMetricD3GraphView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/ResourceGroupMetricD3GraphView.java index 815aeed..a436aa0 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/ResourceGroupMetricD3GraphView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/ResourceGroupMetricD3GraphView.java @@ -42,6 +42,8 @@ import org.rhq.enterprise.server.measurement.util.MeasurementUtils;
public class ResourceGroupMetricD3GraphView extends AbstractMetricD3GraphView {
+ + public ResourceGroupMetricD3GraphView(AbstractGraph graph) { super(graph); } 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 2b6a2f2..4a64509 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 @@ -64,8 +64,6 @@ import org.rhq.enterprise.gui.coregui.client.util.async.CountDownLatch; public class D3GraphListView extends AbstractD3GraphListView {
private static int NUM_ASYNC_CALLS = 2; // wait for X async calls in Latch - private static int SINGLE_CHART_HEIGHT = 225; - private static int MULTI_CHART_HEIGHT = 195;
private Resource resource; private Set<Integer> definitionIds = null; @@ -174,10 +172,8 @@ public class D3GraphListView extends AbstractD3GraphListView {
@Override public void onSuccess(List<Availability> availList) { - if (Log.isDebugEnabled()) { - Log.debug("\nSuccessfully queried availability in: " + Log.debug("\nSuccessfully queried availability in: " + (System.currentTimeMillis() - timerStart) + " ms."); - } availabilityList = availList; if (countDownLatch != null) { countDownLatch.countDown(); @@ -301,14 +297,8 @@ public class D3GraphListView extends AbstractD3GraphListView { public void onSuccess(PageList<MeasurementOOBComposite> measurementOOBComposites) {
measurementOOBCompositeList = measurementOOBComposites; - Log.debug("\nSuccessfully queried OOB data in: " + (System.currentTimeMillis() - startTime) + Log.debug("\nSuccessfully queried "+measurementOOBCompositeList.size() +" OOB records in: " + (System.currentTimeMillis() - startTime) + " ms."); - Log.debug("OOB Data size: " + measurementOOBCompositeList.size()); - if (null != measurementOOBCompositeList) { - for (MeasurementOOBComposite measurementOOBComposite : measurementOOBComposites) { - //Log.debug("measurementOOBComposite = " + measurementOOBComposite); - } - } countDownLatch.countDown(); }
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 036237b..93c99d3 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 @@ -18,6 +18,8 @@ */ package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring;
+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.AbstractMetricD3GraphView; import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph; import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.HasD3MetricJsniChart; @@ -25,7 +27,7 @@ import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.HasD3Met /** * A D3 graph implementation for graphing Resource metrics. */ -public class ResourceMetricD3Graph extends AbstractMetricD3GraphView { +public class ResourceMetricD3Graph extends AbstractMetricD3GraphView {
/** * This constructor is for the use case in the Dashboard where we dont actually @@ -38,6 +40,7 @@ public class ResourceMetricD3Graph extends AbstractMetricD3GraphView { public ResourceMetricD3Graph(AbstractGraph graph) {
super(graph); + //startRefreshCycle(); }
@@ -56,4 +59,29 @@ public class ResourceMetricD3Graph extends AbstractMetricD3GraphView { }
+// @Override +// public void startRefreshCycle() { +// refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer); +// } +// +// @Override +// protected void onDestroy() { +// AutoRefreshUtil.onDestroy( refreshTimer); +// +// super.onDestroy(); +// } +// +// @Override +// public boolean isRefreshing() { +// return false; +// } +// +// //Custom refresh operation as we are not directly extending Table +// @Override +// public void refresh() { +// if (isVisible() && !isRefreshing()) { +// drawGraph(); +// } +// } + }
commit 5c27686eafb2315ce4bc5f2871081fc74f2e5fe1 Author: Mike Thompson mithomps@redhat.com Date: Wed Apr 3 11:11:01 2013 -0700
For Group Availability graph change WARN status to MIXED to better convey the meaning of the status.
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 b15edee..0547ca1 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 @@ -24,6 +24,7 @@ import java.util.List; import org.rhq.core.domain.measurement.Availability; import org.rhq.core.domain.measurement.MeasurementUnits; import org.rhq.core.domain.resource.group.composite.ResourceGroupAvailability; +import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.Messages; import org.rhq.enterprise.gui.coregui.client.util.Log; @@ -65,6 +66,7 @@ public class AvailabilityLineGraphType { // loop through the avail intervals for (Availability availability : availabilityList) { sb.append("{ "availType":"" + availability.getAvailabilityType() + "", "); + sb.append(" "availTypeMessage":"" + availability.getAvailabilityType()+ "", "); sb.append(" "availStart":" + availability.getStartTime() + ", "); // last record will be null long endTime = availability.getEndTime() != null ? availability.getEndTime() : (new Date()).getTime(); @@ -81,7 +83,12 @@ public class AvailabilityLineGraphType { } else if (null != groupAvailabilityList) { // loop through the group avail down intervals for (ResourceGroupAvailability groupAvailability : groupAvailabilityList) { + // allows substitution for situations like WARN=MIXED for easier terminology + String availabilityTypeMessage = (groupAvailability.getGroupAvailabilityType().equals(ResourceGroupComposite.GroupAvailabilityType.WARN)) + ? MSG.chart_hover_availability_type_warn() : groupAvailability.getGroupAvailabilityType().name(); + sb.append("{ "availType":"" + groupAvailability.getGroupAvailabilityType() + "", "); + sb.append(" "availTypeMessage":"" + availabilityTypeMessage + "", "); sb.append(" "availStart":" + groupAvailability.getStartTime() + ", "); // last record will be null long endTime = groupAvailability.getEndTime() != null ? groupAvailability.getEndTime() : (new Date()) @@ -224,19 +231,17 @@ public class AvailabilityLineGraphType { var hoverString, timeFormatter = $wnd.d3.time.format(availChartContext.chartHoverTimeFormat), dateFormatter = $wnd.d3.time.format(availChartContext.chartHoverDateFormat), - availType = d.availType, availStart = new Date(+d.availStart), - availEnd = new Date(+d.availEnd), - availDuration = d.availDuration; + availEnd = new Date(+d.availEnd);
hoverString = '<div class="chartHoverEnclosingDiv">' + - '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverBarAvailabilityLabel + ': </span><span style="width:50px;">' + availType + '</span></div>' + + '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverBarAvailabilityLabel + ': </span><span style="width:50px;">' + d.availTypeMessage + '</span></div>' + '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverStartLabel + ': </span><span style="width:50px;">' + timeFormatter(availStart) + '</span></div>' + '<div class="chartHoverAlignRight"><span >' + ' </span><span style="width:50px;">' + dateFormatter(availStart) + '</span></div>' + '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverEndLabel + ': </span><span style="width:50px;">' + timeFormatter(availEnd) + '</span></div>' + '<div class="chartHoverAlignRight"><span >' + ' </span><span style="width:50px;">' + dateFormatter(availEnd) + '</span></div>' + - '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverBarLabel + ': </span><span style="width:50px;">' + availDuration + '</span></div>' + + '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverBarLabel + ': </span><span style="width:50px;">' + d.availDuration + '</span></div>' + '</div>'; return hoverString;
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties index 38a9605..eb8b22e 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties @@ -9,6 +9,7 @@ chart_date_label = Date chart_down_label = Down chart_hover_availability_label = Availability +chart_hover_availability_type_warn = MIXED chart_hover_bar_label = Duration chart_hover_date_format = %m/%d/%y chart_hover_end_label = End diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties index e8faace..e377ba9 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties @@ -38,6 +38,7 @@ ##chart_title_min_label = Min ##chart_title_peak_label = Max ##chart_hover_availability_label = Availability +##chart_hover_availability_type_warn = MIXED ##chart_hover_date_format = %m/%d/%y ##chart_hover_time_format = %I:%M:%S %p ##chart_hover_start_label = Start diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties index ee5dfa3..7b454be 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties @@ -18,6 +18,7 @@ ##chart_title_min_label = Min ##chart_title_peak_label = Max ##chart_hover_availability_label = Availability +##chart_hover_availability_type_warn = MIXED ##chart_hover_date_format = %m/%d/%y ##chart_hover_time_format = %I:%M:%S %p ##chart_hover_start_label = Start diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties index 3772a39..f03b066 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties @@ -18,6 +18,7 @@ ##chart_title_min_label = Min ##chart_title_peak_label = Max ##chart_hover_availability_label = Availability +##chart_hover_availability_type_warn = MIXED ##chart_hover_date_format = %m/%d/%y ##chart_hover_time_format = %I:%M:%S %p ##chart_hover_start_label = Start diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties index fd7f639..55516ce 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties @@ -16,6 +16,7 @@ ##chart_title_min_label = Min ##chart_title_peak_label = Max ##chart_hover_availability_label = Availability +##chart_hover_availability_type_warn = MIXED ##chart_hover_date_format = %m/%d/%y ##chart_hover_time_format = %I:%M:%S %p ##chart_hover_start_label = Start diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties index c8d730d..aaa68cd 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties @@ -15,6 +15,7 @@ ##chart_title_min_label = Min ##chart_title_peak_label = Max ##chart_hover_availability_label = Availability +##chart_hover_availability_type_warn = MIXED ##chart_hover_date_format = %m/%d/%y ##chart_hover_time_format = %I:%M:%S %p ##chart_hover_start_label = Start diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties index ac55382..b5bb9c2 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties @@ -15,6 +15,7 @@ ##chart_title_min_label = Min ##chart_title_peak_label = Max ##chart_hover_availability_label = Availability +##chart_hover_availability_type_warn = MIXED ##chart_hover_date_format = %m/%d/%y ##chart_hover_time_format = %I:%M:%S %p ##chart_hover_start_label = Start diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties index 582be3a..550cef7 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties @@ -15,6 +15,7 @@ ##chart_title_min_label = Min ##chart_title_peak_label = Max ##chart_hover_availability_label = Availability +##chart_hover_availability_type_warn = MIXED ##chart_hover_date_format = %m/%d/%y ##chart_hover_time_format = %I:%M:%S %p ##chart_hover_start_label = Start
rhq-commits@lists.fedorahosted.org