modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractD3GraphListView.java | 4 + modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/AbstractTwoLevelTabSetView.java | 15 ++---- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java | 7 -- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java | 24 +++++----- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java | 13 ++++- 5 files changed, 33 insertions(+), 30 deletions(-)
New commits: commit dddb8e54eddabc90e48aa4f913ee207ffa58f579 Author: Mike Thompson mithomps@redhat.com Date: Mon Mar 4 16:14:46 2013 -0800
Charting - Replace the AbstractD3GraphListView with Generics version in AbstractTwoLevelTabSetView.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractD3GraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractD3GraphListView.java index dd12c72..6ca58c0 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractD3GraphListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractD3GraphListView.java @@ -37,7 +37,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; * Provide the shared stuff for create GraphListViews like Availability graphs * and User Preferences pickers for the date range. */ -public class AbstractD3GraphListView extends LocatableVLayout { +public abstract class AbstractD3GraphListView extends LocatableVLayout { protected PageList<Availability> availabilityList; protected AvailabilityD3Graph availabilityGraph; protected static Label loadingLabel = new Label(MSG.common_msg_loading()); @@ -49,6 +49,8 @@ public class AbstractD3GraphListView extends LocatableVLayout { measurementRangeEditor = new UserPreferencesMeasurementRangeEditor(this.getLocatorId()); }
+ public abstract void redrawGraphs(); + protected void queryAvailability(final int resourceId, final CountDownLatch countDownLatch) {
final long startTime = System.currentTimeMillis(); 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 cb8d857..adf8a78 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.common.AbstractD3GraphListView; 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; @@ -51,7 +52,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; * @author Greg Hinkle * @author Ian Springer */ -public abstract class AbstractTwoLevelTabSetView<T, U extends Layout> extends LocatableVLayout implements +public abstract class AbstractTwoLevelTabSetView<T, U extends Layout, V extends AbstractD3GraphListView> extends LocatableVLayout implements BookmarkableView, TwoLevelTabSelectedHandler {
private String baseViewPath; @@ -60,8 +61,7 @@ public abstract class AbstractTwoLevelTabSetView<T, U extends Layout> extends Lo private String subTabName; private U titleBar; protected Set<Permission> globalPermissions; - protected D3GraphListView d3GraphListView; - protected D3GroupGraphListView d3GroupGraphListView; + protected V graphListView;
public AbstractTwoLevelTabSetView(String locatorId, String baseViewPath) { super(locatorId); @@ -92,11 +92,11 @@ public abstract class AbstractTwoLevelTabSetView<T, U extends Layout> extends Lo public abstract Integer getSelectedItemId();
protected abstract U createTitleBar(); + protected abstract V createD3GraphListView();
protected abstract List<TwoLevelTab> createTabs();
/** - * TODO * * @param itemId * @param viewPath @@ -236,11 +236,8 @@ public abstract class AbstractTwoLevelTabSetView<T, U extends Layout> extends Lo // safely rendered. Make sure to notify even on failure. try { this.selectTab(this.tabName, this.subTabName, viewPath); - if(null != d3GraphListView){ - d3GraphListView.redrawGraphs(); - } - if(null != d3GroupGraphListView){ - d3GroupGraphListView.redrawGraphs(); + if(null != graphListView){ + graphListView.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 6c775cf..e23a127 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 @@ -74,19 +74,16 @@ public class D3GroupGraphListView extends AbstractD3GraphListView { }
if (resourceGroup != null) { - buildGraphs(); + redrawGraphs(); } }
- public void redrawGraphs(){ - buildGraphs(); - }
/** * Build whatever graph metrics (MeasurementDefinitions) are defined for the resource. */ - private void buildGraphs() { + public void redrawGraphs() {
List<Long> startEndList = measurementRangeEditor.getBeginEndTimes(); final long startTime = startEndList.get(0); 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 753e203..d5f341f 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 @@ -87,7 +87,7 @@ import java.util.Set; * @author Jay Shaughnessy * @author Ian Springer */ -public class ResourceGroupDetailView extends AbstractTwoLevelTabSetView<ResourceGroupComposite, ResourceGroupTitleBar> { +public class ResourceGroupDetailView extends AbstractTwoLevelTabSetView<ResourceGroupComposite, ResourceGroupTitleBar,D3GroupGraphListView> {
public static final String AUTO_CLUSTER_VIEW = "ResourceGroup/AutoCluster"; public static final String AUTO_GROUP_VIEW = "Resource/AutoGroup"; @@ -164,6 +164,12 @@ public class ResourceGroupDetailView extends AbstractTwoLevelTabSetView<Resource }
@Override + protected D3GroupGraphListView createD3GraphListView() { + graphListView = new D3GroupGraphListView(monitoringTab.extendLocatorId("NewGraphs"), groupComposite.getResourceGroup(), true); + return graphListView; + } + + @Override protected List<TwoLevelTab> createTabs() { List<TwoLevelTab> tabs = new ArrayList<TwoLevelTab>();
@@ -324,9 +330,7 @@ public class ResourceGroupDetailView extends AbstractTwoLevelTabSetView<Resource viewFactory = (!visibleToIE8) ? null : new ViewFactory() { @Override public Canvas createView() { - d3GroupGraphListView = new D3GroupGraphListView(monitoringTab.extendLocatorId("NewGraphs"), groupComposite.getResourceGroup(), true); - return d3GroupGraphListView; - + return createD3GraphListView(); } };
@@ -599,11 +603,8 @@ 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 *****"); + if(null != graphListView){ + graphListView.redrawGraphs(); } } finally { notifyViewRenderedListeners(); @@ -614,9 +615,8 @@ public class ResourceGroupDetailView extends AbstractTwoLevelTabSetView<Resource try { updateTabContent(groupComposite, viewPath.isRefresh()); selectTab(getTabName(), getSubTabName(), viewPath); - Log.debug(" **** 3 *****"); - if(null != d3GroupGraphListView){ - d3GroupGraphListView.redrawGraphs(); + if(null != graphListView){ + graphListView.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 ec1560f..52eb5bc 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 @@ -87,7 +87,7 @@ import org.rhq.enterprise.gui.coregui.client.util.message.Message; * @author Jay Shaughnessy * @author Greg Hinkle */ -public class ResourceDetailView extends AbstractTwoLevelTabSetView<ResourceComposite, ResourceTitleBar> { +public class ResourceDetailView extends AbstractTwoLevelTabSetView<ResourceComposite, ResourceTitleBar, D3GraphListView> {
private static final String BASE_VIEW_PATH = "Resource";
@@ -286,6 +286,12 @@ public class ResourceDetailView extends AbstractTwoLevelTabSetView<ResourceCompo }
@Override + protected D3GraphListView createD3GraphListView() { + graphListView = D3GraphListView.createSummaryMultipleGraphs(monitoringTab.extendLocatorId("NewGraphs"), resourceComposite.getResource(), true); + return graphListView; + } + + @Override protected void updateTabContent(ResourceComposite resourceComposite, boolean isRefresh) { super.updateTabContent(resourceComposite, isRefresh);
@@ -434,8 +440,9 @@ public class ResourceDetailView extends AbstractTwoLevelTabSetView<ResourceCompo viewFactory = (!visibleToIE8) ? null : new ViewFactory() { @Override public Canvas createView() { - d3GraphListView = D3GraphListView.createSummaryMultipleGraphs(monitoringTab.extendLocatorId("NewGraphs"), resourceComposite.getResource(), true); - return d3GraphListView; + //d3GraphListView = D3GraphListView.createSummaryMultipleGraphs(monitoringTab.extendLocatorId("NewGraphs"), resourceComposite.getResource(), true); + //return d3GraphListView; + return createD3GraphListView(); } }; updateSubTab(this.monitoringTab, this.monitorNewGraphs, visible, visibleToIE8, viewFactory);
rhq-commits@lists.fedorahosted.org