modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/AbstractTwoLevelTabSetView.java
| 5 +++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java
| 5 +++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
| 15 ++++++++--
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
| 3 --
4 files changed, 24 insertions(+), 4 deletions(-)
New commits:
commit 7071ace4dbad2dbe6b3e3284b720db3a78e15d2b
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Mon Mar 4 15:15:58 2013 -0800
Charting - Fix refresh bug with group d3 graphs not refreshing when click on different
sub tab.
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/AbstractTwoLevelTabSetView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/AbstractTwoLevelTabSetView.java
index b09e352..cb8d857 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/AbstractTwoLevelTabSetView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/AbstractTwoLevelTabSetView.java
@@ -42,6 +42,7 @@ import
org.rhq.enterprise.gui.coregui.client.components.tab.TwoLevelTabSelectedE
import org.rhq.enterprise.gui.coregui.client.components.tab.TwoLevelTabSelectedHandler;
import org.rhq.enterprise.gui.coregui.client.components.tab.TwoLevelTabSet;
import org.rhq.enterprise.gui.coregui.client.components.view.ViewFactory;
+import
org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.D3GroupGraphListView;
import
org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.D3GraphListView;
import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
@@ -60,6 +61,7 @@ public abstract class AbstractTwoLevelTabSetView<T, U extends
Layout> extends Lo
private U titleBar;
protected Set<Permission> globalPermissions;
protected D3GraphListView d3GraphListView;
+ protected D3GroupGraphListView d3GroupGraphListView;
public AbstractTwoLevelTabSetView(String locatorId, String baseViewPath) {
super(locatorId);
@@ -237,6 +239,9 @@ public abstract class AbstractTwoLevelTabSetView<T, U extends
Layout> extends Lo
if(null != d3GraphListView){
d3GraphListView.redrawGraphs();
}
+ if(null != d3GroupGraphListView){
+ d3GroupGraphListView.redrawGraphs();
+ }
} finally {
notifyViewRenderedListeners();
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java
index 623518f..6c775cf 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java
@@ -78,6 +78,11 @@ public class D3GroupGraphListView extends AbstractD3GraphListView {
}
}
+
+ public void redrawGraphs(){
+ buildGraphs();
+ }
+
/**
* Build whatever graph metrics (MeasurementDefinitions) are defined for the
resource.
*/
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 12a7796..753e203 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
@@ -321,11 +321,12 @@ public class ResourceGroupDetailView extends
AbstractTwoLevelTabSetView<Resource
boolean visibleToIE8 = !BrowserUtility.isBrowserIE8();
-
viewFactory = (!visibleToIE8) ? null : new ViewFactory() {
@Override
public Canvas createView() {
- return new
D3GroupGraphListView(monitoringTab.extendLocatorId("NewGraphs"),
groupComposite.getResourceGroup(), true);
+ d3GroupGraphListView = new
D3GroupGraphListView(monitoringTab.extendLocatorId("NewGraphs"),
groupComposite.getResourceGroup(), true);
+ return d3GroupGraphListView;
+
}
};
@@ -598,6 +599,12 @@ public class ResourceGroupDetailView extends
AbstractTwoLevelTabSetView<Resource
group.setResourceType(type);
updateTabContent(groupComposite, viewPath.isRefresh());
selectTab(getTabName(), getSubTabName(), viewPath);
+ Log.debug(" **** 1 *****"+d3GroupGraphListView);
+ if(null != d3GroupGraphListView){
+ Log.debug(" *** Refreshing Group D3 Graphs");
+ d3GroupGraphListView.redrawGraphs();
+ Log.debug(" **** 2 *****");
+ }
} finally {
notifyViewRenderedListeners();
}
@@ -607,6 +614,10 @@ public class ResourceGroupDetailView extends
AbstractTwoLevelTabSetView<Resource
try {
updateTabContent(groupComposite, viewPath.isRefresh());
selectTab(getTabName(), getSubTabName(), viewPath);
+ Log.debug(" **** 3 *****");
+ if(null != d3GroupGraphListView){
+ d3GroupGraphListView.redrawGraphs();
+ }
} finally {
notifyViewRenderedListeners();
}
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 437871c..ec1560f 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
@@ -428,8 +428,7 @@ public class ResourceDetailView extends
AbstractTwoLevelTabSetView<ResourceCompo
};
updateSubTab(this.monitoringTab, this.monitorGraphs, visible, true,
viewFactory);
- //boolean visibleToIE8 = !BrowserUtility.isBrowserIE8();
- boolean visibleToIE8 = true;
+ boolean visibleToIE8 = !BrowserUtility.isBrowserIE8();
viewFactory = (!visibleToIE8) ? null : new ViewFactory() {
Show replies by date