modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java | 28 ---------- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/ResourceAvailabilityView.java | 2 2 files changed, 4 insertions(+), 26 deletions(-)
New commits: commit 67ad82c393152417d419ebb3c7682f09a9a27f2a Author: Mike Thompson mithomps@redhat.com Date: Thu Jul 18 09:51:38 2013 -0700
Consolidated Metrics - Remove 'Graph' and 'Availability' from monitor second level tabs.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java index 8e959db..08d1fd5 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java @@ -66,7 +66,6 @@ import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.inventory import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.inventory.ResourceAgentView; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.CalltimeView; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.D3GraphListView; -import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.avail.ResourceAvailabilityView; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.schedules.ResourceSchedulesView; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.table.MetricsResourceView; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.traits.TraitsView; @@ -129,10 +128,8 @@ public class ResourceDetailView extends
private SubTab summaryActivity; private SubTab summaryTimeline; - private SubTab monitorGraphs; private SubTab monitorMetrics; private SubTab monitorTraits; - private SubTab monitorAvail; private SubTab monitorSched; private SubTab monitorCallTime; private SubTab inventoryChildren; @@ -196,16 +193,11 @@ public class ResourceDetailView extends monitoringTab = new TwoLevelTab(new ViewName("Monitoring", MSG.view_tabs_common_monitoring()), IconEnum.SUSPECT_METRICS);
- monitorGraphs = new SubTab(monitoringTab, new ViewName("Graphs", MSG.view_tabs_common_graphs()), null); - monitorMetrics = new SubTab(monitoringTab, new ViewName("Metrics", "Metrics"), null); monitorTraits = new SubTab(monitoringTab, new ViewName("Traits", MSG.view_tabs_common_traits()), null); - monitorAvail = new SubTab(monitoringTab, new ViewName("Availability", MSG.view_tabs_common_availability()), - null); monitorSched = new SubTab(monitoringTab, new ViewName("Schedules", MSG.view_tabs_common_schedules()), null); monitorCallTime = new SubTab(monitoringTab, new ViewName("CallTime", MSG.view_tabs_common_calltime()), null); - monitoringTab.registerSubTabs(monitorGraphs, monitorMetrics, monitorTraits, monitorAvail, - monitorSched, monitorCallTime); + monitoringTab.registerSubTabs( monitorMetrics, monitorTraits, monitorSched, monitorCallTime); tabs.add(monitoringTab);
eventsTab = new TwoLevelTab(new ViewName("Events", MSG.view_tabs_common_events()), IconEnum.EVENTS); @@ -395,23 +387,14 @@ public class ResourceDetailView extends
boolean visibleToIE8 = !BrowserUtility.isBrowserPreIE9();
- viewFactory = (!visibleToIE8) ? null : new ViewFactory() { - @Override - public Canvas createView() { - return createD3GraphListView(); - } - }; - updateSubTab(this.monitoringTab, this.monitorGraphs, visible, visibleToIE8, viewFactory); - // visible = same test as above viewFactory = (!visible) ? null : new ViewFactory() { @Override public Canvas createView() { - //return new MetricsTableView(resource.getId()); return new MetricsResourceView(resource); } }; - updateSubTab(this.monitoringTab, this.monitorMetrics, visible, true, viewFactory); + updateSubTab(this.monitoringTab, this.monitorMetrics, visible, visibleToIE8, viewFactory);
visible = hasMetricsOfType(this.resourceComposite, DataType.TRAIT); viewFactory = (!visible) ? null : new ViewFactory() { @@ -422,13 +405,6 @@ public class ResourceDetailView extends }; updateSubTab(this.monitoringTab, this.monitorTraits, visible, true, viewFactory);
- updateSubTab(this.monitoringTab, this.monitorAvail, true, true, new ViewFactory() { - @Override - public Canvas createView() { - return new ResourceAvailabilityView(resourceComposite); - } - }); - updateSubTab(this.monitoringTab, this.monitorSched, hasMetricsOfType(this.resourceComposite, null), true, new ViewFactory() { @Override diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/ResourceAvailabilityView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/ResourceAvailabilityView.java index 6719070..3d1c881 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/ResourceAvailabilityView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/ResourceAvailabilityView.java @@ -62,7 +62,9 @@ import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout; * * @author Jay Shaughnessy * @author John Mazzitelli + * @see org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.table.ResourceMetricAvailabilityView */ +@Deprecated public class ResourceAvailabilityView extends EnhancedVLayout {
private ResourceComposite resourceComposite;
rhq-commits@lists.fedorahosted.org