modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupAlertsPortlet.java | 5 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupBundleDeploymentsPortlet.java | 5 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupEventsPortlet.java | 5 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java | 8 +- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOobsPortlet.java | 5 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOperationsPortlet.java | 34 +++++++-- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupPkgHistoryPortlet.java | 5 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java | 35 ++++++++++ 8 files changed, 77 insertions(+), 25 deletions(-)
New commits: commit d1c21307bc3239d442473ed23ed26c6c65d0fb9f Author: Simeon Pinder spinder@redhat.com Date: Tue Mar 22 12:01:38 2011 -0400
i)fix portlets autogroup issue ii)make empty measurements and operations display more consistent.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupAlertsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupAlertsPortlet.java index 4fa8807..cc14736 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupAlertsPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupAlertsPortlet.java @@ -108,8 +108,9 @@ public class GroupAlertsPortlet extends AlertHistoryView implements CustomSettin //override the shared datasource //figure out which page we're loading String currentPage = History.getToken(); - String[] elements = currentPage.split("/"); - this.groupId = Integer.valueOf(elements[1]); + //get groupId + int groupId = AbstractActivityView.groupIdLookup(currentPage); + this.groupId = groupId;
setShowFilterForm(false); //disable filter form for portlet setOverflow(Overflow.VISIBLE); 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 4f50f15..2c4fdc1 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 @@ -95,9 +95,8 @@ public class GroupBundleDeploymentsPortlet extends LocatableVLayout implements C super(locatorId); //figure out which page we're loading String currentPage = History.getToken(); - String[] elements = currentPage.split("/"); - int currentGroupIdentifier = Integer.valueOf(elements[1]); - this.groupId = currentGroupIdentifier; + int groupId = AbstractActivityView.groupIdLookup(currentPage); + this.groupId = groupId; }
@Override 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 9978a6a..ec4dae7 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 @@ -96,9 +96,8 @@ public class GroupEventsPortlet extends LocatableVLayout implements CustomSettin super(locatorId); //figure out which page we're loading String currentPage = History.getToken(); - String[] elements = currentPage.split("/"); - int currentGroupIdentifier = Integer.valueOf(elements[1]); - this.groupId = currentGroupIdentifier; + int groupId = AbstractActivityView.groupIdLookup(currentPage); + this.groupId = groupId; }
@Override 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 d0a4f84..5cf7b36 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 @@ -113,8 +113,8 @@ public class GroupMetricsPortlet extends LocatableVLayout implements CustomSetti //figure out which page we're loading String currentPage = History.getToken(); String[] elements = currentPage.split("/"); - int currentGroupIdentifier = Integer.valueOf(elements[1]); - this.groupId = currentGroupIdentifier; + int groupId = AbstractActivityView.groupIdLookup(currentPage); + this.groupId = groupId; baseViewPath = elements[0]; }
@@ -438,6 +438,10 @@ public class GroupMetricsPortlet extends LocatableVLayout implements CustomSetti } }); } + } else { + LocatableDynamicForm row = AbstractActivityView.createEmptyDisplayRow(recentMeasurementsContent + .extendLocatorId("None"), AbstractActivityView.RECENT_MEASUREMENTS_NONE); + column.addMember(row); } } }); 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 206be22..ed3fb42 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 @@ -90,9 +90,8 @@ public class GroupOobsPortlet extends LocatableVLayout implements CustomSettings super(locatorId); //figure out which page we're loading String currentPage = History.getToken(); - String[] elements = currentPage.split("/"); - int currentGroupIdentifier = Integer.valueOf(elements[1]); - this.groupId = currentGroupIdentifier; + int groupId = AbstractActivityView.groupIdLookup(currentPage); + this.groupId = groupId; }
@Override 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 f2322b0..9c2be45 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 @@ -43,6 +43,7 @@ import org.rhq.core.domain.criteria.ResourceGroupCriteria; import org.rhq.core.domain.dashboard.DashboardPortlet; import org.rhq.core.domain.operation.GroupOperationHistory; import org.rhq.core.domain.operation.OperationRequestStatus; +import org.rhq.core.domain.resource.group.ResourceGroup; import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite; import org.rhq.core.domain.util.PageControl; import org.rhq.core.domain.util.PageList; @@ -116,10 +117,10 @@ public class GroupOperationsPortlet extends LocatableVLayout implements CustomSe //figure out which page we're loading String currentPage = History.getToken(); String[] elements = currentPage.split("/"); - int currentGroupIdentifier = Integer.valueOf(elements[1]); - this.groupId = currentGroupIdentifier; + int groupId = AbstractActivityView.groupIdLookup(currentPage); + this.groupId = groupId; //populate basepath - baseViewPath = elements[0]; + baseViewPath = AbstractActivityView.groupPathLookup(currentPage); }
@Override @@ -169,14 +170,22 @@ public class GroupOperationsPortlet extends LocatableVLayout implements CustomSe
groupOperations = new GroupOperationsCriteriaHistoryListView(locatorId, new GroupOperationsCriteriaDataSource(portletConfig), null, criteria, groupComposite); + } else { + Criteria criteria = new Criteria(); + ResourceGroup emptyGroup = new ResourceGroup(""); + emptyGroup.setId(-1); + Long zero = new Long(0); + groupComposite = new ResourceGroupComposite(zero, zero, zero, zero, emptyGroup); + groupOperations = new GroupOperationsCriteriaHistoryListView(locatorId, + new GroupOperationsCriteriaDataSource(portletConfig), null, criteria, groupComposite); + }
- //cleanup - for (Canvas child : recentOperationsContent.getChildren()) { - child.destroy(); - } - recentOperationsContent.addChild(groupOperations); - recentOperationsContent.markForRedraw(); + //cleanup + for (Canvas child : recentOperationsContent.getChildren()) { + child.destroy(); } + recentOperationsContent.addChild(groupOperations); + recentOperationsContent.markForRedraw(); } }); } @@ -188,6 +197,7 @@ public class GroupOperationsPortlet extends LocatableVLayout implements CustomSe setMembersMargin(5); setHeight("*"); setWidth100(); + //tell canvas to fill it's component recentOperationsContent.setHeight100(); addMember(recentOperationsContent); @@ -371,6 +381,12 @@ class GroupOperationsCriteriaHistoryListView extends GroupOperationHistoryListVi protected String getBasePath() { return "ResourceGroup/" + composite.getResourceGroup().getId() + "/Operations/History"; } + + @Override + protected void onInit() { + super.onInit(); + getListGrid().setEmptyMessage(MSG.view_portlet_results_empty()); + } }
/** Provide implementation of GroupOperationHistoryDataSource that dynamically 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 b7dbf69..30c21a7 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 @@ -93,9 +93,8 @@ public class GroupPkgHistoryPortlet extends LocatableVLayout implements CustomSe super(locatorId); //figure out which page we're loading String currentPage = History.getToken(); - String[] elements = currentPage.split("/"); - int currentGroupIdentifier = Integer.valueOf(elements[1]); - this.groupId = currentGroupIdentifier; + int groupId = AbstractActivityView.groupIdLookup(currentPage); + this.groupId = groupId; }
@Override 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 2da6e15..82ac645 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 @@ -594,4 +594,39 @@ public abstract class AbstractActivityView extends LocatableVLayout implements R return ((groupCategory == GroupCategory.MIXED) || (groupCategory == GroupCategory.COMPATIBLE && facets .contains(ResourceTypeFacet.EVENT))); } + + /* Utility method to extract groupId from + * + */ + public static int groupIdLookup(String currentPage) { + int groupId = -1; + if ((currentPage != null) && (!currentPage.trim().isEmpty())) { + String[] elements = currentPage.split("/"); + //process for groups and auto groups Ex. ResourceGroup/10111 or ResourceGroup/AutoCluster/10321 + try { + groupId = Integer.valueOf(elements[1]); + } catch (NumberFormatException nfe) { + groupId = Integer.valueOf(elements[2]); + } + } + return groupId; + } + + /* Utility method to extract groupId from + * + */ + public static String groupPathLookup(String currentPage) { + String groupBasePath = ""; + if ((currentPage != null) && (!currentPage.trim().isEmpty())) { + String[] elements = currentPage.split("/"); + //process for groups and auto groups Ex. ResourceGroup/10111 or ResourceGroup/AutoCluster/10321 + try { + Integer.valueOf(elements[1]); + groupBasePath = elements[0]; + } catch (NumberFormatException nfe) { + groupBasePath = elements[1] + "/" + elements[1]; + } + } + return groupBasePath; + } }