modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertPortletConfigurationDataSource.java
| 50 +++++-----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertPortletDataSource.java
| 15 ++-
2 files changed, 38 insertions(+), 27 deletions(-)
New commits:
commit 0fb1eb897c78c2fb00941619699a837351399f35
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu Mar 24 10:53:21 2011 -0400
forgot these two classes as part of the datasource refactoring to have separate
getFetchCriteria method
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 efb48d4..ae9069b 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
@@ -81,8 +81,34 @@ public class AlertPortletConfigurationDataSource extends
AlertDataSource {
/** Override the executeFetch for AlertPortlet to allow specifying smaller than
total
* result displays.
*/
- protected void executeFetch(final DSRequest request, final DSResponse response) {
+ @Override
+ protected void executeFetch(final DSRequest request, final DSResponse response, final
AlertCriteria criteria) {
final long start = System.currentTimeMillis();
+
+ getAlertService().findAlertsByCriteria(criteria, new
AsyncCallback<PageList<Alert>>() {
+
+ public void onFailure(Throwable caught) {
+ CoreGUI.getErrorHandler().handleError(MSG.view_alerts_loadFailed(),
caught);
+ response.setStatus(RPCResponse.STATUS_FAILURE);
+ processResponse(request.getRequestId(), response);
+ }
+
+ public void onSuccess(PageList<Alert> result) {
+ long fetchTime = System.currentTimeMillis() - start;
+ Log.info(result.size() + " alerts fetched in: " + fetchTime +
"ms");
+ if (entityContext.type != EntityContext.Type.Resource) {
+ dataRetrieved(result, response, request);
+ } else {
+ response.setData(buildRecords(result));
+ response.setTotalRows(result.size());
+ processResponse(request.getRequestId(), response);
+ }
+ }
+ });
+ }
+
+ @Override
+ protected AlertCriteria getFetchCriteria(DSRequest request) {
AlertCriteria criteria = new AlertCriteria();
//initialize to only five for quick queries.
criteria.setPageControl(new PageControl(0, Integer
@@ -176,27 +202,7 @@ public class AlertPortletConfigurationDataSource extends
AlertDataSource {
}
criteria.fetchAlertDefinition(true);
criteria.fetchRecoveryAlertDefinition(true);
-
- getAlertService().findAlertsByCriteria(criteria, new
AsyncCallback<PageList<Alert>>() {
-
- public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError(MSG.view_alerts_loadFailed(),
caught);
- response.setStatus(RPCResponse.STATUS_FAILURE);
- processResponse(request.getRequestId(), response);
- }
-
- public void onSuccess(PageList<Alert> result) {
- long fetchTime = System.currentTimeMillis() - start;
- Log.info(result.size() + " alerts fetched in: " + fetchTime +
"ms");
- if (entityContext.type != EntityContext.Type.Resource) {
- dataRetrieved(result, response, request);
- } else {
- response.setData(buildRecords(result));
- response.setTotalRows(result.size());
- processResponse(request.getRequestId(), response);
- }
- }
- });
+ return criteria;
}
public String getAlertResourcesToUse() {
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertPortletDataSource.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertPortletDataSource.java
index f80a435..a2d0aba 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertPortletDataSource.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertPortletDataSource.java
@@ -35,11 +35,8 @@ public class AlertPortletDataSource extends AlertDataSource {
this.portlet = recentAlertsPortlet;
}
- /** Override the executeFetch for AlertPortlet to allow specifying smaller than
total
- * result displays.
- */
- protected void executeFetch(final DSRequest request, final DSResponse response) {
- final long start = System.currentTimeMillis();
+ @Override
+ protected AlertCriteria getFetchCriteria(DSRequest request) {
//retrieve previous settings from portlet config
if ((portlet != null) && (this.portlet instanceof DashboardPortlet)) {
//must check for whether portlet config
@@ -86,6 +83,14 @@ public class AlertPortletDataSource extends AlertDataSource {
criteria.addFilterPriorities(AlertPriority.getByLegacyIndex(getAlertPriorityIndex()));
}
+ return criteria;
+ }
+
+ /** Override the executeFetch for AlertPortlet to allow specifying smaller than
total
+ * result displays.
+ */
+ @Override
+ protected void executeFetch(final DSRequest request, final DSResponse response, final
AlertCriteria criteria) {
getAlertService().findAlertsByCriteria(criteria, new
AsyncCallback<PageList<Alert>>() {
public void onFailure(Throwable caught) {
Show replies by date