modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java
| 79 +++++++---
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/ActivityView2.java
| 44 +++--
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ActivityView.java
| 46 ++++-
3 files changed, 125 insertions(+), 44 deletions(-)
New commits:
commit 9fb84ad1ef8050bc76e7992bfcdf3945fd50c575
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Tue Mar 1 15:34:23 2011 -0500
modify resource activity regions to enable on facet availability.
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java
index 2ec1bee..ccbe871 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java
@@ -142,6 +142,7 @@ public abstract class AbstractActivityView extends LocatableVLayout
implements R
ResourceGroup group = null;
GroupCategory groupCategory = null;
Set<ResourceTypeFacet> facets = null;
+ Set<ResourceTypeFacet> resourceFacets = null;
if ((groupComposite != null) && (groupComposite.getResourceGroup() !=
null)) {
group = groupComposite.getResourceGroup();
group = groupComposite.getResourceGroup();
@@ -150,6 +151,7 @@ public abstract class AbstractActivityView extends LocatableVLayout
implements R
}
if (resourceComposite != null) {
resource = resourceComposite.getResource();
+ resourceFacets = this.resourceComposite.getResourceFacets().getFacets();
}
//recentMetrics.xhtml
@@ -183,7 +185,8 @@ public abstract class AbstractActivityView extends LocatableVLayout
implements R
HLayout recentConfigUpdatesTitle = new
TitleWithIcon("subsystems/configure/Configure_24.png",
RECENT_CONFIGURATIONS);
recentConfigurationContent.setHeight(20);
- if ((resource != null) || (displayGroupConfigurationUpdates(groupCategory,
facets))) {//resource
+ if (((resource != null) &&
(resourceFacets.contains(ResourceTypeFacet.CONFIGURATION)))
+ || (displayGroupConfigurationUpdates(groupCategory, facets))) {//resource
rightPane.addMember(recentConfigUpdatesTitle);
rightPane.addMember(recentConfigurationContent);
firstRightPanePortletLoaded = true;
@@ -192,7 +195,8 @@ public abstract class AbstractActivityView extends LocatableVLayout
implements R
//recentOperations.xhtml
HLayout recentOperationsTitle = new
TitleWithIcon("subsystems/control/Operation_24.png", RECENT_OPERATIONS);
recentOperationsContent.setHeight(20);
- if ((resource != null) || (displayGroupOperations(groupCategory, facets)))
{//resource
+ if (((resource != null) &&
(resourceFacets.contains(ResourceTypeFacet.OPERATION)))
+ || (displayGroupOperations(groupCategory, facets))) {//resource
if (firstRightPanePortletLoaded) {
rightPane.addMember(divider3);
}
@@ -203,7 +207,8 @@ public abstract class AbstractActivityView extends LocatableVLayout
implements R
//recentEventCounts.xhtml
HLayout recentEventsTitle = new
TitleWithIcon("subsystems/event/Events_24.png", RECENT_EVENTS);
recentEventsContent.setHeight(20);
- if ((resource != null) || displayGroupEvents(groupCategory, facets)) {//resource
+ if (((resource != null) &&
(resourceFacets.contains(ResourceTypeFacet.EVENT)))
+ || displayGroupEvents(groupCategory, facets)) {//resource
if (firstRightPanePortletLoaded) {
rightPane.addMember(divider4);
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ActivityView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ActivityView.java
index 54a9d93..1e37f9b 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ActivityView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ActivityView.java
@@ -48,6 +48,8 @@ import
org.rhq.core.domain.measurement.composite.MeasurementDataNumericHighLowCo
import org.rhq.core.domain.measurement.composite.MeasurementOOBComposite;
import org.rhq.core.domain.operation.composite.ResourceOperationLastCompletedComposite;
import org.rhq.core.domain.resource.Resource;
+import org.rhq.core.domain.resource.ResourceType;
+import org.rhq.core.domain.resource.ResourceTypeFacet;
import org.rhq.core.domain.resource.composite.DisambiguationReport;
import org.rhq.core.domain.resource.composite.ResourceComposite;
import org.rhq.core.domain.util.PageControl;
@@ -86,21 +88,39 @@ public class ActivityView extends AbstractActivityView {
/**Initiates data request.
*/
protected void loadData() {
- getRecentAlerts();
- getRecentOperations();
- getRecentConfigurationUpdates();
- getRecentEventUpdates();
- getRecentOobs();
- getRecentPkgHistory();
- getRecentMetrics();
-
- //conditionally display Bundle Deployments region.
+
+ ResourceType type = null;
Resource resource = null;
- if (resourceComposite != null) {
+ Set<ResourceTypeFacet> facets = null;
+
+ if ((resourceComposite != null) && (resourceComposite.getResource() !=
null)) {
resource = resourceComposite.getResource();
- }
- if ((resource != null) && (displayBundlesForResource(resource))) {
- getRecentBundleDeployments();
+ type = this.resourceComposite.getResource().getResourceType();
+ facets = this.resourceComposite.getResourceFacets().getFacets();
+
+ //alerts
+ getRecentAlerts();
+ //operations
+ if (facets.contains(ResourceTypeFacet.OPERATION)) {
+ getRecentOperations();
+ }
+ //config updates
+ if (facets.contains(ResourceTypeFacet.CONFIGURATION)) {
+ getRecentConfigurationUpdates();
+ }
+ //events
+ if (facets.contains(ResourceTypeFacet.EVENT)) {
+ getRecentEventUpdates();
+ }
+ //measurements
+ getRecentOobs();
+ getRecentPkgHistory();
+ getRecentMetrics();
+
+ //conditionally display Bundle Deployments region.
+ if (displayBundlesForResource(resource)) {
+ getRecentBundleDeployments();
+ }
}
}
commit 3e54fc6f0a3698d5e24fec13de22ce2f64d695e7
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Tue Mar 1 15:03:46 2011 -0500
modify group activity display to display with facet availability.
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java
index 0aa86cf..2ec1bee 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java
@@ -39,6 +39,7 @@ import org.rhq.core.domain.criteria.ResourceGroupCriteria;
import org.rhq.core.domain.measurement.MeasurementDefinition;
import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceCategory;
+import org.rhq.core.domain.resource.ResourceTypeFacet;
import org.rhq.core.domain.resource.composite.ResourceComposite;
import org.rhq.core.domain.resource.group.GroupCategory;
import org.rhq.core.domain.resource.group.ResourceGroup;
@@ -99,6 +100,7 @@ public abstract class AbstractActivityView extends LocatableVLayout
implements R
private ResourceComposite resourceComposite = null;
private HLayout recentBundleDeployTitle;
private ToolStrip footer;
+ private boolean firstRightPanePortletLoaded = false;
public AbstractActivityView(String locatorId, ResourceGroupComposite groupComposite,
ResourceComposite resourceComposite) {
@@ -138,8 +140,13 @@ public abstract class AbstractActivityView extends LocatableVLayout
implements R
Resource resource = null;
ResourceGroup group = null;
- if (groupComposite != null) {
+ GroupCategory groupCategory = null;
+ Set<ResourceTypeFacet> facets = null;
+ if ((groupComposite != null) && (groupComposite.getResourceGroup() !=
null)) {
+ group = groupComposite.getResourceGroup();
group = groupComposite.getResourceGroup();
+ groupCategory = groupComposite.getResourceGroup().getGroupCategory();
+ facets = groupComposite.getResourceFacets().getFacets();
}
if (resourceComposite != null) {
resource = resourceComposite.getResource();
@@ -147,7 +154,7 @@ public abstract class AbstractActivityView extends LocatableVLayout
implements R
//recentMetrics.xhtml
HLayout recentMetricsTitle = new
TitleWithIcon("subsystems/monitor/Monitor_24.png", RECENT_MEASUREMENTS);
- if ((resource != null) || ((group != null) &&
(group.getGroupCategory().equals(GroupCategory.COMPATIBLE)))) {//resource,CompatibleGroup
+ if ((resource != null) || ((group != null) &&
(groupCategory.equals(GroupCategory.COMPATIBLE)))) {//resource,CompatibleGroup
leftPane.addMember(recentMetricsTitle);
leftPane.addMember(recentMeasurementsContent);
recentMeasurementsContent.setHeight(20);
@@ -160,45 +167,57 @@ public abstract class AbstractActivityView extends LocatableVLayout
implements R
recentAlertsContent.setHeight(20);
//recentOOBs.xhtml
HLayout recentOobsTitle = new
TitleWithIcon("subsystems/monitor/Monitor_failed_24.png", RECENT_OOB);
-
- if ((resource != null) || ((group != null) &&
(group.getGroupCategory().equals(GroupCategory.COMPATIBLE)))) {//resource,CompatibleGroup
+ recentOobContent.setHeight(20);
+ if ((resource != null) || ((group != null) &&
(groupCategory.equals(GroupCategory.COMPATIBLE)))) {//resource,CompatibleGroup
leftPane.addMember(divider2);
leftPane.addMember(recentOobsTitle);
leftPane.addMember(recentOobContent);
- recentOobContent.setHeight(20);
}
//rightPane
rightPane.setWidth("50%");
rightPane.setPadding(5);
rightPane.setMembersMargin(5);
rightPane.setAutoHeight();
+ firstRightPanePortletLoaded = false;
//recentConfigUpdates.xhtml
HLayout recentConfigUpdatesTitle = new
TitleWithIcon("subsystems/configure/Configure_24.png",
RECENT_CONFIGURATIONS);
- if ((resource != null) || ((group != null) &&
(group.getGroupCategory().equals(GroupCategory.COMPATIBLE)))) {//resource,CompatibleGroup
+ recentConfigurationContent.setHeight(20);
+ if ((resource != null) || (displayGroupConfigurationUpdates(groupCategory,
facets))) {//resource
rightPane.addMember(recentConfigUpdatesTitle);
rightPane.addMember(recentConfigurationContent);
- recentConfigurationContent.setHeight(20);
- rightPane.addMember(divider3);
+ firstRightPanePortletLoaded = true;
}
+
//recentOperations.xhtml
HLayout recentOperationsTitle = new
TitleWithIcon("subsystems/control/Operation_24.png", RECENT_OPERATIONS);
- if ((resource != null) || ((group != null) &&
(group.getGroupCategory().equals(GroupCategory.COMPATIBLE)))) {//resource,CompatibleGroup
+ recentOperationsContent.setHeight(20);
+ if ((resource != null) || (displayGroupOperations(groupCategory, facets)))
{//resource
+ if (firstRightPanePortletLoaded) {
+ rightPane.addMember(divider3);
+ }
rightPane.addMember(recentOperationsTitle);
rightPane.addMember(recentOperationsContent);
- recentOperationsContent.setHeight(20);
- rightPane.addMember(divider4);
+ firstRightPanePortletLoaded = true;
}
//recentEventCounts.xhtml
HLayout recentEventsTitle = new
TitleWithIcon("subsystems/event/Events_24.png", RECENT_EVENTS);
- rightPane.addMember(recentEventsTitle);
- rightPane.addMember(recentEventsContent);
recentEventsContent.setHeight(20);
+ if ((resource != null) || displayGroupEvents(groupCategory, facets)) {//resource
+ if (firstRightPanePortletLoaded) {
+ rightPane.addMember(divider4);
+ }
+ rightPane.addMember(recentEventsTitle);
+ rightPane.addMember(recentEventsContent);
+ firstRightPanePortletLoaded = true;
+ }
//recentPackageHistory.xhtml
HLayout recentPkgHistoryTitle = new
TitleWithIcon("subsystems/content/Package_24.png", RECENT_PKG_HISTORY);
recentPkgHistoryContent.setHeight(20);
- if ((resource != null) || ((group != null) &&
(group.getGroupCategory().equals(GroupCategory.COMPATIBLE)))) {//resource,CompatibleGroup
- rightPane.addMember(divider5);
+ if ((resource != null) || ((group != null) &&
(groupCategory.equals(GroupCategory.COMPATIBLE)))) {//resource,CompatibleGroup
+ if (firstRightPanePortletLoaded) {
+ rightPane.addMember(divider5);
+ }
rightPane.addMember(recentPkgHistoryTitle);
rightPane.addMember(recentPkgHistoryContent);
}
@@ -315,7 +334,9 @@ public abstract class AbstractActivityView extends LocatableVLayout
implements R
HTMLFlow divider6 = new HTMLFlow("<hr/>");
divider6.setWidth("50%");
- rightPane.addMember(divider6);
+ if (firstRightPanePortletLoaded) {
+ rightPane.addMember(divider6);
+ }
rightPane.addMember(recentBundleDeployTitle);
rightPane.addMember(recentBundleDeployContent);
rightPane.markForRedraw();
@@ -428,4 +449,25 @@ public abstract class AbstractActivityView extends LocatableVLayout
implements R
}
}
+ protected boolean displayGroupConfigurationUpdates(GroupCategory groupCategory,
Set<ResourceTypeFacet> facets) {
+ if ((groupCategory == null) || facets == null) {
+ return false;
+ }
+ return (groupCategory == GroupCategory.COMPATIBLE &&
facets.contains(ResourceTypeFacet.CONFIGURATION));
+ }
+
+ protected boolean displayGroupOperations(GroupCategory groupCategory,
Set<ResourceTypeFacet> facets) {
+ if ((groupCategory == null) || facets == null) {
+ return false;
+ }
+ return ((groupCategory == GroupCategory.COMPATIBLE) &&
facets.contains(ResourceTypeFacet.OPERATION));
+ }
+
+ protected boolean displayGroupEvents(GroupCategory groupCategory,
Set<ResourceTypeFacet> facets) {
+ if ((groupCategory == null) || facets == null) {
+ return false;
+ }
+ return ((groupCategory == GroupCategory.MIXED) || (groupCategory ==
GroupCategory.COMPATIBLE && facets
+ .contains(ResourceTypeFacet.EVENT)));
+ }
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/ActivityView2.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/ActivityView2.java
index 14cd2b3..71a1bf8 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/ActivityView2.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/ActivityView2.java
@@ -50,6 +50,7 @@ import org.rhq.core.domain.measurement.MeasurementDefinition;
import org.rhq.core.domain.measurement.composite.MeasurementDataNumericHighLowComposite;
import org.rhq.core.domain.measurement.composite.MeasurementOOBComposite;
import org.rhq.core.domain.operation.GroupOperationHistory;
+import org.rhq.core.domain.resource.ResourceTypeFacet;
import org.rhq.core.domain.resource.composite.DisambiguationReport;
import org.rhq.core.domain.resource.group.GroupCategory;
import org.rhq.core.domain.resource.group.ResourceGroup;
@@ -89,23 +90,36 @@ public class ActivityView2 extends AbstractActivityView {
/**Initiates data request.
*/
protected void loadData() {
- getRecentAlerts();
- getRecentEventUpdates();
- if ((groupComposite != null)
- &&
(groupComposite.getResourceGroup().getGroupCategory().equals(GroupCategory.COMPATIBLE)))
{//CompatibleGroup
- //TODO: spinder should we drive these calls off of facet availability?
- getRecentOperations();
- getRecentConfigurationUpdates();
- getRecentOobs();
- getRecentPkgHistory();
- getRecentMetrics();
- }
- //conditionally display Bundle deployments for groups of platforms only
ResourceGroup group = null;
- if (groupComposite != null) {
+ GroupCategory groupCategory = null;
+ Set<ResourceTypeFacet> facets = null;
+ if ((groupComposite != null) && (groupComposite.getResourceGroup() !=
null)) {
group = groupComposite.getResourceGroup();
- }
- if (group != null) {
+ groupCategory = groupComposite.getResourceGroup().getGroupCategory();
+ //Load Facets to conditionally display relevant tabs
+ facets = groupComposite.getResourceFacets().getFacets();
+
+ getRecentAlerts();
+ //events
+ if (displayGroupEvents(groupCategory, facets)) {
+ getRecentEventUpdates();
+ }
+ //operations
+ if (displayGroupOperations(groupCategory, facets)) {
+ getRecentOperations();
+ }
+ //Config updates
+ if (displayGroupConfigurationUpdates(groupCategory, facets)) {
+ getRecentConfigurationUpdates();
+ }
+ //recentMetrics,oobs,pkghistory
+ if (groupCategory == GroupCategory.COMPATIBLE) {
+ getRecentOobs();
+ getRecentPkgHistory();
+ getRecentMetrics();
+ }
+
+ //conditionally display Bundle deployments for groups of platforms only
displayBundleDeploymentsForPlatformGroups(group);
}
}