modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/RecentOperationsDataSource.java | 29 ---------- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/ScheduledOperationsDataSource.java | 29 ---------- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/resource/ProblemResourcesDataSource.java | 29 ---------- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java | 13 +--- 4 files changed, 10 insertions(+), 90 deletions(-)
New commits: commit eeebf74a575d244f30b923958a327e05763a5670 Author: Joseph Marques joseph@redhat.com Date: Mon Oct 25 20:28:46 2010 -0400
remove references to duplicate logic already handled by RCPDataSource
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/RecentOperationsDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/RecentOperationsDataSource.java index b5f5e61..46878e8 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/RecentOperationsDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/RecentOperationsDataSource.java @@ -29,8 +29,6 @@ import com.smartgwt.client.data.DataSourceField; import com.smartgwt.client.data.Record; import com.smartgwt.client.data.fields.DataSourceDateTimeField; import com.smartgwt.client.data.fields.DataSourceTextField; -import com.smartgwt.client.types.DSDataFormat; -import com.smartgwt.client.types.DSProtocol; import com.smartgwt.client.widgets.grid.ListGridRecord;
import org.rhq.core.domain.operation.OperationRequestStatus; @@ -67,9 +65,6 @@ public class RecentOperationsDataSource extends */ public RecentOperationsDataSource(Portlet portlet) { this.portlet = portlet; - setClientOnly(false); - setDataProtocol(DSProtocol.CLIENTCUSTOM); - setDataFormat(DSDataFormat.CUSTOM);
List<DataSourceField> fields = addDataSourceFields(); addFields(fields); @@ -98,26 +93,6 @@ public class RecentOperationsDataSource extends return fields; }
- /* Intercept DSRequest object to pipe into custom fetch request. - * (non-Javadoc) - * @see com.smartgwt.client.data.DataSource#transformRequest(com.smartgwt.client.data.DSRequest) - */ - protected Object transformRequest(DSRequest request) { - DSResponse response = new DSResponse(); - response.setAttribute("clientContext", request.getAttributeAsObject("clientContext")); - // Assume success - response.setStatus(0); - switch (request.getOperationType()) { - case FETCH: - executeFetch(request, response); - break; - default: - break; - } - - return request.getData(); - } - /** Fetch the ProblemResource data, and populate the response object appropriately. * * @param request incoming request @@ -246,8 +221,8 @@ public class RecentOperationsDataSource extends @Override public ListGridRecord copyValues(DisambiguationReport<ResourceOperationLastCompletedComposite> from) { ListGridRecord record = new ListGridRecord(); - record.setAttribute(resource, ReportDecorator.decorateResourceName(ReportDecorator.GWT_RESOURCE_URL, from - .getResourceType(), from.getOriginal().getResourceName(), from.getOriginal().getResourceId(), true)); + record.setAttribute(resource, ReportDecorator.decorateResourceName(ReportDecorator.GWT_RESOURCE_URL, + from.getResourceType(), from.getOriginal().getResourceName(), from.getOriginal().getResourceId(), true)); record.setAttribute(location, ReportDecorator.decorateResourceLineage(from.getParents(), true)); record.setAttribute(operation, from.getOriginal().getOperationName()); record.setAttribute(time, from.getOriginal().getOperationStartTime()); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/ScheduledOperationsDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/ScheduledOperationsDataSource.java index c152c2c..7faaa46 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/ScheduledOperationsDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/ScheduledOperationsDataSource.java @@ -29,8 +29,6 @@ import com.smartgwt.client.data.DataSourceField; import com.smartgwt.client.data.Record; import com.smartgwt.client.data.fields.DataSourceDateTimeField; import com.smartgwt.client.data.fields.DataSourceTextField; -import com.smartgwt.client.types.DSDataFormat; -import com.smartgwt.client.types.DSProtocol; import com.smartgwt.client.widgets.grid.ListGridRecord;
import org.rhq.core.domain.operation.composite.ResourceOperationScheduleComposite; @@ -62,9 +60,6 @@ public class ScheduledOperationsDataSource extends */ public ScheduledOperationsDataSource(Portlet portlet) { this.portlet = portlet; - setClientOnly(false); - setDataProtocol(DSProtocol.CLIENTCUSTOM); - setDataFormat(DSDataFormat.CUSTOM);
List<DataSourceField> fields = addDataSourceFields(); addFields(fields); @@ -90,26 +85,6 @@ public class ScheduledOperationsDataSource extends return fields; }
- /* Intercept DSRequest object to pipe into custom fetch request. - * (non-Javadoc) - * @see com.smartgwt.client.data.DataSource#transformRequest(com.smartgwt.client.data.DSRequest) - */ - protected Object transformRequest(DSRequest request) { - DSResponse response = new DSResponse(); - response.setAttribute("clientContext", request.getAttributeAsObject("clientContext")); - // Assume success - response.setStatus(0); - switch (request.getOperationType()) { - case FETCH: - executeFetch(request, response); - break; - default: - break; - } - - return request.getData(); - } - /** Fetch the ProblemResource data, and populate the response object appropriately. * * @param request incoming request @@ -211,8 +186,8 @@ public class ScheduledOperationsDataSource extends @Override public ListGridRecord copyValues(DisambiguationReport<ResourceOperationScheduleComposite> from) { ListGridRecord record = new ListGridRecord(); - record.setAttribute(resource, ReportDecorator.decorateResourceName(ReportDecorator.GWT_RESOURCE_URL, from - .getResourceType(), from.getOriginal().getResourceName(), from.getOriginal().getResourceId(), true)); + record.setAttribute(resource, ReportDecorator.decorateResourceName(ReportDecorator.GWT_RESOURCE_URL, + from.getResourceType(), from.getOriginal().getResourceName(), from.getOriginal().getResourceId(), true)); record.setAttribute(location, ReportDecorator.decorateResourceLineage(from.getParents(), true)); record.setAttribute(operation, from.getOriginal().getOperationName()); record.setAttribute(time, from.getOriginal().getOperationNextFireTime()); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/resource/ProblemResourcesDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/resource/ProblemResourcesDataSource.java index 8cde059..380d16b 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/resource/ProblemResourcesDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/resource/ProblemResourcesDataSource.java @@ -28,8 +28,6 @@ import com.smartgwt.client.data.DataSourceField; import com.smartgwt.client.data.Record; import com.smartgwt.client.data.fields.DataSourceImageField; import com.smartgwt.client.data.fields.DataSourceTextField; -import com.smartgwt.client.types.DSDataFormat; -import com.smartgwt.client.types.DSProtocol; import com.smartgwt.client.widgets.grid.ListGridRecord;
import org.rhq.core.domain.measurement.AvailabilityType; @@ -65,9 +63,6 @@ public class ProblemResourcesDataSource extends RPCDataSource<DisambiguationRepo */ public ProblemResourcesDataSource(Portlet problemResourcesPortlet) { this.portlet = problemResourcesPortlet; - setClientOnly(false); - setDataProtocol(DSProtocol.CLIENTCUSTOM); - setDataFormat(DSDataFormat.CUSTOM);
List<DataSourceField> fields = addDataSourceFields(); addFields(fields); @@ -93,26 +88,6 @@ public class ProblemResourcesDataSource extends RPCDataSource<DisambiguationRepo return fields; }
- /* Intercept DSRequest object to pipe into custom fetch request. - * (non-Javadoc) - * @see com.smartgwt.client.data.DataSource#transformRequest(com.smartgwt.client.data.DSRequest) - */ - protected Object transformRequest(DSRequest request) { - DSResponse response = new DSResponse(); - response.setAttribute("clientContext", request.getAttributeAsObject("clientContext")); - // Assume success - response.setStatus(0); - switch (request.getOperationType()) { - case FETCH: - executeFetch(request, response); - break; - default: - break; - } - - return request.getData(); - } - /** Fetch the ProblemResource data, and populate the response object appropriately. * * @param request incoming request @@ -207,8 +182,8 @@ public class ProblemResourcesDataSource extends RPCDataSource<DisambiguationRepo @Override public ListGridRecord copyValues(DisambiguationReport<ProblemResourceComposite> from) { ListGridRecord record = new ListGridRecord(); - record.setAttribute(resource, ReportDecorator.decorateResourceName(ReportDecorator.GWT_RESOURCE_URL, from - .getResourceType(), from.getOriginal().getResourceName(), from.getOriginal().getResourceId(), true)); + record.setAttribute(resource, ReportDecorator.decorateResourceName(ReportDecorator.GWT_RESOURCE_URL, + from.getResourceType(), from.getOriginal().getResourceName(), from.getOriginal().getResourceId(), true)); record.setAttribute(location, ReportDecorator.decorateResourceLineage(from.getParents(), true)); record.setAttribute(alerts, from.getOriginal().getNumAlerts()); if (from.getOriginal().getAvailabilityType().compareTo(AvailabilityType.DOWN) == 0) { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java index 1708dce..94799f0 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java @@ -97,7 +97,10 @@ public abstract class RPCDataSource<T> extends DataSource { @Override protected Object transformRequest(DSRequest request) { try { - DSResponse response = createResponse(request); + DSResponse response = new DSResponse(); + response.setAttribute("clientContext", request.getAttributeAsObject("clientContext")); + // Assume success as the default. + response.setStatus(0);
switch (request.getOperationType()) { case FETCH: @@ -385,14 +388,6 @@ public abstract class RPCDataSource<T> extends DataSource { throw new UnsupportedOperationException("This dataSource does not support updates."); }
- private DSResponse createResponse(DSRequest request) { - DSResponse response = new DSResponse(); - response.setAttribute("clientContext", request.getAttributeAsObject("clientContext")); - // Assume success as the default. - response.setStatus(0); - return response; - } - /** * Add the specified fields to this data source. When the data source is associated with a * {@link com.smartgwt.client.widgets.grid.ListGrid}, the fields will be displayed in the order they are specified
rhq-commits@lists.fedorahosted.org