modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java | 12 ++++++- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java | 10 +---- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ActivityView.java | 17 ++-------- 3 files changed, 17 insertions(+), 22 deletions(-)
New commits: commit 98b7898e296ca6a9bc26baafcf642ff7afefcd66 Author: Ian Springer ian.springer@redhat.com Date: Tue Dec 14 10:47:24 2010 -0500
fix bug where content of Resource Summary>Activity subtab was not rendered on first selection of that subtab; change so ResourceSelectListeners are registered on ResourceDetailView and actually called when a Resource is selected (though there is currently no code that register selection listeners, so we can consider getting rid of the API altogether)
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 50e994f..5fab7c4 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 @@ -53,6 +53,7 @@ import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.AbstractTwo import org.rhq.enterprise.gui.coregui.client.inventory.common.event.EventCompositeHistoryView; import org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupListView; import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceCompositeSearchView; +import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceSelectListener; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.configuration.ConfigurationHistoryView; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.configuration.ResourceConfigurationEditView; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.inventory.PluginConfigurationEditView; @@ -77,6 +78,8 @@ public class ResourceDetailView extends AbstractTwoLevelTabSetView<ResourceCompo
private ResourceComposite resourceComposite;
+ private List<ResourceSelectListener> selectListeners = new ArrayList<ResourceSelectListener>(); + private TwoLevelTab summaryTab; private TwoLevelTab monitoringTab; private TwoLevelTab inventoryTab; @@ -221,6 +224,9 @@ public class ResourceDetailView extends AbstractTwoLevelTabSetView<ResourceCompo
protected void updateTabContent(ResourceComposite resourceComposite) { this.resourceComposite = resourceComposite; + for (ResourceSelectListener selectListener : this.selectListeners) { + selectListener.onResourceSelected(this.resourceComposite); + } Resource resource = this.resourceComposite.getResource(); getTitleBar().setResource(this.resourceComposite);
@@ -379,6 +385,10 @@ public class ResourceDetailView extends AbstractTwoLevelTabSetView<ResourceCompo return this.resourceId; }
+ public void addResourceSelectListener(ResourceSelectListener listener) { + this.selectListeners.add(listener); + } + @Override protected ResourceComposite getSelectedItem() { return this.resourceComposite; @@ -423,7 +433,6 @@ public class ResourceDetailView extends AbstractTwoLevelTabSetView<ResourceCompo new ResourceTypeRepository.TypeLoadedCallback() { public void onTypesLoaded(ResourceType type) { resourceComposite.getResource().setResourceType(type); - ResourceDetailView.this.resourceComposite = resourceComposite; updateTabContent(resourceComposite); selectTab(getTabName(), getSubTabName(), viewPath); } @@ -440,4 +449,5 @@ public class ResourceDetailView extends AbstractTwoLevelTabSetView<ResourceCompo } return false; } + } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java index ffcfce4..35c6c21 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java @@ -80,7 +80,6 @@ import org.rhq.enterprise.gui.coregui.client.gwt.ResourceTypeGWTServiceAsync; import org.rhq.enterprise.gui.coregui.client.inventory.InventoryView; import org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.ResourceGroupContextMenu; import org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.ResourceGroupDetailView; -import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceSelectListener; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.ResourceTreeDatasource.AutoGroupTreeNode; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.ResourceTreeDatasource.ResourceTreeNode; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.operation.create.OperationCreateWizard; @@ -105,8 +104,6 @@ public class ResourceTreeView extends LocatableVLayout { private Menu resourceContextMenu; private ResourceGroupContextMenu autoGroupContextMenu;
- private List<ResourceSelectListener> selectListeners = new ArrayList<ResourceSelectListener>(); - // Maps autogroup/type backing group ids to the corresponding autogroup/type nodes. private Map<Integer, AutoGroupTreeNode> autoGroupNodeMap = new HashMap<Integer, AutoGroupTreeNode>();
@@ -300,7 +297,7 @@ public class ResourceTreeView extends LocatableVLayout {
private void updateSelection() {
- TreeNode selectedNode = null; + TreeNode selectedNode; if (treeGrid != null && treeGrid.getTree() != null && (selectedNode = treeGrid.getTree().findById(selectedNodeId)) != null) {
@@ -820,10 +817,6 @@ public class ResourceTreeView extends LocatableVLayout { } */
- public void addResourceSelectListener(ResourceSelectListener listener) { - this.selectListeners.add(listener); - } - public void renderView(ViewPath viewPath) { currentViewId = viewPath.getCurrent(); String currentViewIdPath = currentViewId.getPath(); @@ -839,4 +832,5 @@ public class ResourceTreeView extends LocatableVLayout { setSelectedResource(resourceId); } } + } 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 225f0c8..c7b6dee 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 @@ -30,7 +30,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; * @author Ian Springer */ // TODO: Implement this. -public class ActivityView extends LocatableVLayout implements ResourceSelectListener, RefreshableView { +public class ActivityView extends LocatableVLayout implements RefreshableView {
private ResourceComposite resourceComposite; private FullHTMLPane iFrame; @@ -47,22 +47,13 @@ public class ActivityView extends LocatableVLayout implements ResourceSelectList this.iFrame = new FullHTMLPane(extendLocatorId("IFrame"), null); addMember(this.iFrame);
- if (this.resourceComposite != null) { - onResourceSelected(this.resourceComposite); - } - } - - @Override - public void onResourceSelected(ResourceComposite resourceComposite) { - this.resourceComposite = resourceComposite; + refresh(); }
@Override public void refresh() { - if (this.iFrame != null) { - this.iFrame.setContentsURL("/rhq/resource/summary/overview-plain.xhtml?id=" + - this.resourceComposite.getResource().getId()); - } + int resourceId = this.resourceComposite.getResource().getId(); + this.iFrame.setContentsURL("/rhq/resource/summary/overview-plain.xhtml?id=" + resourceId); }
}
rhq-commits@lists.fedorahosted.org