modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java | 36 ++++++++-- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ActivityView.java | 2 2 files changed, 31 insertions(+), 7 deletions(-)
New commits: commit 090a0441d704d1e2166b63ee621cd85b0d61a70c Author: Simeon Pinder spinder@redhat.com Date: Tue Mar 1 12:26:58 2011 -0500
enable refresh for Resource/Group Activity pages.
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 ba1333e..0aa86cf 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 @@ -23,12 +23,17 @@ import java.util.Set; import com.allen_sauer.gwt.log.client.Log; import com.google.gwt.user.client.rpc.AsyncCallback; import com.smartgwt.client.widgets.HTMLFlow; +import com.smartgwt.client.widgets.IButton; import com.smartgwt.client.widgets.Img; +import com.smartgwt.client.widgets.events.ClickEvent; +import com.smartgwt.client.widgets.events.ClickHandler; import com.smartgwt.client.widgets.form.fields.FormItemIcon; import com.smartgwt.client.widgets.form.fields.LinkItem; import com.smartgwt.client.widgets.form.fields.StaticTextItem; import com.smartgwt.client.widgets.layout.HLayout; +import com.smartgwt.client.widgets.layout.LayoutSpacer; import com.smartgwt.client.widgets.layout.VLayout; +import com.smartgwt.client.widgets.toolbar.ToolStrip;
import org.rhq.core.domain.criteria.ResourceGroupCriteria; import org.rhq.core.domain.measurement.MeasurementDefinition; @@ -46,12 +51,17 @@ import org.rhq.enterprise.gui.coregui.client.util.measurement.GwtMonitorUtils; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableCanvas; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableIButton; +import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/** * @author Simeon Pinder */ -public abstract class AbstractActivityView extends LocatableHLayout implements RefreshableView { +public abstract class AbstractActivityView extends LocatableVLayout implements RefreshableView { + + //contains the activity display region + private LocatableHLayout columnSection = new LocatableHLayout("ActivityRegion");
//Locatable ui references protected VLayout leftPane = new VLayout(); @@ -88,6 +98,7 @@ public abstract class AbstractActivityView extends LocatableHLayout implements R private ResourceGroupComposite groupComposite = null; private ResourceComposite resourceComposite = null; private HLayout recentBundleDeployTitle; + private ToolStrip footer;
public AbstractActivityView(String locatorId, ResourceGroupComposite groupComposite, ResourceComposite resourceComposite) { @@ -98,6 +109,7 @@ public abstract class AbstractActivityView extends LocatableHLayout implements R if (resourceComposite != null) { this.resourceComposite = resourceComposite; } + addMember(columnSection); initializeUi(); }
@@ -112,13 +124,11 @@ public abstract class AbstractActivityView extends LocatableHLayout implements R HTMLFlow divider3 = new HTMLFlow("<hr/>"); HTMLFlow divider4 = new HTMLFlow("<hr/>"); HTMLFlow divider5 = new HTMLFlow("<hr/>"); - // HTMLFlow divider6 = new HTMLFlow("<hr/>"); divider1.setWidth("50%"); divider2.setWidth("50%"); divider3.setWidth("50%"); divider4.setWidth("50%"); divider5.setWidth("50%"); - // divider6.setWidth("50%");
//leftPane leftPane.setWidth("50%"); @@ -198,8 +208,24 @@ public abstract class AbstractActivityView extends LocatableHLayout implements R recentBundleDeployTitle.setHeight(20); deployBundleViewIfApplicable(resource, group);
- addMember(leftPane); - addMember(rightPane); + columnSection.addMember(leftPane); + columnSection.addMember(rightPane); + + //Add footer region + this.footer = new ToolStrip(); + footer.setPadding(5); + footer.setWidth100(); + footer.setMembersMargin(15); + footer.addMember(new LayoutSpacer()); + IButton refreshButton = new LocatableIButton(extendLocatorId("Refresh"), MSG.common_button_refresh()); + refreshButton.addClickHandler(new ClickHandler() { + public void onClick(ClickEvent clickEvent) { + loadData(); + refresh(); + } + }); + footer.addMember(refreshButton); + addMember(footer);
}
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 07f0821..54a9d93 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 @@ -96,11 +96,9 @@ public class ActivityView extends AbstractActivityView {
//conditionally display Bundle Deployments region. Resource resource = null; - // ResourceGroup group = null; if (resourceComposite != null) { resource = resourceComposite.getResource(); } - // if (deployBundleViewIfApplicable(resource, group)) { if ((resource != null) && (displayBundlesForResource(resource))) { getRecentBundleDeployments(); }
rhq-commits@lists.fedorahosted.org