modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
| 9 +++++++--
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
| 8 ++++----
2 files changed, 11 insertions(+), 6 deletions(-)
New commits:
commit fb4f6c2bf8f108998291466f98f6b4e7d3e46b56
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Thu Sep 2 13:36:37 2010 -0400
re-enable GWT-based Resource and group Traits subtabs
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
index 41ad327..d8f83ab 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
@@ -47,6 +47,7 @@ import
org.rhq.enterprise.gui.coregui.client.components.tab.TwoLevelTabSelectedH
import org.rhq.enterprise.gui.coregui.client.components.tab.TwoLevelTabSet;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import
org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.schedules.SchedulesView;
+import
org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.traits.TraitsView;
import
org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.summary.OverviewView;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceSearchView;
import
org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
@@ -79,6 +80,7 @@ public class ResourceGroupDetailView extends LocatableVLayout implements
Bookmar
private SubTab summaryTimeline;
private SubTab monitorGraphs;
private SubTab monitorTables;
+ private SubTab monitorTraits;
private SubTab monitorSched;
private SubTab monitorCallTime;
private SubTab inventoryMembers;
@@ -120,9 +122,11 @@ public class ResourceGroupDetailView extends LocatableVLayout
implements Bookmar
"/images/icons/Monitor_grey_16.png");
monitorGraphs = new SubTab(monitoringTab.extendLocatorId("Graphs"),
"Graphs", null);
monitorTables = new SubTab(monitoringTab.extendLocatorId("Tables"),
"Tables", null);
+ monitorTraits = new SubTab(monitoringTab.extendLocatorId("Traits"),
"Traits", null);
+
monitorSched = new SubTab(monitoringTab.extendLocatorId("Schedules"),
"Schedules", null);
monitorCallTime = new SubTab(monitoringTab.extendLocatorId("CallTime"),
"Call Time", null);
- monitoringTab.registerSubTabs(monitorGraphs, monitorTables, monitorSched,
monitorCallTime);
+ monitoringTab.registerSubTabs(monitorGraphs, monitorTables, monitorTraits,
monitorSched, monitorCallTime);
inventoryTab = new TwoLevelTab(topTabSet.extendLocatorId("Inventory"),
"Inventory",
"/images/icons/Inventory_grey_16.png");
@@ -184,7 +188,8 @@ public class ResourceGroupDetailView extends LocatableVLayout
implements Bookmar
this.monitorGraphs.setCanvas(new
FullHTMLPane("/rhq/group/monitor/graphs-plain.xhtml?groupId=" + groupId));
this.monitorTables.setCanvas(new
FullHTMLPane("/rhq/group/monitor/tables-plain.xhtml?groupId=" + groupId));
- this.monitorSched.setCanvas(new
SchedulesView("ResourceGroupMonSchedSubTab", groupId));
+ this.monitorTraits.setCanvas(new
TraitsView(this.monitoringTab.extendLocatorId("TraitsView"), groupId));
+ this.monitorSched.setCanvas(new
SchedulesView(this.monitoringTab.extendLocatorId("SchedulesView"), groupId));
this.monitorCallTime.setCanvas(new
FullHTMLPane("/rhq/group/monitor/response-plain.xhtml?groupId=" + groupId));
monitoringTab.updateSubTab(this.monitorGraphs);
monitoringTab.updateSubTab(this.monitorTables);
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 2051310..f0e1c3f 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
@@ -52,6 +52,7 @@ import
org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.configura
import
org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.inventory.PluginConfigurationEditView;
import
org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.GraphListView;
import
org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.schedules.SchedulesView;
+import
org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.traits.TraitsView;
import
org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.operation.OperationHistoryView;
import
org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.summary.DashboardView;
import
org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.summary.OverviewView;
@@ -214,13 +215,12 @@ public class ResourceDetailView extends LocatableVLayout implements
Bookmarkable
summaryTab.updateSubTab(this.summaryDashboard);
summaryTab.updateSubTab(this.summaryTimeline);
- this.monitorGraphs.setCanvas(new
GraphListView(extendLocatorId(resource.getName()), resource));
+ this.monitorGraphs.setCanvas(new
GraphListView(this.monitoringTab.extendLocatorId("GraphListView"), resource));
this.monitorTables.setCanvas(new
FullHTMLPane("/rhq/common/monitor/tables-plain.xhtml?id=" + resource.getId()));
- this.monitorTraits
- .setCanvas(new
FullHTMLPane("/rhq/resource/monitor/traits-plain.xhtml?id=" +
resource.getId()));
+ this.monitorTraits.setCanvas(new
TraitsView(this.monitoringTab.extendLocatorId("TraitsView"),
resource.getId()));
this.monitorAvail.setCanvas(new
FullHTMLPane("/rhq/resource/monitor/availabilityHistory-plain.xhtml?id="
+ resource.getId()));
- this.monitorSched.setCanvas(new
SchedulesView(monitoringTab.extendLocatorId("Schedules"), resource.getId()));
+ this.monitorSched.setCanvas(new
SchedulesView(monitoringTab.extendLocatorId("SchedulesView"),
resource.getId()));
this.monitorCallTime.setCanvas(new
FullHTMLPane("/rhq/resource/monitor/response-plain.xhtml?id="
+ resource.getId()));
monitoringTab.updateSubTab(this.monitorGraphs);
Show replies by date