modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertPortletConfigurationDataSource.java | 7 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupAlertsPortlet.java | 10 ++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupBundleDeploymentsPortlet.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupEventsPortlet.java | 11 ++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java | 14 +++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOobsPortlet.java | 3 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOperationsPortlet.java | 11 ++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupPkgHistoryPortlet.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceAlertsPortlet.java | 37 ---------- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceMetricsPortlet.java | 4 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceOperationsPortlet.java | 4 - 11 files changed, 58 insertions(+), 47 deletions(-)
New commits: commit 12051d6e7026198b07aa7f9e8176488ebfd27986 Author: Simeon Pinder spinder@redhat.com Date: Fri Mar 25 01:14:11 2011 -0400
i)number Resource/Group*Portlet refresh/redraw fixes ii)general cleanup of some porlet classes.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertPortletConfigurationDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertPortletConfigurationDataSource.java index ae9069b..2cb7f74 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertPortletConfigurationDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertPortletConfigurationDataSource.java @@ -134,16 +134,15 @@ public class AlertPortletConfigurationDataSource extends AlertDataSource { criteria.addFilterPriorities(filterPriorities); } } + PageControl pc = new PageControl(); //result sort order property = portletConfig.getSimple(Constant.RESULT_SORT_ORDER); if (property != null) { String currentSetting = property.getStringValue(); if (currentSetting.trim().isEmpty() || currentSetting.equalsIgnoreCase(PageOrdering.DESC.name())) { - criteria.addSortCtime(PageOrdering.DESC); pc.setPrimarySortOrder(PageOrdering.DESC); } else { - criteria.addSortCtime(PageOrdering.ASC); pc.setPrimarySortOrder(PageOrdering.ASC); } } @@ -186,8 +185,8 @@ public class AlertPortletConfigurationDataSource extends AlertDataSource { property = portletConfig.getSimple(Constant.RESULT_COUNT); if (property != null) { String currentSetting = property.getStringValue(); - if (currentSetting.trim().isEmpty() || currentSetting.equalsIgnoreCase("5")) { - pc.setPageSize(5); + if (currentSetting.trim().isEmpty() || currentSetting.equalsIgnoreCase(Constant.RESULT_COUNT_DEFAULT)) { + pc.setPageSize(Integer.valueOf(Constant.RESULT_COUNT_DEFAULT)); } else { pc.setPageSize(Integer.valueOf(currentSetting)); } 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 740d549..6ac9afe 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 @@ -75,6 +75,7 @@ public class GroupAlertsPortlet extends AlertHistoryView implements CustomSettin public static final String RESOURCES_SELECTED = MSG.common_label_selected_resources(); public static final String defaultResourceValue = RESOURCES_ALL; public static final String ID = "id"; + private boolean currentlyRefreshing = false;
// set on initial configuration, the window for this portlet view. protected PortletWindow portletWindow; @@ -269,7 +270,7 @@ public class GroupAlertsPortlet extends AlertHistoryView implements CustomSettin }
public boolean isRefreshing() { - return false; + return this.currentlyRefreshing; }
@Override @@ -320,7 +321,6 @@ public class GroupAlertsPortlet extends AlertHistoryView implements CustomSettin protected void onInit() { super.onInit(); initializeUi(); - // getListGrid().setEmptyMessage(MSG.view_portlet_results_empty()); }
@Override @@ -332,6 +332,12 @@ public class GroupAlertsPortlet extends AlertHistoryView implements CustomSettin MSG.view_table_matchingRows(String.valueOf(getListGrid().getTotalRows()), String.valueOf(count))); } } + + @Override + public void redraw() { + super.redraw(); + refresh();//is table so need to call this to reload + } }
/** Bundles a ResourceSelector instance with labeling in Canvas for display. 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 4d163ab..6ef8a59 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 @@ -215,6 +215,7 @@ public class GroupBundleDeploymentsPortlet extends LocatableVLayout implements C public void onFailure(Throwable caught) { Log.debug("Error retrieving installed bundle deployments for group [" + groupId + "]:" + caught.getMessage()); + currentlyLoading = false; }
@Override @@ -258,6 +259,7 @@ public class GroupBundleDeploymentsPortlet extends LocatableVLayout implements C recentBundleDeployContent.addChild(column); recentBundleDeployContent.markForRedraw(); markForRedraw(); + currentlyLoading = false; } }); } 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 3b069c5..b4761e9 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 @@ -103,6 +103,8 @@ public class GroupEventsPortlet extends LocatableVLayout implements CustomSettin @Override protected void onInit() { super.onInit(); + //disable the refresh timer for this run + currentlyLoading = true; initializeUi(); redraw(); } @@ -151,7 +153,6 @@ public class GroupEventsPortlet extends LocatableVLayout implements CustomSettin }
protected void loadData() { - currentlyLoading = true; getRecentEventUpdates(); }
@@ -235,6 +236,7 @@ public class GroupEventsPortlet extends LocatableVLayout implements CustomSettin Log .debug("Error retrieving recent event counts for group [" + groupId + "]:" + caught.getMessage()); + setCurrentlyRefreshing(false); }
@Override @@ -288,12 +290,14 @@ public class GroupEventsPortlet extends LocatableVLayout implements CustomSettin recentEventsContent.addChild(column); recentEventsContent.markForRedraw(); markForRedraw(); + setCurrentlyRefreshing(false); } }); }
public void startRefreshCycle() { refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer); + markForRedraw(); }
@Override @@ -303,6 +307,7 @@ public class GroupEventsPortlet extends LocatableVLayout implements CustomSettin super.onDestroy(); }
+ @Override public boolean isRefreshing() { return this.currentlyLoading; } @@ -312,4 +317,8 @@ public class GroupEventsPortlet extends LocatableVLayout implements CustomSettin super.redraw(); loadData(); } + + protected void setCurrentlyRefreshing(boolean currentlyRefreshing) { + this.currentlyLoading = currentlyRefreshing; + } } \ No newline at end of file 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 898c04b..d6dbf19 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 @@ -121,6 +121,7 @@ public class GroupMetricsPortlet extends LocatableVLayout implements CustomSetti @Override protected void onInit() { super.onInit(); + setRefreshing(true); initializeUi(); loadData(); } @@ -274,6 +275,7 @@ public class GroupMetricsPortlet extends LocatableVLayout implements CustomSetti public void onFailure(Throwable caught) { Log.debug("Error retrieving resource group composite for group [" + groupId + "]:" + caught.getMessage()); + setRefreshing(false); }
@Override @@ -325,6 +327,7 @@ public class GroupMetricsPortlet extends LocatableVLayout implements CustomSetti Log .debug("Error retrieving recent metrics charting data for group [" + groupId + "]:" + caught.getMessage()); + setRefreshing(false); }
@Override @@ -433,6 +436,7 @@ public class GroupMetricsPortlet extends LocatableVLayout implements CustomSetti AbstractActivityView.RECENT_MEASUREMENTS_NONE); column.addMember(row); } + setRefreshing(false); } }); } @@ -442,6 +446,7 @@ public class GroupMetricsPortlet extends LocatableVLayout implements CustomSetti LocatableDynamicForm row = AbstractActivityView.createEmptyDisplayRow(recentMeasurementsContent .extendLocatorId("None"), AbstractActivityView.RECENT_MEASUREMENTS_NONE); column.addMember(row); + setRefreshing(false); } } }); @@ -454,8 +459,12 @@ public class GroupMetricsPortlet extends LocatableVLayout implements CustomSetti recentMeasurementsContent.markForRedraw(); }
+ @Override public void startRefreshCycle() { refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer); + //call out to 3rd party javascript lib + BrowserUtility.graphSparkLines(); + recentMeasurementsContent.markForRedraw(); }
@Override @@ -465,6 +474,7 @@ public class GroupMetricsPortlet extends LocatableVLayout implements CustomSetti super.onDestroy(); }
+ @Override public boolean isRefreshing() { return this.currentlyLoading; } @@ -486,4 +496,8 @@ public class GroupMetricsPortlet extends LocatableVLayout implements CustomSetti public String getBaseViewPath() { return baseViewPath; } + + protected void setRefreshing(boolean currentlyRefreshing) { + this.currentlyLoading = currentlyRefreshing; + } } \ No newline at end of file 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 265e200..008c34b 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 @@ -204,6 +204,7 @@ public class GroupOobsPortlet extends LocatableVLayout implements CustomSettings public void onFailure(Throwable caught) { Log.debug("Error retrieving recent out of bound metrics for group [" + groupId + "]:" + caught.getMessage()); + currentlyLoading = false; }
@Override @@ -238,12 +239,14 @@ public class GroupOobsPortlet extends LocatableVLayout implements CustomSettings } recentOobContent.addChild(column); recentOobContent.markForRedraw(); + currentlyLoading = false; } }); }
public void startRefreshCycle() { refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer); + recentOobContent.markForRedraw(); }
@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 10031d1..9a9a124 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 @@ -78,6 +78,7 @@ public class GroupOperationsPortlet extends LocatableVLayout implements CustomSe public static final String NAME = MSG.view_portlet_defaultName_group_operations();
protected static final String ID = "id"; + protected boolean currentlyRefreshing = false;
// set on initial configuration, the window for this portlet view. protected PortletWindow portletWindow; @@ -126,6 +127,8 @@ public class GroupOperationsPortlet extends LocatableVLayout implements CustomSe @Override protected void onInit() { super.onInit(); + //disable the refresh timer for this run + currentlyRefreshing = true; initializeUi(); loadData(); } @@ -157,6 +160,7 @@ public class GroupOperationsPortlet extends LocatableVLayout implements CustomSe public void onFailure(Throwable caught) { Log.debug("Error retrieving resource group composite for group [" + groupId + "]:" + caught.getMessage()); + currentlyRefreshing = false; }
@Override @@ -186,6 +190,7 @@ public class GroupOperationsPortlet extends LocatableVLayout implements CustomSe } recentOperationsContent.addChild(groupOperations); recentOperationsContent.markForRedraw(); + currentlyRefreshing = false; } }); } @@ -308,7 +313,7 @@ public class GroupOperationsPortlet extends LocatableVLayout implements CustomSe }
public boolean isRefreshing() { - return false; + return currentlyRefreshing; }
private boolean isAutoGroup() { @@ -328,6 +333,10 @@ public class GroupOperationsPortlet extends LocatableVLayout implements CustomSe super.redraw(); loadData(); } + + protected void setCurrentlyRefreshing(boolean currentlyRefreshing) { + this.currentlyRefreshing = currentlyRefreshing; + } }
/** Provide implementation of GroupOperationsHistoryListView using datasource 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 e58b1da..da5a0ee 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 @@ -213,6 +213,7 @@ public class GroupPkgHistoryPortlet extends LocatableVLayout implements CustomSe public void onFailure(Throwable caught) { Log.debug("Error retrieving installed package history for group [" + groupId + "]:" + caught.getMessage()); + currentlyLoading = false; }
@Override @@ -255,6 +256,7 @@ public class GroupPkgHistoryPortlet extends LocatableVLayout implements CustomSe recentPkgHistoryContent.addChild(column); recentPkgHistoryContent.markForRedraw(); markForRedraw(); + currentlyLoading = false; } }); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceAlertsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceAlertsPortlet.java index c79b9f9..ff3a9939 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceAlertsPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceAlertsPortlet.java @@ -20,16 +20,11 @@ package org.rhq.enterprise.gui.coregui.client.dashboard.portlets.resource;
import com.google.gwt.user.client.History; import com.smartgwt.client.widgets.Canvas; -import com.smartgwt.client.widgets.events.DoubleClickEvent; -import com.smartgwt.client.widgets.events.DoubleClickHandler; -import com.smartgwt.client.widgets.grid.ListGrid; -import com.smartgwt.client.widgets.grid.ListGridRecord;
import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.domain.dashboard.DashboardPortlet; import org.rhq.core.domain.resource.ResourceType; import org.rhq.enterprise.gui.coregui.client.CoreGUI; -import org.rhq.enterprise.gui.coregui.client.LinkManager; import org.rhq.enterprise.gui.coregui.client.Messages; import org.rhq.enterprise.gui.coregui.client.alert.AlertPortletConfigurationDataSource; import org.rhq.enterprise.gui.coregui.client.dashboard.Portlet; @@ -139,10 +134,6 @@ public class ResourceAlertsPortlet extends GroupAlertsPortlet {
}
- public AlertPortletConfigurationDataSource getDataSource() { - return dataSource; - } - public static final class Factory implements PortletViewFactory { public static PortletViewFactory INSTANCE = new Factory();
@@ -151,34 +142,6 @@ public class ResourceAlertsPortlet extends GroupAlertsPortlet { return new ResourceAlertsPortlet(locatorId); } } - - @Override - protected void configureTable() { - super.configureTable(); - - setListGridDoubleClickHandler(new DoubleClickHandler() { - @Override - public void onDoubleClick(DoubleClickEvent event) { - ListGrid listGrid = (ListGrid) event.getSource(); - ListGridRecord[] selectedRows = listGrid.getSelection(); - if (selectedRows != null && selectedRows.length == 1) { - Integer recordId = getId(selectedRows[0]); - Integer resourceId = selectedRows[0].getAttributeAsInt("resourceId"); - CoreGUI.goToView(LinkManager.getSubsystemAlertHistoryLink(resourceId, recordId)); - } - } - }); - } - - @Override - protected void refreshTableInfo() { - super.refreshTableInfo(); - if (getTableInfo() != null) { - int count = getListGrid().getSelection().length; - getTableInfo().setContents( - MSG.view_table_matchingRows(String.valueOf(getListGrid().getTotalRows()), String.valueOf(count))); - } - } }
/** Bundles a ResourceSelector instance with labeling in Canvas for display. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceMetricsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceMetricsPortlet.java index e907ce6..a77796f 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceMetricsPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceMetricsPortlet.java @@ -164,6 +164,7 @@ public class ResourceMetricsPortlet extends GroupMetricsPortlet { public void onFailure(Throwable caught) { Log.debug("Error retrieving resource resource composite for resource [" + resourceId + "]:" + caught.getMessage()); + setRefreshing(false); }
@Override @@ -214,6 +215,7 @@ public class ResourceMetricsPortlet extends GroupMetricsPortlet { Log .debug("Error retrieving recent metrics charting data for resource [" + resourceId + "]:" + caught.getMessage()); + setRefreshing(false); }
@Override @@ -322,11 +324,11 @@ public class ResourceMetricsPortlet extends GroupMetricsPortlet { AbstractActivityView.RECENT_MEASUREMENTS_NONE); column.addMember(row); } + setRefreshing(false); } }); } }); - // } } } }); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceOperationsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceOperationsPortlet.java index c584aaa..a0ef80ffba 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceOperationsPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceOperationsPortlet.java @@ -84,7 +84,7 @@ public class ResourceOperationsPortlet extends GroupOperationsPortlet {
@Override protected void onInit() { - // super.onInit(); + setCurrentlyRefreshing(true); initializeUi(); loadData(); } @@ -165,6 +165,7 @@ public class ResourceOperationsPortlet extends GroupOperationsPortlet { public void onFailure(Throwable caught) { Log.debug("Error retrieving resource composite for resource [" + resourceId + "]:" + caught.getMessage()); + setCurrentlyRefreshing(false); }
@Override @@ -186,6 +187,7 @@ public class ResourceOperationsPortlet extends GroupOperationsPortlet { recentOperationsContent.addChild(resourceOperations); recentOperationsContent.markForRedraw(); } + setCurrentlyRefreshing(false); } }); }