modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
| 52 +-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
| 207 ++++------
2 files changed, 126 insertions(+), 133 deletions(-)
New commits:
commit 59c7975de567f3265aa316a4c9360c09341173e9
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Mon Nov 29 14:30:30 2010 -0500
reorder the tabs so they make more sense and are more consistently placed across
individual resource and group views
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 cada640..569882d 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
@@ -149,6 +149,26 @@ public class ResourceGroupDetailView extends
AbstractTwoLevelTabSetView<Resource
summaryTab.registerSubTabs(summaryOverview, summaryTimeline);
tabs.add(summaryTab);
+ inventoryTab = new
TwoLevelTab(getTabSet().extendLocatorId("Inventory"), new
ViewName("Inventory", MSG
+ .view_tabs_common_inventory()),
"/images/icons/Inventory_grey_16.png");
+ inventoryMembers = new SubTab(inventoryTab.extendLocatorId("Members"),
new ViewName("Members", MSG
+ .view_tabs_common_members()), null);
+ inventoryConn = new
SubTab(inventoryTab.extendLocatorId("ConnectionSettings"), new ViewName(
+ "ConnectionSettings", MSG.view_tabs_common_connectionSettings()),
null);
+ inventoryConnHistory = new
SubTab(inventoryTab.extendLocatorId("ConnectionSettingsHistory"), new ViewName(
+ "ConnectionSettingsHistory",
MSG.view_tabs_common_connectionSettingsHistory()), null);
+ inventoryTab.registerSubTabs(this.inventoryMembers, this.inventoryConn,
this.inventoryConnHistory);
+ tabs.add(inventoryTab);
+
+ alertsTab = new TwoLevelTab(getTabSet().extendLocatorId("Alerts"), new
ViewName("Alerts", MSG
+ .view_tabs_common_alerts()), "/images/icons/Alert_grey_16.png");
+ this.alertHistory = new SubTab(alertsTab.extendLocatorId("History"),
new ViewName("History", MSG
+ .view_tabs_common_history()), null);
+ this.alertDef = new SubTab(alertsTab.extendLocatorId("Definitions"),
new ViewName("Definitions", MSG
+ .view_tabs_common_definitions()), null);
+ alertsTab.registerSubTabs(alertHistory, alertDef);
+ tabs.add(alertsTab);
+
monitoringTab = new
TwoLevelTab(getTabSet().extendLocatorId("Monitoring"), new
ViewName("Monitoring", MSG
.view_tabs_common_monitoring()),
"/images/icons/Monitor_grey_16.png");
monitorGraphs = new SubTab(monitoringTab.extendLocatorId("Graphs"), new
ViewName("Graphs", MSG
@@ -165,16 +185,12 @@ public class ResourceGroupDetailView extends
AbstractTwoLevelTabSetView<Resource
monitoringTab.registerSubTabs(monitorGraphs, monitorTables, monitorTraits,
monitorSched, monitorCallTime);
tabs.add(monitoringTab);
- inventoryTab = new
TwoLevelTab(getTabSet().extendLocatorId("Inventory"), new
ViewName("Inventory", MSG
- .view_tabs_common_inventory()),
"/images/icons/Inventory_grey_16.png");
- inventoryMembers = new SubTab(inventoryTab.extendLocatorId("Members"),
new ViewName("Members", MSG
- .view_tabs_common_members()), null);
- inventoryConn = new
SubTab(inventoryTab.extendLocatorId("ConnectionSettings"), new ViewName(
- "ConnectionSettings", MSG.view_tabs_common_connectionSettings()),
null);
- inventoryConnHistory = new
SubTab(inventoryTab.extendLocatorId("ConnectionSettingsHistory"), new ViewName(
- "ConnectionSettingsHistory",
MSG.view_tabs_common_connectionSettingsHistory()), null);
- inventoryTab.registerSubTabs(this.inventoryMembers, this.inventoryConn,
this.inventoryConnHistory);
- tabs.add(inventoryTab);
+ eventsTab = new TwoLevelTab(getTabSet().extendLocatorId("Events"), new
ViewName("Events", MSG
+ .view_tabs_common_events()), "/images/icons/Events_grey_16.png");
+ this.eventHistory = new SubTab(eventsTab.extendLocatorId("History"),
new ViewName("History", MSG
+ .view_tabs_common_history()), null);
+ eventsTab.registerSubTabs(eventHistory);
+ tabs.add(eventsTab);
operationsTab = new
TwoLevelTab(getTabSet().extendLocatorId("Operations"), new
ViewName("Operations", MSG
.view_tabs_common_operations()),
"/images/icons/Operation_grey_16.png");
@@ -185,15 +201,6 @@ public class ResourceGroupDetailView extends
AbstractTwoLevelTabSetView<Resource
operationsTab.registerSubTabs(this.opHistory, this.opSched);
tabs.add(operationsTab);
- alertsTab = new TwoLevelTab(getTabSet().extendLocatorId("Alerts"), new
ViewName("Alerts", MSG
- .view_tabs_common_alerts()), "/images/icons/Alert_grey_16.png");
- this.alertHistory = new SubTab(alertsTab.extendLocatorId("History"),
new ViewName("History", MSG
- .view_tabs_common_history()), null);
- this.alertDef = new SubTab(alertsTab.extendLocatorId("Definitions"),
new ViewName("Definitions", MSG
- .view_tabs_common_definitions()), null);
- alertsTab.registerSubTabs(alertHistory, alertDef);
- tabs.add(alertsTab);
-
configurationTab = new
TwoLevelTab(getTabSet().extendLocatorId("Configuration"), new
ViewName("Configuration",
MSG.view_tabs_common_configuration()),
"/images/icons/Configure_grey_16.png");
this.configCurrent = new
SubTab(configurationTab.extendLocatorId("Current"), new
ViewName("Current", MSG
@@ -203,13 +210,6 @@ public class ResourceGroupDetailView extends
AbstractTwoLevelTabSetView<Resource
configurationTab.registerSubTabs(this.configCurrent, this.configHistory);
tabs.add(configurationTab);
- eventsTab = new TwoLevelTab(getTabSet().extendLocatorId("Events"), new
ViewName("Events", MSG
- .view_tabs_common_events()), "/images/icons/Events_grey_16.png");
- this.eventHistory = new SubTab(eventsTab.extendLocatorId("History"),
new ViewName("History", MSG
- .view_tabs_common_history()), null);
- eventsTab.registerSubTabs(eventHistory);
- tabs.add(eventsTab);
-
return 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 0191f51..9ee899c 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
@@ -120,97 +120,97 @@ public class ResourceDetailView extends
AbstractTwoLevelTabSetView<ResourceCompo
protected List<TwoLevelTab> createTabs() {
List<TwoLevelTab> tabs = new ArrayList<TwoLevelTab>();
- summaryTab = new TwoLevelTab(getTabSet().extendLocatorId("Summary"),
new ViewName("Summary",
- MSG.view_tabs_common_summary()),
"/images/icons/Service_up_16.png");
- summaryOverview = new SubTab(summaryTab.extendLocatorId("Overview"),
new ViewName("Overview",
- MSG.view_tabs_common_overview()), null);
- summaryDashboard = new SubTab(summaryTab.extendLocatorId("Dashboard"),
new ViewName("Dashboard",
- MSG.view_tabs_common_dashboard()), null);
- summaryTimeline = new SubTab(summaryTab.extendLocatorId("Timeline"),
new ViewName("Timeline",
- MSG.view_tabs_common_timeline()), null);
+ summaryTab = new TwoLevelTab(getTabSet().extendLocatorId("Summary"),
new ViewName("Summary", MSG
+ .view_tabs_common_summary()), "/images/icons/Service_up_16.png");
+ summaryOverview = new SubTab(summaryTab.extendLocatorId("Overview"),
new ViewName("Overview", MSG
+ .view_tabs_common_overview()), null);
+ summaryDashboard = new SubTab(summaryTab.extendLocatorId("Dashboard"),
new ViewName("Dashboard", MSG
+ .view_tabs_common_dashboard()), null);
+ summaryTimeline = new SubTab(summaryTab.extendLocatorId("Timeline"),
new ViewName("Timeline", MSG
+ .view_tabs_common_timeline()), null);
summaryTab.registerSubTabs(summaryOverview, summaryDashboard, summaryTimeline);
tabs.add(summaryTab);
- monitoringTab = new
TwoLevelTab(getTabSet().extendLocatorId("Monitoring"), new
ViewName("Monitoring",
- MSG.view_tabs_common_monitoring()),
"/images/icons/Monitor_grey_16.png");
- monitorGraphs = new SubTab(monitoringTab.extendLocatorId("Graphs"), new
ViewName("Graphs",
- MSG.view_tabs_common_graphs()), null);
- monitorTables = new SubTab(monitoringTab.extendLocatorId("Tables"), new
ViewName("Tables",
- MSG.view_tabs_common_tables()), null);
- monitorTraits = new SubTab(monitoringTab.extendLocatorId("Traits"), new
ViewName("Traits",
- MSG.view_tabs_common_traits()), null);
- monitorAvail = new
SubTab(monitoringTab.extendLocatorId("Availability"), new
ViewName("Availability",
- MSG.view_tabs_common_availability()), null);
- monitorSched = new SubTab(monitoringTab.extendLocatorId("Schedules"),
new ViewName("Schedules",
- MSG.view_tabs_common_schedules()), null);
- monitorCallTime = new SubTab(monitoringTab.extendLocatorId("CallTime"),
new ViewName("CallTime",
- MSG.view_tabs_common_calltime()), null);
- monitoringTab.registerSubTabs(monitorGraphs, monitorTables, monitorTraits,
monitorAvail, monitorSched,
- monitorCallTime);
- tabs.add(monitoringTab);
-
- inventoryTab = new
TwoLevelTab(getTabSet().extendLocatorId("Inventory"), new
ViewName("Inventory",
- MSG.view_tabs_common_inventory()),
"/images/icons/Inventory_grey_16.png");
- inventoryChildren = new
SubTab(inventoryTab.extendLocatorId("Children"), new
ViewName("Children",
- MSG.view_tabs_common_child_resources()), null);
- inventoryChildHistory = new
SubTab(inventoryTab.extendLocatorId("ChildHist"), new
ViewName("ChildHistory",
- MSG.view_tabs_common_child_history()), null);
+ inventoryTab = new
TwoLevelTab(getTabSet().extendLocatorId("Inventory"), new
ViewName("Inventory", MSG
+ .view_tabs_common_inventory()),
"/images/icons/Inventory_grey_16.png");
+ inventoryChildren = new
SubTab(inventoryTab.extendLocatorId("Children"), new
ViewName("Children", MSG
+ .view_tabs_common_child_resources()), null);
+ inventoryChildHistory = new
SubTab(inventoryTab.extendLocatorId("ChildHist"), new
ViewName("ChildHistory", MSG
+ .view_tabs_common_child_history()), null);
inventoryConn = new
SubTab(inventoryTab.extendLocatorId("ConnectionSettings"), new ViewName(
"ConnectionSettings", MSG.view_tabs_common_connectionSettings()),
null);
inventoryConnHistory = new
SubTab(inventoryTab.extendLocatorId("ConnSetHist"), new ViewName(
"ConnectionSettingsHistory",
MSG.view_tabs_common_connectionSettingsHistory()), null);
- inventoryGroups = new SubTab(inventoryTab.extendLocatorId("Groups"),
new ViewName("Groups",
- MSG.view_tabs_common_groups()), null);
+ inventoryGroups = new SubTab(inventoryTab.extendLocatorId("Groups"),
new ViewName("Groups", MSG
+ .view_tabs_common_groups()), null);
inventoryGroupMembership = new
SubTab(inventoryTab.extendLocatorId("GroupMembership"), new ViewName(
"GroupMembership", MSG.view_tabs_common_group_membership()),
null);
inventoryTab.registerSubTabs(this.inventoryChildren, this.inventoryChildHistory,
this.inventoryConn,
this.inventoryConnHistory, this.inventoryGroups,
this.inventoryGroupMembership);
tabs.add(inventoryTab);
- operationsTab = new
TwoLevelTab(getTabSet().extendLocatorId("Operations"), new
ViewName("Operations",
- MSG.view_tabs_common_operations()),
"/images/icons/Operation_grey_16.png");
- this.opHistory = new SubTab(operationsTab.extendLocatorId("History"),
new ViewName("History",
- MSG.view_tabs_common_history()), null);
- this.opSched = new SubTab(operationsTab.extendLocatorId("Scheduled"),
new ViewName("Scheduled",
- MSG.view_tabs_common_scheduled()), null);
- operationsTab.registerSubTabs(this.opHistory, this.opSched);
- tabs.add(operationsTab);
-
- alertsTab = new TwoLevelTab(getTabSet().extendLocatorId("Alerts"), new
ViewName("Alerts",
- MSG.view_tabs_common_alerts()),
"/images/icons/Alert_grey_16.png");
- this.alertHistory = new SubTab(alertsTab.extendLocatorId("History"),
new ViewName("History",
- MSG.view_tabs_common_history()), null);
- this.alertDef = new SubTab(alertsTab.extendLocatorId("Definitions"),
new ViewName("Definitions",
- MSG.view_tabs_common_definitions()), null);
+ alertsTab = new TwoLevelTab(getTabSet().extendLocatorId("Alerts"), new
ViewName("Alerts", MSG
+ .view_tabs_common_alerts()), "/images/icons/Alert_grey_16.png");
+ this.alertHistory = new SubTab(alertsTab.extendLocatorId("History"),
new ViewName("History", MSG
+ .view_tabs_common_history()), null);
+ this.alertDef = new SubTab(alertsTab.extendLocatorId("Definitions"),
new ViewName("Definitions", MSG
+ .view_tabs_common_definitions()), null);
alertsTab.registerSubTabs(alertHistory, alertDef);
tabs.add(alertsTab);
+ monitoringTab = new
TwoLevelTab(getTabSet().extendLocatorId("Monitoring"), new
ViewName("Monitoring", MSG
+ .view_tabs_common_monitoring()),
"/images/icons/Monitor_grey_16.png");
+ monitorGraphs = new SubTab(monitoringTab.extendLocatorId("Graphs"), new
ViewName("Graphs", MSG
+ .view_tabs_common_graphs()), null);
+ monitorTables = new SubTab(monitoringTab.extendLocatorId("Tables"), new
ViewName("Tables", MSG
+ .view_tabs_common_tables()), null);
+ monitorTraits = new SubTab(monitoringTab.extendLocatorId("Traits"), new
ViewName("Traits", MSG
+ .view_tabs_common_traits()), null);
+ monitorAvail = new
SubTab(monitoringTab.extendLocatorId("Availability"), new
ViewName("Availability", MSG
+ .view_tabs_common_availability()), null);
+ monitorSched = new SubTab(monitoringTab.extendLocatorId("Schedules"),
new ViewName("Schedules", MSG
+ .view_tabs_common_schedules()), null);
+ monitorCallTime = new SubTab(monitoringTab.extendLocatorId("CallTime"),
new ViewName("CallTime", MSG
+ .view_tabs_common_calltime()), null);
+ monitoringTab.registerSubTabs(monitorGraphs, monitorTables, monitorTraits,
monitorAvail, monitorSched,
+ monitorCallTime);
+ tabs.add(monitoringTab);
+
+ eventsTab = new TwoLevelTab(getTabSet().extendLocatorId("Events"), new
ViewName("Events", MSG
+ .view_tabs_common_events()), "/images/icons/Events_grey_16.png");
+ this.eventHistory = new SubTab(eventsTab.extendLocatorId("History"),
new ViewName("History", MSG
+ .view_tabs_common_history()), null);
+ eventsTab.registerSubTabs(eventHistory);
+ tabs.add(eventsTab);
+
+ operationsTab = new
TwoLevelTab(getTabSet().extendLocatorId("Operations"), new
ViewName("Operations", MSG
+ .view_tabs_common_operations()),
"/images/icons/Operation_grey_16.png");
+ this.opHistory = new SubTab(operationsTab.extendLocatorId("History"),
new ViewName("History", MSG
+ .view_tabs_common_history()), null);
+ this.opSched = new SubTab(operationsTab.extendLocatorId("Scheduled"),
new ViewName("Scheduled", MSG
+ .view_tabs_common_scheduled()), null);
+ operationsTab.registerSubTabs(this.opHistory, this.opSched);
+ tabs.add(operationsTab);
+
configurationTab = new
TwoLevelTab(getTabSet().extendLocatorId("Configuration"), new
ViewName("Configuration",
MSG.view_tabs_common_configuration()),
"/images/icons/Configure_grey_16.png");
- this.configCurrent = new
SubTab(configurationTab.extendLocatorId("Current"), new
ViewName("Current",
- MSG.view_tabs_common_current()), null);
- this.configHistory = new
SubTab(configurationTab.extendLocatorId("History"), new
ViewName("History",
- MSG.view_tabs_common_history()), null);
+ this.configCurrent = new
SubTab(configurationTab.extendLocatorId("Current"), new
ViewName("Current", MSG
+ .view_tabs_common_current()), null);
+ this.configHistory = new
SubTab(configurationTab.extendLocatorId("History"), new
ViewName("History", MSG
+ .view_tabs_common_history()), null);
configurationTab.registerSubTabs(this.configCurrent, this.configHistory);
tabs.add(configurationTab);
- eventsTab = new TwoLevelTab(getTabSet().extendLocatorId("Events"), new
ViewName("Events",
- MSG.view_tabs_common_events()),
"/images/icons/Events_grey_16.png");
- this.eventHistory = new SubTab(eventsTab.extendLocatorId("History"),
new ViewName("History",
- MSG.view_tabs_common_history()), null);
- eventsTab.registerSubTabs(eventHistory);
- tabs.add(eventsTab);
-
- contentTab = new TwoLevelTab(getTabSet().extendLocatorId("Content"),
new ViewName("Content",
- MSG.view_tabs_common_content()),
"/images/icons/Content_grey_16.png");
- this.contentDeployed = new
SubTab(contentTab.extendLocatorId("Deployed"), new
ViewName("Deployed",
- MSG.view_tabs_common_deployed()), null);
+ contentTab = new TwoLevelTab(getTabSet().extendLocatorId("Content"),
new ViewName("Content", MSG
+ .view_tabs_common_content()),
"/images/icons/Content_grey_16.png");
+ this.contentDeployed = new
SubTab(contentTab.extendLocatorId("Deployed"), new
ViewName("Deployed", MSG
+ .view_tabs_common_deployed()), null);
this.contentNew = new SubTab(contentTab.extendLocatorId("New"),
new ViewName("New", MSG.view_tabs_common_new()), null);
this.contentSubscrip = new
SubTab(contentTab.extendLocatorId("Subscriptions"), new
ViewName("Subscriptions",
MSG.view_tabs_common_subscriptions()), null);
- this.contentHistory = new SubTab(contentTab.extendLocatorId("History"),
new ViewName("History",
- MSG.view_tabs_common_history()), null);
+ this.contentHistory = new SubTab(contentTab.extendLocatorId("History"),
new ViewName("History", MSG
+ .view_tabs_common_history()), null);
contentTab.registerSubTabs(contentDeployed, contentNew, contentSubscrip,
contentHistory);
tabs.add(contentTab);
@@ -238,15 +238,14 @@ public class ResourceDetailView extends
AbstractTwoLevelTabSetView<ResourceCompo
Set<ResourceTypeFacet> facets =
this.resourceComposite.getResourceFacets().getFacets();
// Summary Tab
- updateSubTab(this.summaryTab, this.summaryOverview,
- new OverviewView(this.summaryTab.extendLocatorId("OverviewView"),
this.resourceComposite), true, true);
+ updateSubTab(this.summaryTab, this.summaryOverview, new
OverviewView(this.summaryTab
+ .extendLocatorId("OverviewView"), this.resourceComposite), true,
true);
- updateSubTab(this.summaryTab, this.summaryDashboard,
- new DashboardView(this.summaryDashboard.extendLocatorId("View"),
this.resourceComposite), true, true);
+ updateSubTab(this.summaryTab, this.summaryDashboard, new
DashboardView(this.summaryDashboard
+ .extendLocatorId("View"), this.resourceComposite), true, true);
- updateSubTab(this.summaryTab, this.summaryTimeline,
- new FullHTMLPane(this.summaryTimeline.extendLocatorId("View"),
- "/rhq/resource/summary/timeline-plain.xhtml?id=" +
resource.getId()), true, true);
+ updateSubTab(this.summaryTab, this.summaryTimeline, new
FullHTMLPane(this.summaryTimeline
+ .extendLocatorId("View"),
"/rhq/resource/summary/timeline-plain.xhtml?id=" + resource.getId()), true,
true);
// Monitoring Tab
visible = hasMetricsOfType(this.resourceComposite, DataType.MEASUREMENT);
@@ -267,9 +266,8 @@ public class ResourceDetailView extends
AbstractTwoLevelTabSetView<ResourceCompo
updateSubTab(this.monitoringTab, this.monitorAvail, new
FullHTMLPane(this.monitorAvail.extendLocatorId("View"),
"/rhq/resource/monitor/availabilityHistory-plain.xhtml?id=" +
resource.getId()), true, true);
- updateSubTab(this.monitoringTab, this.monitorSched,
- new SchedulesView(monitoringTab.extendLocatorId("SchedulesView"),
resource.getId()),
- hasMetricsOfType(this.resourceComposite, null), true);
+ updateSubTab(this.monitoringTab, this.monitorSched, new
SchedulesView(monitoringTab
+ .extendLocatorId("SchedulesView"), resource.getId()),
hasMetricsOfType(this.resourceComposite, null), true);
visible = facets.contains(ResourceTypeFacet.CALL_TIME);
canvas = (visible) ? new
FullHTMLPane(this.monitorCallTime.extendLocatorId("View"),
@@ -279,8 +277,8 @@ public class ResourceDetailView extends
AbstractTwoLevelTabSetView<ResourceCompo
// Inventory Tab
ResourceType type = this.resourceComposite.getResource().getResourceType();
visible = !type.getChildResourceTypes().isEmpty();
- canvas = (visible) ? ResourceCompositeSearchView.getChildrenOf(
- this.inventoryTab.extendLocatorId("ChildrenView"),
resourceComposite) : null;
+ canvas = (visible) ? ResourceCompositeSearchView.getChildrenOf(this.inventoryTab
+ .extendLocatorId("ChildrenView"), resourceComposite) : null;
updateSubTab(this.inventoryTab, this.inventoryChildren, canvas, visible, true);
updateSubTab(this.inventoryTab, this.inventoryChildHistory, new Canvas(),
visible, true);
@@ -294,9 +292,8 @@ public class ResourceDetailView extends
AbstractTwoLevelTabSetView<ResourceCompo
canvas = (visible) ? new Canvas() : null; // TODO: Add real canvas when visible
updateSubTab(this.inventoryTab, this.inventoryConnHistory, canvas, visible,
true);
- updateSubTab(this.inventoryTab, this.inventoryGroups,
-
ResourceGroupListView.getGroupsOf(this.inventoryTab.extendLocatorId("GroupsView"),
resource.getId()), true,
- true);
+ updateSubTab(this.inventoryTab, this.inventoryGroups,
ResourceGroupListView.getGroupsOf(this.inventoryTab
+ .extendLocatorId("GroupsView"), resource.getId()), true, true);
enabled = globalPermissions.contains(Permission.MANAGE_INVENTORY);
canvas = (enabled) ? new
ResourceResourceGroupsView(this.inventoryTab.extendLocatorId("GroupMembershipView"),
@@ -311,58 +308,54 @@ public class ResourceDetailView extends
AbstractTwoLevelTabSetView<ResourceCompo
// 3) operation arguments/results become read-only configuration data in
the history details pop-up
// 4) user can navigate to the group operation that spawned this resource
operation history, if appropriate
// note: enabled operation execution/schedules from left-nav, if it
doesn't already exist
- updateSubTab(this.operationsTab, this.opHistory,
OperationHistoryView.getResourceHistoryView(
- operationsTab.extendLocatorId("HistoryView"),
this.resourceComposite), true, true);
+ updateSubTab(this.operationsTab, this.opHistory,
OperationHistoryView.getResourceHistoryView(operationsTab
+ .extendLocatorId("HistoryView"), this.resourceComposite), true,
true);
updateSubTab(this.operationsTab, this.opSched, new
FullHTMLPane(this.opSched.extendLocatorId("View"),
"/rhq/resource/operation/resourceOperationSchedules-plain.xhtml?id=" +
resource.getId()), true, true);
}
// Alerts Tab
- updateSubTab(this.alertsTab, this.alertHistory,
-
ResourceAlertHistoryView.get(this.alertHistory.extendLocatorId("View"),
resourceComposite), true, true);
+ updateSubTab(this.alertsTab, this.alertHistory,
ResourceAlertHistoryView.get(this.alertHistory
+ .extendLocatorId("View"), resourceComposite), true, true);
- updateSubTab(this.alertsTab, this.alertDef,
- new
ResourceAlertDefinitionsView(alertsTab.extendLocatorId("AlertDefView"),
this.resourceComposite), true,
- true);
+ updateSubTab(this.alertsTab, this.alertDef, new
ResourceAlertDefinitionsView(alertsTab
+ .extendLocatorId("AlertDefView"), this.resourceComposite), true,
true);
// Configuration Tab
- if (updateTab(this.configurationTab,
facets.contains(ResourceTypeFacet.CONFIGURATION),
- resourcePermissions.isConfigureRead())) {
+ if (updateTab(this.configurationTab,
facets.contains(ResourceTypeFacet.CONFIGURATION), resourcePermissions
+ .isConfigureRead())) {
- updateSubTab(this.configurationTab, this.configCurrent,
- new
ResourceConfigurationEditView(this.extendLocatorId("ResourceConfigView"),
resourceComposite), true,
- true);
+ updateSubTab(this.configurationTab, this.configCurrent, new
ResourceConfigurationEditView(this
+ .extendLocatorId("ResourceConfigView"), resourceComposite),
true, true);
- updateSubTab(this.configurationTab, this.configHistory,
-
ConfigurationHistoryView.getHistoryOf(this.extendLocatorId("ConfigHistView"),
resource.getId()), true,
- true);
+ updateSubTab(this.configurationTab, this.configHistory,
ConfigurationHistoryView.getHistoryOf(this
+ .extendLocatorId("ConfigHistView"), resource.getId()), true,
true);
}
// Events Tab
if (updateTab(this.eventsTab, facets.contains(ResourceTypeFacet.EVENT), true)) {
- updateSubTab(this.eventsTab, this.eventHistory,
EventCompositeHistoryView.get(
- this.eventsTab.extendLocatorId("CompositeHistoryView"),
resourceComposite), true, true);
+ updateSubTab(this.eventsTab, this.eventHistory,
EventCompositeHistoryView.get(this.eventsTab
+ .extendLocatorId("CompositeHistoryView"), resourceComposite),
true, true);
}
// Content Tab
if (updateTab(this.contentTab, facets.contains(ResourceTypeFacet.CONTENT), true))
{
- updateSubTab(this.contentTab, this.contentDeployed,
- new FullHTMLPane(this.contentDeployed.extendLocatorId("View"),
- "/rhq/resource/content/view-plain.xhtml?id=" +
resource.getId()), true, true);
+ updateSubTab(this.contentTab, this.contentDeployed, new
FullHTMLPane(this.contentDeployed
+ .extendLocatorId("View"),
"/rhq/resource/content/view-plain.xhtml?id=" + resource.getId()), true, true);
updateSubTab(this.contentTab, this.contentNew, new
FullHTMLPane(this.contentNew.extendLocatorId("View"),
"/rhq/resource/content/deploy-plain.xhtml?id=" +
resource.getId()), true, true);
- updateSubTab(this.contentTab, this.contentSubscrip,
- new FullHTMLPane(this.contentSubscrip.extendLocatorId("View"),
- "/rhq/resource/content/subscription-plain.xhtml?id=" +
resource.getId()), true, true);
+ updateSubTab(this.contentTab, this.contentSubscrip, new
FullHTMLPane(this.contentSubscrip
+ .extendLocatorId("View"),
"/rhq/resource/content/subscription-plain.xhtml?id=" + resource.getId()),
+ true, true);
- updateSubTab(this.contentTab, this.contentHistory,
- new FullHTMLPane(this.configHistory.extendLocatorId("View"),
- "/rhq/resource/content/history-plain.xhtml?id=" +
resource.getId()), true, true);
+ updateSubTab(this.contentTab, this.contentHistory, new
FullHTMLPane(this.configHistory
+ .extendLocatorId("View"),
"/rhq/resource/content/history-plain.xhtml?id=" + resource.getId()), true,
+ true);
}
this.show();