modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java
| 19 +--
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java
| 10 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java
| 6 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationListView.java
| 14 +-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java
| 6 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionListView.java
| 6 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/CanvasField.java
| 6 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/TableSection.java
| 8 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/ViewLinkField.java
| 53 ----------
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformSummaryPortlet.java
| 6 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourcesPortlet.java
| 6 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationSchedulePortlet.java
| 8 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java
| 6 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryListView.java
| 8 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java
| 6 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java
| 6 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationMembers.java
| 6 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationMembers.java
| 6 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/traits/TraitsDetailView.java
| 6 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/traits/TraitsView.java
| 6 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/history/GroupMemberResourceOperationHistoryListView.java
| 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/AncestryUtil.java
| 11 +-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java
| 7 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryDataSource.java
| 8 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryView.java
| 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/OperationHistoryDataSource.java
| 8 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java
| 10 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ResourceInstallReport.java
| 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/measurement/MeasurementOOBDataSource.java
| 6 -
29 files changed, 104 insertions(+), 152 deletions(-)
New commits:
commit 0cad769f19421f681666cd6437639f4ca167940c
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Fri Apr 29 16:26:35 2011 -0400
the last of the IE fragment fix work
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java
index 0209680..12588bd 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java
@@ -34,6 +34,7 @@ import com.smartgwt.client.data.Record;
import com.smartgwt.client.rpc.RPCResponse;
import com.smartgwt.client.types.Alignment;
import com.smartgwt.client.types.ListGridFieldType;
+import com.smartgwt.client.widgets.Canvas;
import com.smartgwt.client.widgets.grid.CellFormatter;
import com.smartgwt.client.widgets.grid.HoverCustomizer;
import com.smartgwt.client.widgets.grid.ListGrid;
@@ -56,7 +57,7 @@ import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.LinkManager;
import org.rhq.enterprise.gui.coregui.client.components.ViewLink;
import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter;
-import org.rhq.enterprise.gui.coregui.client.components.table.ViewLinkField;
+import org.rhq.enterprise.gui.coregui.client.components.table.CanvasField;
import org.rhq.enterprise.gui.coregui.client.gwt.AlertGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil;
@@ -109,8 +110,8 @@ public class AlertDataSource extends RPCDataSource<Alert,
AlertCriteria> {
ctimeField.setHoverCustomizer(TimestampCellFormatter.getHoverCustomizer(AlertCriteria.SORT_FIELD_CTIME));
fields.add(ctimeField);
- ViewLinkField nameField = new ViewLinkField("name",
MSG.view_alerts_field_name()) {
- protected ViewLink getViewLink(ListGrid grid, ListGridRecord record, Object
value) {
+ CanvasField nameField = new CanvasField("name",
MSG.view_alerts_field_name()) {
+ protected com.smartgwt.client.widgets.Canvas createCanvas(ListGrid grid,
ListGridRecord record, Object value) {
Integer resourceId = record.getAttributeAsInt(AncestryUtil.RESOURCE_ID);
Integer defId = record.getAttributeAsInt("definitionId");
String url = LinkManager.getSubsystemAlertDefinitionLink(resourceId,
defId);
@@ -176,8 +177,8 @@ public class AlertDataSource extends RPCDataSource<Alert,
AlertCriteria> {
fields.add(statusField);
if (this.entityContext.type != EntityContext.Type.Resource) {
- ViewLinkField resourceNameField = new
ViewLinkField(AncestryUtil.RESOURCE_NAME, MSG.common_title_resource()) {
- protected ViewLink getViewLink(ListGrid grid, ListGridRecord record,
Object value) {
+ CanvasField resourceNameField = new CanvasField(AncestryUtil.RESOURCE_NAME,
MSG.common_title_resource()) {
+ protected com.smartgwt.client.widgets.Canvas createCanvas(ListGrid grid,
ListGridRecord record, Object value) {
String url = LinkManager
.getResourceLink(record.getAttributeAsInt(AncestryUtil.RESOURCE_ID));
return new ViewLink(value.toString(), url);
@@ -243,7 +244,7 @@ public class AlertDataSource extends RPCDataSource<Alert,
AlertCriteria> {
}
/**
- * Additional processing to support entity-specific or cross-resource views, and
something that can be overidden.
+ * Additional processing to support entity-specific or cross-resource views, and
something that can be overridden.
*/
protected void dataRetrieved(final PageList<Alert> result, final DSResponse
response, final DSRequest request) {
switch (entityContext.type) {
@@ -356,11 +357,7 @@ public class AlertDataSource extends RPCDataSource<Alert,
AlertCriteria> {
record.setAttribute("description", alertDefinition.getDescription());
record.setAttribute("priority",
ImageManager.getAlertIcon(alertDefinition.getPriority()));
- // for ancestry handling
- record.setAttribute(AncestryUtil.RESOURCE_ID, resource.getId());
- record.setAttribute(AncestryUtil.RESOURCE_NAME, resource.getName());
- record.setAttribute(AncestryUtil.RESOURCE_ANCESTRY, resource.getAncestry());
- record.setAttribute(AncestryUtil.RESOURCE_TYPE_ID,
resource.getResourceType().getId());
+ AncestryUtil.setAncestryRecordAttributes(record, resource);
Set<AlertConditionLog> conditionLogs = from.getConditionLogs();
String conditionText;
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java
index 5c2f5b6..d90f715 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java
@@ -42,7 +42,7 @@ import org.rhq.enterprise.gui.coregui.client.components.ViewLink;
import org.rhq.enterprise.gui.coregui.client.components.table.EscapedHtmlCellFormatter;
import org.rhq.enterprise.gui.coregui.client.components.table.Table;
import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter;
-import org.rhq.enterprise.gui.coregui.client.components.table.ViewLinkField;
+import org.rhq.enterprise.gui.coregui.client.components.table.CanvasField;
import org.rhq.enterprise.gui.coregui.client.util.StringUtility;
/**
@@ -65,8 +65,8 @@ public class BundleDeploymentListView extends
Table<BundleDeploymentDataSource>
ListGridField nameField;
// only users that are authorized can see deployments
if (canManageBundles) {
- nameField = new ViewLinkField(BundleDeploymentDataSource.FIELD_NAME,
MSG.view_bundle_deploy_name()) {
- protected ViewLink getViewLink(ListGrid grid, ListGridRecord record,
Object value) {
+ nameField = new CanvasField(BundleDeploymentDataSource.FIELD_NAME,
MSG.view_bundle_deploy_name()) {
+ protected com.smartgwt.client.widgets.Canvas createCanvas(ListGrid grid,
ListGridRecord record, Object value) {
String linkText =
StringUtility.escapeHtml(record.getAttribute(BundleDeploymentDataSource.FIELD_NAME));
String viewPath = getBundleDeploymentLink(record);
return new ViewLink(extendLocatorId("ViewLink"), linkText,
viewPath);
@@ -79,9 +79,9 @@ public class BundleDeploymentListView extends
Table<BundleDeploymentDataSource>
}
ListGridField descriptionField = new
ListGridField(BundleDeploymentDataSource.FIELD_DESCRIPTION, MSG
.common_title_description());
- ViewLinkField bundleVersionField = new
ViewLinkField(BundleDeploymentDataSource.FIELD_BUNDLE_VERSION_VERSION,
+ CanvasField bundleVersionField = new
CanvasField(BundleDeploymentDataSource.FIELD_BUNDLE_VERSION_VERSION,
MSG.view_bundle_bundleVersion()) {
- protected ViewLink getViewLink(ListGrid grid, ListGridRecord record, Object
value) {
+ protected com.smartgwt.client.widgets.Canvas createCanvas(ListGrid grid,
ListGridRecord record, Object value) {
String linkText =
record.getAttribute(BundleDeploymentDataSource.FIELD_BUNDLE_VERSION_VERSION);
String viewPath = LinkManager.getBundleVersionLink(record
.getAttributeAsInt(BundleDeploymentDataSource.FIELD_BUNDLE_ID),
record
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java
index e0da95d..951b677 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java
@@ -73,7 +73,7 @@ import org.rhq.enterprise.gui.coregui.client.components.ViewLink;
import org.rhq.enterprise.gui.coregui.client.components.buttons.BackButton;
import org.rhq.enterprise.gui.coregui.client.components.table.Table;
import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter;
-import org.rhq.enterprise.gui.coregui.client.components.table.ViewLinkField;
+import org.rhq.enterprise.gui.coregui.client.components.table.CanvasField;
import org.rhq.enterprise.gui.coregui.client.components.tagging.TagEditorView;
import org.rhq.enterprise.gui.coregui.client.components.tagging.TagsChangedCallback;
import org.rhq.enterprise.gui.coregui.client.gwt.BundleGWTServiceAsync;
@@ -344,8 +344,8 @@ public class BundleDeploymentView extends LocatableVLayout implements
Bookmarkab
resourceIcon.setWidth(40);
// resource field
- ViewLinkField resource = new ViewLinkField("resource",
MSG.common_title_platform()) {
- protected ViewLink getViewLink(ListGrid grid, ListGridRecord record, Object
value) {
+ CanvasField resource = new CanvasField("resource",
MSG.common_title_platform()) {
+ protected com.smartgwt.client.widgets.Canvas createCanvas(ListGrid grid,
ListGridRecord record, Object value) {
String resourceUrl =
LinkManager.getResourceLink(record.getAttributeAsInt("resourceId"));
String linkText =
StringUtility.escapeHtml(record.getAttribute("resource"));
return new ViewLink(extendLocatorId("ViewLink"), linkText,
resourceUrl);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationListView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationListView.java
index 88867aa..157a697 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationListView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationListView.java
@@ -38,7 +38,7 @@ import org.rhq.enterprise.gui.coregui.client.LinkManager;
import org.rhq.enterprise.gui.coregui.client.components.ViewLink;
import org.rhq.enterprise.gui.coregui.client.components.table.Table;
import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter;
-import org.rhq.enterprise.gui.coregui.client.components.table.ViewLinkField;
+import org.rhq.enterprise.gui.coregui.client.components.table.CanvasField;
import org.rhq.enterprise.gui.coregui.client.util.StringUtility;
/**
@@ -59,8 +59,8 @@ public class BundleDestinationListView extends
Table<BundleDestinationDataSource
@Override
protected void configureTable() {
ListGridField idField = new ListGridField(BundleDestinationDataSource.FIELD_ID,
MSG.common_title_id());
- ViewLinkField nameField = new
ViewLinkField(BundleDestinationDataSource.FIELD_NAME, MSG.common_title_name()) {
- protected ViewLink getViewLink(ListGrid grid, ListGridRecord record, Object
value) {
+ CanvasField nameField = new CanvasField(BundleDestinationDataSource.FIELD_NAME,
MSG.common_title_name()) {
+ protected com.smartgwt.client.widgets.Canvas createCanvas(ListGrid grid,
ListGridRecord record, Object value) {
String bundleName =
record.getAttribute(BundleDestinationDataSource.FIELD_NAME);
String linkText = StringUtility.escapeHtml(bundleName);
String viewPath = getBundleDestinationLink(record);
@@ -69,9 +69,9 @@ public class BundleDestinationListView extends
Table<BundleDestinationDataSource
};
ListGridField descriptionField = new
ListGridField(BundleDestinationDataSource.FIELD_DESCRIPTION, MSG
.common_title_description());
- ViewLinkField bundleNameField = new
ViewLinkField(BundleDestinationDataSource.FIELD_BUNDLE_NAME, MSG
+ CanvasField bundleNameField = new
CanvasField(BundleDestinationDataSource.FIELD_BUNDLE_NAME, MSG
.view_bundle_bundle()) {
- protected ViewLink getViewLink(ListGrid grid, ListGridRecord record, Object
value) {
+ protected com.smartgwt.client.widgets.Canvas createCanvas(ListGrid grid,
ListGridRecord record, Object value) {
String bundleName =
record.getAttribute(BundleDestinationDataSource.FIELD_BUNDLE_NAME);
String linkText = StringUtility.escapeHtml(bundleName);
Integer bundleId =
record.getAttributeAsInt(BundleDestinationDataSource.FIELD_BUNDLE_ID);
@@ -79,9 +79,9 @@ public class BundleDestinationListView extends
Table<BundleDestinationDataSource
return new ViewLink(extendLocatorId("ViewLink"), linkText,
viewPath);
}
};
- ViewLinkField groupNameField = new
ViewLinkField(BundleDestinationDataSource.FIELD_GROUP_NAME, MSG
+ CanvasField groupNameField = new
CanvasField(BundleDestinationDataSource.FIELD_GROUP_NAME, MSG
.view_bundle_dest_group()) {
- protected ViewLink getViewLink(ListGrid grid, ListGridRecord record, Object
value) {
+ protected com.smartgwt.client.widgets.Canvas createCanvas(ListGrid grid,
ListGridRecord record, Object value) {
String groupName =
record.getAttribute(BundleDestinationDataSource.FIELD_GROUP_NAME);
String linkText = StringUtility.escapeHtml(groupName);
Integer groupId =
record.getAttributeAsInt(BundleDestinationDataSource.FIELD_GROUP_ID);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java
index 63c7625..c9a02f6 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java
@@ -45,7 +45,7 @@ import org.rhq.enterprise.gui.coregui.client.components.ViewLink;
import org.rhq.enterprise.gui.coregui.client.components.table.AbstractTableAction;
import org.rhq.enterprise.gui.coregui.client.components.table.Table;
import org.rhq.enterprise.gui.coregui.client.components.table.TableActionEnablement;
-import org.rhq.enterprise.gui.coregui.client.components.table.ViewLinkField;
+import org.rhq.enterprise.gui.coregui.client.components.table.CanvasField;
import org.rhq.enterprise.gui.coregui.client.gwt.BundleGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.util.ErrorHandler;
@@ -87,9 +87,9 @@ public class BundlesListView extends
Table<BundlesWithLatestVersionDataSource> {
idField.setType(ListGridFieldType.INTEGER);
idField.setWidth("50");
- ViewLinkField nameField = new
ViewLinkField(BundlesWithLatestVersionDataSource.FIELD_NAME, MSG
+ CanvasField nameField = new
CanvasField(BundlesWithLatestVersionDataSource.FIELD_NAME, MSG
.common_title_name()) {
- protected ViewLink getViewLink(ListGrid grid, ListGridRecord record, Object
value) {
+ protected com.smartgwt.client.widgets.Canvas createCanvas(ListGrid grid,
ListGridRecord record, Object value) {
String nameLink =
record.getAttribute(BundlesWithLatestVersionDataSource.FIELD_NAMELINK);
return new ViewLink(extendLocatorId("ViewLink"),
StringUtility.escapeHtml(value.toString()), nameLink);
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionListView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionListView.java
index aaf3cb8..3edef92 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionListView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionListView.java
@@ -38,7 +38,7 @@ import
org.rhq.enterprise.gui.coregui.client.bundle.list.BundleVersionDataSource
import org.rhq.enterprise.gui.coregui.client.components.ViewLink;
import org.rhq.enterprise.gui.coregui.client.components.table.CanvasField;
import org.rhq.enterprise.gui.coregui.client.components.table.Table;
-import org.rhq.enterprise.gui.coregui.client.components.table.ViewLinkField;
+import org.rhq.enterprise.gui.coregui.client.components.table.CanvasField;
/**
* @author Greg Hinkle
@@ -64,9 +64,9 @@ public class BundleVersionListView extends
Table<BundleVersionDataSource> {
protected void configureTable() {
ListGridField idField = new ListGridField(FIELD_ID, MSG.common_title_id());
- ViewLinkField versionField = new
ViewLinkField(BundleVersionDataSource.FIELD_VERSION, MSG
+ CanvasField versionField = new CanvasField(BundleVersionDataSource.FIELD_VERSION,
MSG
.common_title_version()) {
- protected ViewLink getViewLink(ListGrid grid, ListGridRecord record, Object
value) {
+ protected com.smartgwt.client.widgets.Canvas createCanvas(ListGrid grid,
ListGridRecord record, Object value) {
String viewPath = getBundleVersionViewPath(record);
return new ViewLink(value.toString(), viewPath);
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/CanvasField.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/CanvasField.java
index dcafd44..3bfe9f7 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/CanvasField.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/CanvasField.java
@@ -29,7 +29,7 @@ import com.smartgwt.client.widgets.grid.ListGridRecord;
import com.smartgwt.client.widgets.layout.VLayout;
/**
- * A special field, when used in conjunction with an {@link EnhancedListGrid}, whose
values will be formatted as a
+ * A special LisGrid field, when used in conjunction with an {@link EnhancedListGrid},
whose values will be formatted as
* custom SmartGWT canvases. The ListGrid equivalent of a DynamicForm CanvasItem.
*
* @author Ian Springer
@@ -63,8 +63,8 @@ public abstract class CanvasField extends ListGridField {
super(field.getName(), field.getTitle());
setAlign(field.getAlign());
+ setCellAlign(field.getCellAlign());
setWidth(field.getWidth());
- // TODO (ips, 04/27/11): clone other commonly used fields
}
/**
@@ -116,7 +116,7 @@ public abstract class CanvasField extends ListGridField {
* @return the canvas containing content representing this field in the passed-in
record, or null if the cell
* should be empty
*/
- protected abstract Canvas createCanvas(ListGrid grid, ListGridRecord record, Object
value);
+ protected abstract com.smartgwt.client.widgets.Canvas createCanvas(ListGrid grid,
ListGridRecord record, Object value);
@Override
public String toString() {
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/TableSection.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/TableSection.java
index 3b6d11d..526f62a 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/TableSection.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/TableSection.java
@@ -137,10 +137,10 @@ public abstract class TableSection<DS extends RPCDataSource>
extends Table<DS> i
// corresponding record.
ListGridField field = (grid != null) ?
grid.getField(getDetailsLinkColumnName()) : null;
if (field != null) {
- CanvasField detailsViewLinkField = createDetailsLinkField(field);
+ CanvasField detailsCanvasField = createDetailsLinkField(field);
int fieldIndex = grid.getFieldNum(field.getName());
ListGridField[] fields = grid.getFields();
- fields[fieldIndex] = detailsViewLinkField;
+ fields[fieldIndex] = detailsCanvasField;
grid.setFields(fields);
}
@@ -158,8 +158,8 @@ public abstract class TableSection<DS extends RPCDataSource>
extends Table<DS> i
}
protected CanvasField createDetailsLinkField(final ListGridField field) {
- return new ViewLinkField(field) {
- protected ViewLink getViewLink(ListGrid grid, ListGridRecord record, Object
value) {
+ return new CanvasField(field) {
+ protected com.smartgwt.client.widgets.Canvas createCanvas(ListGrid grid,
ListGridRecord record, Object value) {
return createDetailsViewLink(record, value);
}
};
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/ViewLinkField.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/ViewLinkField.java
deleted file mode 100644
index cee59f9..0000000
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/ViewLinkField.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.rhq.enterprise.gui.coregui.client.components.table;
-
-import com.google.gwt.core.client.JavaScriptObject;
-import com.smartgwt.client.widgets.Canvas;
-import com.smartgwt.client.widgets.grid.ListGrid;
-import com.smartgwt.client.widgets.grid.ListGridField;
-import com.smartgwt.client.widgets.grid.ListGridRecord;
-import org.rhq.enterprise.gui.coregui.client.components.ViewLink;
-
-/**
- * A list grid field that is displayed as a link to another CoreGUI view.
- * TODO: Get rid of this class, since it no longer provides anything beyond what
CanvasField does.
- *
- * @author Ian Springer
- */
-public abstract class ViewLinkField extends CanvasField {
-
- protected ViewLinkField() {
- super();
- }
-
- protected ViewLinkField(JavaScriptObject jsObj) {
- super(jsObj);
- }
-
- protected ViewLinkField(String name) {
- super(name);
- }
-
- protected ViewLinkField(String name, int width) {
- super(name, width);
- }
-
- protected ViewLinkField(String name, String title) {
- super(name, title);
- }
-
- protected ViewLinkField(String name, String title, int width) {
- super(name, title, width);
- }
-
- protected ViewLinkField(ListGridField field) {
- super(field);
- }
-
- @Override
- protected Canvas createCanvas(ListGrid grid, ListGridRecord record, Object value) {
- return getViewLink(grid, record, value);
- }
-
- protected abstract ViewLink getViewLink(ListGrid grid, ListGridRecord record, Object
value);
-
-}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformSummaryPortlet.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformSummaryPortlet.java
index bc50d85..4c33613 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformSummaryPortlet.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformSummaryPortlet.java
@@ -47,7 +47,7 @@ import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.LinkManager;
import org.rhq.enterprise.gui.coregui.client.components.ViewLink;
-import org.rhq.enterprise.gui.coregui.client.components.table.ViewLinkField;
+import org.rhq.enterprise.gui.coregui.client.components.table.CanvasField;
import org.rhq.enterprise.gui.coregui.client.components.view.ViewName;
import org.rhq.enterprise.gui.coregui.client.dashboard.Portlet;
import org.rhq.enterprise.gui.coregui.client.dashboard.PortletViewFactory;
@@ -122,9 +122,9 @@ public class PlatformSummaryPortlet extends LocatableListGrid
implements Portlet
}
private void buildUI() {
- ViewLinkField nameField = new
ViewLinkField(ResourceDataSourceField.NAME.propertyName(), MSG
+ CanvasField nameField = new
CanvasField(ResourceDataSourceField.NAME.propertyName(), MSG
.common_title_name()) {
- protected ViewLink getViewLink(ListGrid grid, ListGridRecord record, Object
value) {
+ protected com.smartgwt.client.widgets.Canvas createCanvas(ListGrid grid,
ListGridRecord record, Object value) {
String resourceUrl =
LinkManager.getResourceLink(record.getAttributeAsInt("id"));
String linkText =
StringUtility.escapeHtml(record.getAttribute(ResourceDataSourceField.NAME.propertyName()));
return new ViewLink(extendLocatorId("ViewLink"), linkText,
resourceUrl);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourcesPortlet.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourcesPortlet.java
index 620422d..46f3972 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourcesPortlet.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourcesPortlet.java
@@ -41,7 +41,7 @@ import org.rhq.enterprise.gui.coregui.client.LinkManager;
import org.rhq.enterprise.gui.coregui.client.components.HeaderLabel;
import org.rhq.enterprise.gui.coregui.client.components.ViewLink;
import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter;
-import org.rhq.enterprise.gui.coregui.client.components.table.ViewLinkField;
+import org.rhq.enterprise.gui.coregui.client.components.table.CanvasField;
import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet;
import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortletUtil;
import org.rhq.enterprise.gui.coregui.client.dashboard.CustomSettingsPortlet;
@@ -91,8 +91,8 @@ public class RecentlyAddedResourcesPortlet extends LocatableVLayout
implements C
treeGrid.setResizeFieldsInRealTime(true);
treeGrid.setTreeFieldTitle("Resource Name");
- ViewLinkField resourceNameField = new ViewLinkField("name",
MSG.common_title_resource_name()) {
- protected ViewLink getViewLink(ListGrid grid, ListGridRecord record, Object
value) {
+ CanvasField resourceNameField = new CanvasField("name",
MSG.common_title_resource_name()) {
+ protected com.smartgwt.client.widgets.Canvas createCanvas(ListGrid grid,
ListGridRecord record, Object value) {
int resourceId = record.getAttributeAsInt("id");
String resourceName = record.getAttribute("name");
String resourceViewPath = LinkManager.getResourceLink(resourceId);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationSchedulePortlet.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationSchedulePortlet.java
index 3853ea7..b2656cf 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationSchedulePortlet.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationSchedulePortlet.java
@@ -45,7 +45,7 @@ import org.rhq.enterprise.gui.coregui.client.LinkManager;
import org.rhq.enterprise.gui.coregui.client.components.ViewLink;
import org.rhq.enterprise.gui.coregui.client.components.table.CanvasField;
import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter;
-import org.rhq.enterprise.gui.coregui.client.components.table.ViewLinkField;
+import org.rhq.enterprise.gui.coregui.client.components.table.CanvasField;
import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet;
import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortletUtil;
import org.rhq.enterprise.gui.coregui.client.dashboard.CustomSettingsPortlet;
@@ -124,7 +124,7 @@ public class OperationSchedulePortlet extends LocatableVLayout
implements Custom
CanvasField timeNext = new
CanvasField(ScheduledOperationsDataSource.Field.TIME.propertyName(),
ScheduledOperationsDataSource.Field.TIME.title(), WIDTH_SCHEDULED_TIME) {
- protected Canvas createCanvas(ListGrid grid, ListGridRecord record, Object
value) {
+ protected com.smartgwt.client.widgets.Canvas createCanvas(ListGrid grid,
ListGridRecord record, Object value) {
if (value != null) {
String timestamp = TimestampCellFormatter.format(value);
Integer resourceId =
record.getAttributeAsInt(AncestryUtil.RESOURCE_ID);
@@ -143,9 +143,9 @@ public class OperationSchedulePortlet extends LocatableVLayout
implements Custom
ListGridField operationNext = new
ListGridField(ScheduledOperationsDataSource.Field.OPERATION.propertyName(),
ScheduledOperationsDataSource.Field.OPERATION.title());
- ViewLinkField resourceNext = new
ViewLinkField(ScheduledOperationsDataSource.Field.RESOURCE.propertyName(),
+ CanvasField resourceNext = new
CanvasField(ScheduledOperationsDataSource.Field.RESOURCE.propertyName(),
ScheduledOperationsDataSource.Field.RESOURCE.title()) {
- protected ViewLink getViewLink(ListGrid grid, ListGridRecord record, Object
value) {
+ protected com.smartgwt.client.widgets.Canvas createCanvas(ListGrid grid,
ListGridRecord record, Object value) {
String url =
LinkManager.getResourceLink(record.getAttributeAsInt(AncestryUtil.RESOURCE_ID));
return new ViewLink(value.toString(), url);
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java
index a512bab..2153de0 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java
@@ -51,7 +51,7 @@ import org.rhq.enterprise.gui.coregui.client.components.ViewLink;
import org.rhq.enterprise.gui.coregui.client.components.table.IconField;
import org.rhq.enterprise.gui.coregui.client.components.table.Table;
import org.rhq.enterprise.gui.coregui.client.components.table.TableWidget;
-import org.rhq.enterprise.gui.coregui.client.components.table.ViewLinkField;
+import org.rhq.enterprise.gui.coregui.client.components.table.CanvasField;
import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet;
import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortletUtil;
import org.rhq.enterprise.gui.coregui.client.dashboard.CustomSettingsPortlet;
@@ -122,9 +122,9 @@ public class ProblemResourcesPortlet extends
Table<ProblemResourcesDataSource> i
addExtraWidget(new TimeRange(extendLocatorId("TimeRange"), this),
false);
}
- ViewLinkField resourceField = new ViewLinkField(RESOURCE.propertyName(),
RESOURCE.title()) {
+ CanvasField resourceField = new CanvasField(RESOURCE.propertyName(),
RESOURCE.title()) {
@Override
- protected ViewLink getViewLink(ListGrid grid, ListGridRecord record, Object
value) {
+ protected com.smartgwt.client.widgets.Canvas createCanvas(ListGrid grid,
ListGridRecord record, Object value) {
String url =
LinkManager.getResourceLink(record.getAttributeAsInt("id"));
return new ViewLink(value.toString(), url);
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryListView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryListView.java
index c97a67e..ef11e15 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryListView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryListView.java
@@ -51,7 +51,7 @@ import org.rhq.enterprise.gui.coregui.client.components.ViewLink;
import org.rhq.enterprise.gui.coregui.client.components.table.TableAction;
import org.rhq.enterprise.gui.coregui.client.components.table.TableSection;
import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter;
-import org.rhq.enterprise.gui.coregui.client.components.table.ViewLinkField;
+import org.rhq.enterprise.gui.coregui.client.components.table.CanvasField;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil;
import org.rhq.enterprise.gui.coregui.client.operation.OperationHistoryDataSource;
@@ -249,9 +249,9 @@ public abstract class AbstractOperationHistoryListView<T extends
AbstractOperati
return statusField;
}
- protected ViewLinkField createResourceField() {
- ViewLinkField resourceField = new ViewLinkField(AncestryUtil.RESOURCE_NAME,
MSG.common_title_resource()) {
- protected ViewLink getViewLink(ListGrid grid, ListGridRecord record, Object
value) {
+ protected CanvasField createResourceField() {
+ CanvasField resourceField = new CanvasField(AncestryUtil.RESOURCE_NAME,
MSG.common_title_resource()) {
+ protected com.smartgwt.client.widgets.Canvas createCanvas(ListGrid grid,
ListGridRecord record, Object value) {
String url =
LinkManager.getResourceLink(record.getAttributeAsInt(AncestryUtil.RESOURCE_ID));
return new ViewLink(value.toString(), url);
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java
index 7ab79dd..b415b6f 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java
@@ -51,7 +51,7 @@ import
org.rhq.enterprise.gui.coregui.client.components.table.AbstractTableActio
import org.rhq.enterprise.gui.coregui.client.components.table.AuthorizedTableAction;
import org.rhq.enterprise.gui.coregui.client.components.table.Table;
import org.rhq.enterprise.gui.coregui.client.components.table.TableActionEnablement;
-import org.rhq.enterprise.gui.coregui.client.components.table.ViewLinkField;
+import org.rhq.enterprise.gui.coregui.client.components.table.CanvasField;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.gwt.ResourceGroupGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.inventory.groups.wizard.GroupCreateWizard;
@@ -138,8 +138,8 @@ public class ResourceGroupListView extends
Table<ResourceGroupCompositeDataSourc
}
});
- ViewLinkField nameField = new ViewLinkField(NAME.propertyName(), NAME.title()) {
- protected ViewLink getViewLink(ListGrid grid, ListGridRecord record, Object
value) {
+ CanvasField nameField = new CanvasField(NAME.propertyName(), NAME.title()) {
+ protected com.smartgwt.client.widgets.Canvas createCanvas(ListGrid grid,
ListGridRecord record, Object value) {
String groupId = record.getAttribute("id");
String groupUrl =
LinkManager.getResourceGroupLink(Integer.valueOf(groupId));
return new ViewLink(value.toString(), groupUrl);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java
index daf2c1a..d8550be 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java
@@ -75,7 +75,7 @@ import org.rhq.enterprise.gui.coregui.client.ViewPath;
import org.rhq.enterprise.gui.coregui.client.components.ViewLink;
import org.rhq.enterprise.gui.coregui.client.components.table.EscapedHtmlCellFormatter;
import org.rhq.enterprise.gui.coregui.client.components.table.Table;
-import org.rhq.enterprise.gui.coregui.client.components.table.ViewLinkField;
+import org.rhq.enterprise.gui.coregui.client.components.table.CanvasField;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupsDataSource;
import
org.rhq.enterprise.gui.coregui.client.inventory.groups.definitions.GroupDefinitionExpressionBuilder.AddExpressionHandler;
@@ -250,8 +250,8 @@ public class SingleGroupDefinitionView extends LocatableVLayout
implements Bookm
idField.setType(ListGridFieldType.INTEGER);
idField.setWidth("50");
- ViewLinkField nameField = new ViewLinkField(NAME.propertyName(),
NAME.title()) {
- protected ViewLink getViewLink(ListGrid grid, ListGridRecord record,
Object value) {
+ CanvasField nameField = new CanvasField(NAME.propertyName(), NAME.title()) {
+ protected com.smartgwt.client.widgets.Canvas createCanvas(ListGrid grid,
ListGridRecord record, Object value) {
String linkName =
StringUtility.escapeHtml(record.getAttributeAsString(NAME.propertyName()));
String linkUrl =
LinkManager.getResourceGroupLink(record.getAttributeAsInt("id"));
return new ViewLink(extendLocatorId("ViewLink"), linkName,
linkUrl);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationMembers.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationMembers.java
index c0692dd..a1ac3bf 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationMembers.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationMembers.java
@@ -54,7 +54,7 @@ import org.rhq.enterprise.gui.coregui.client.components.ViewLink;
import org.rhq.enterprise.gui.coregui.client.components.buttons.BackButton;
import org.rhq.enterprise.gui.coregui.client.components.table.Table;
import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter;
-import org.rhq.enterprise.gui.coregui.client.components.table.ViewLinkField;
+import org.rhq.enterprise.gui.coregui.client.components.table.CanvasField;
import org.rhq.enterprise.gui.coregui.client.gwt.ConfigurationGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil;
@@ -105,8 +105,8 @@ public class HistoryGroupResourceConfigurationMembers extends
LocatableVLayout {
@Override
protected void configureTable() {
- ViewLinkField fieldResource = new ViewLinkField(AncestryUtil.RESOURCE_NAME,
MSG.common_title_resource()) {
- protected ViewLink getViewLink(ListGrid grid, ListGridRecord record,
Object value) {
+ CanvasField fieldResource = new CanvasField(AncestryUtil.RESOURCE_NAME,
MSG.common_title_resource()) {
+ protected com.smartgwt.client.widgets.Canvas createCanvas(ListGrid grid,
ListGridRecord record, Object value) {
String url = LinkManager
.getResourceLink(record.getAttributeAsInt(AncestryUtil.RESOURCE_ID));
return new ViewLink(value.toString(), url);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationMembers.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationMembers.java
index cdb8551..4eeda1e 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationMembers.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationMembers.java
@@ -54,7 +54,7 @@ import org.rhq.enterprise.gui.coregui.client.components.ViewLink;
import org.rhq.enterprise.gui.coregui.client.components.buttons.BackButton;
import org.rhq.enterprise.gui.coregui.client.components.table.Table;
import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter;
-import org.rhq.enterprise.gui.coregui.client.components.table.ViewLinkField;
+import org.rhq.enterprise.gui.coregui.client.components.table.CanvasField;
import org.rhq.enterprise.gui.coregui.client.gwt.ConfigurationGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil;
@@ -104,8 +104,8 @@ public class HistoryGroupPluginConfigurationMembers extends
LocatableVLayout {
@Override
protected void configureTable() {
- ViewLinkField fieldResource = new ViewLinkField(AncestryUtil.RESOURCE_NAME,
MSG.common_title_resource()) {
- protected ViewLink getViewLink(ListGrid grid, ListGridRecord record,
Object value) {
+ CanvasField fieldResource = new CanvasField(AncestryUtil.RESOURCE_NAME,
MSG.common_title_resource()) {
+ protected com.smartgwt.client.widgets.Canvas createCanvas(ListGrid grid,
ListGridRecord record, Object value) {
String url = LinkManager
.getResourceLink(record.getAttributeAsInt(AncestryUtil.RESOURCE_ID));
return new ViewLink(value.toString(), url);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/traits/TraitsDetailView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/traits/TraitsDetailView.java
index 4d3122e..1cbb877 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/traits/TraitsDetailView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/traits/TraitsDetailView.java
@@ -26,7 +26,7 @@ import com.smartgwt.client.widgets.grid.ListGridRecord;
import org.rhq.core.domain.criteria.MeasurementDataTraitCriteria;
import org.rhq.enterprise.gui.coregui.client.LinkManager;
import org.rhq.enterprise.gui.coregui.client.components.ViewLink;
-import org.rhq.enterprise.gui.coregui.client.components.table.ViewLinkField;
+import org.rhq.enterprise.gui.coregui.client.components.table.CanvasField;
import
org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractMeasurementDataTraitListDetailView;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil;
@@ -46,8 +46,8 @@ public class TraitsDetailView extends
AbstractMeasurementDataTraitListDetailView
ListGrid listGrid = getListGrid();
- ViewLinkField resourceNameField = new
ViewLinkField(listGrid.getField(MeasurementDataTraitCriteria.SORT_FIELD_RESOURCE_NAME)) {
- protected ViewLink getViewLink(ListGrid grid, ListGridRecord record, Object
value) {
+ CanvasField resourceNameField = new
CanvasField(listGrid.getField(MeasurementDataTraitCriteria.SORT_FIELD_RESOURCE_NAME)) {
+ protected com.smartgwt.client.widgets.Canvas createCanvas(ListGrid grid,
ListGridRecord record, Object value) {
String url =
LinkManager.getResourceLink(record.getAttributeAsInt(AncestryUtil.RESOURCE_ID));
return new ViewLink(value.toString(), url);
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/traits/TraitsView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/traits/TraitsView.java
index 5de7e79..ade5818 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/traits/TraitsView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/traits/TraitsView.java
@@ -30,7 +30,7 @@ import com.smartgwt.client.widgets.grid.ListGridRecord;
import org.rhq.core.domain.criteria.MeasurementDataTraitCriteria;
import org.rhq.enterprise.gui.coregui.client.LinkManager;
import org.rhq.enterprise.gui.coregui.client.components.ViewLink;
-import org.rhq.enterprise.gui.coregui.client.components.table.ViewLinkField;
+import org.rhq.enterprise.gui.coregui.client.components.table.CanvasField;
import
org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractMeasurementDataTraitListView;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil;
import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
@@ -56,8 +56,8 @@ public class TraitsView extends AbstractMeasurementDataTraitListView {
listGrid.setGroupStartOpen(GroupStartOpen.ALL);
listGrid.groupBy(MeasurementDataTraitCriteria.SORT_FIELD_DISPLAY_NAME);
- ViewLinkField resourceNameField = new
ViewLinkField(listGrid.getField(MeasurementDataTraitCriteria.SORT_FIELD_RESOURCE_NAME)) {
- protected ViewLink getViewLink(ListGrid grid, ListGridRecord record, Object
value) {
+ CanvasField resourceNameField = new
CanvasField(listGrid.getField(MeasurementDataTraitCriteria.SORT_FIELD_RESOURCE_NAME)) {
+ protected com.smartgwt.client.widgets.Canvas createCanvas(ListGrid grid,
ListGridRecord record, Object value) {
String url =
LinkManager.getResourceLink(record.getAttributeAsInt(AncestryUtil.RESOURCE_ID));
return new ViewLink(value.toString(), url);
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/history/GroupMemberResourceOperationHistoryListView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/history/GroupMemberResourceOperationHistoryListView.java
index 59e4ac2..0e669f5 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/history/GroupMemberResourceOperationHistoryListView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/history/GroupMemberResourceOperationHistoryListView.java
@@ -13,7 +13,7 @@ import com.smartgwt.client.widgets.grid.ListGridRecord;
import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.LinkManager;
-import org.rhq.enterprise.gui.coregui.client.components.table.ViewLinkField;
+import org.rhq.enterprise.gui.coregui.client.components.table.CanvasField;
import
org.rhq.enterprise.gui.coregui.client.inventory.common.detail.operation.history.AbstractOperationHistoryDataSource;
import
org.rhq.enterprise.gui.coregui.client.inventory.common.detail.operation.history.AbstractOperationHistoryListView;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil;
@@ -45,7 +45,7 @@ public class GroupMemberResourceOperationHistoryListView extends
idField.setWidth(38);
fields.add(idField);
- ViewLinkField resourceField = createResourceField();
+ CanvasField resourceField = createResourceField();
resourceField.setWidth("25%");
resourceField.setShowHover(true);
resourceField.setHoverCustomizer(new HoverCustomizer() {
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/AncestryUtil.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/AncestryUtil.java
index d178e25..333ff56 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/AncestryUtil.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/AncestryUtil.java
@@ -70,7 +70,7 @@ public abstract class AncestryUtil {
public static ListGridField setupAncestryListGridField() {
CanvasField ancestryField = new CanvasField(AncestryUtil.RESOURCE_ANCESTRY,
CoreGUI.getMessages().common_title_ancestry()) {
- protected Canvas createCanvas(ListGrid grid, ListGridRecord record, Object
value) {
+ protected com.smartgwt.client.widgets.Canvas createCanvas(ListGrid grid,
ListGridRecord record, Object value) {
return createCellCanvasForAncestryValue(record, value);
}
};
@@ -88,7 +88,7 @@ public abstract class AncestryUtil {
*/
public static ListGridField setupAncestryListGridField(ListGrid listGrid) {
ListGridField ancestryField = new
CanvasField(listGrid.getField(AncestryUtil.RESOURCE_ANCESTRY)) {
- protected Canvas createCanvas(ListGrid grid, ListGridRecord record, Object
value) {
+ protected com.smartgwt.client.widgets.Canvas createCanvas(ListGrid grid,
ListGridRecord record, Object value) {
return createCellCanvasForAncestryValue(record, value);
}
};
@@ -412,6 +412,13 @@ public abstract class AncestryUtil {
return result;
}
+ public static void setAncestryRecordAttributes(Record record, Resource resource) {
+ record.setAttribute(AncestryUtil.RESOURCE_ID, resource.getId());
+ record.setAttribute(AncestryUtil.RESOURCE_NAME, resource.getName());
+ record.setAttribute(AncestryUtil.RESOURCE_ANCESTRY, resource.getAncestry());
+ record.setAttribute(AncestryUtil.RESOURCE_TYPE_ID,
resource.getResourceType().getId());
+ }
+
private static Integer getResourceId(Record record) {
Integer resourceId = record.getAttributeAsInt(RESOURCE_ID);
// if not set assume the standard "id" attr is a resourceId
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java
index a33b8be..6848bb4 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java
@@ -28,6 +28,7 @@ import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.Criteria;
import com.smartgwt.client.data.Record;
import com.smartgwt.client.data.SortSpecifier;
+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.HoverCustomizer;
@@ -51,7 +52,7 @@ import
org.rhq.enterprise.gui.coregui.client.components.table.ResourceCategoryCe
import org.rhq.enterprise.gui.coregui.client.components.table.Table;
import org.rhq.enterprise.gui.coregui.client.components.table.TableActionEnablement;
import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter;
-import org.rhq.enterprise.gui.coregui.client.components.table.ViewLinkField;
+import org.rhq.enterprise.gui.coregui.client.components.table.CanvasField;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.gwt.ResourceGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
@@ -193,8 +194,8 @@ public class ResourceSearchView extends Table {
});
fields.add(iconField);
- ViewLinkField nameField = new ViewLinkField(NAME.propertyName(), NAME.title(),
250) {
- protected ViewLink getViewLink(ListGrid grid, ListGridRecord record, Object
value) {
+ CanvasField nameField = new CanvasField(NAME.propertyName(), NAME.title(), 250)
{
+ protected com.smartgwt.client.widgets.Canvas createCanvas(ListGrid grid,
ListGridRecord record, Object value) {
String url =
LinkManager.getResourceLink(record.getAttributeAsInt("id"));
String name = StringUtility.escapeHtml(value.toString());
return new ViewLink(name, url);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryDataSource.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryDataSource.java
index 05a00b6..3fb3937 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryDataSource.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryDataSource.java
@@ -47,7 +47,7 @@ import org.rhq.enterprise.gui.coregui.client.LinkManager;
import org.rhq.enterprise.gui.coregui.client.components.ViewLink;
import org.rhq.enterprise.gui.coregui.client.components.table.CanvasField;
import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter;
-import org.rhq.enterprise.gui.coregui.client.components.table.ViewLinkField;
+import org.rhq.enterprise.gui.coregui.client.components.table.CanvasField;
import org.rhq.enterprise.gui.coregui.client.gwt.ConfigurationGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil;
@@ -202,7 +202,7 @@ public abstract class AbstractConfigurationHistoryDataSource<T
extends AbstractR
CanvasField updateTypeField = new CanvasField(Field.GROUP_CONFIG_UPDATE_ID, MSG
.dataSource_configurationHistory_updateType()) {
- protected Canvas createCanvas(ListGrid grid, ListGridRecord record, Object
value) {
+ protected com.smartgwt.client.widgets.Canvas createCanvas(ListGrid grid,
ListGridRecord record, Object value) {
Integer groupConfigUpdateId =
record.getAttributeAsInt(Field.GROUP_CONFIG_UPDATE_ID);
if (groupConfigUpdateId == null) {
return new
HTMLFlow(MSG.dataSource_configurationHistory_updateType_individual());
@@ -218,8 +218,8 @@ public abstract class AbstractConfigurationHistoryDataSource<T
extends AbstractR
// determine the widths of our columns
if (includeResourceFields) {
- ViewLinkField resourceNameField = new
ViewLinkField(AncestryUtil.RESOURCE_NAME, MSG.common_title_resource()) {
- protected ViewLink getViewLink(ListGrid grid, ListGridRecord record,
Object value) {
+ CanvasField resourceNameField = new CanvasField(AncestryUtil.RESOURCE_NAME,
MSG.common_title_resource()) {
+ protected com.smartgwt.client.widgets.Canvas createCanvas(ListGrid grid,
ListGridRecord record, Object value) {
String url = LinkManager
.getResourceLink(record.getAttributeAsInt(AncestryUtil.RESOURCE_ID));
return new ViewLink(value.toString(), url);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryView.java
index 9b14c88..3ba7c23 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryView.java
@@ -158,7 +158,7 @@ public abstract class AbstractConfigurationHistoryView<T extends
AbstractConfigu
@Override
protected CanvasField createDetailsLinkField(ListGridField field) {
return new CanvasField(field) {
- protected Canvas createCanvas(ListGrid grid, ListGridRecord record, Object
value) {
+ protected com.smartgwt.client.widgets.Canvas createCanvas(ListGrid grid,
ListGridRecord record, Object value) {
HLayout hLayout = new HLayout();
String isCurrentConfig = record
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/OperationHistoryDataSource.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/OperationHistoryDataSource.java
index c910b32..b40d0b8 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/OperationHistoryDataSource.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/OperationHistoryDataSource.java
@@ -58,7 +58,7 @@ import org.rhq.enterprise.gui.coregui.client.LinkManager;
import org.rhq.enterprise.gui.coregui.client.components.ViewLink;
import org.rhq.enterprise.gui.coregui.client.components.table.CanvasField;
import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter;
-import org.rhq.enterprise.gui.coregui.client.components.table.ViewLinkField;
+import org.rhq.enterprise.gui.coregui.client.components.table.CanvasField;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.gwt.OperationGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil;
@@ -126,8 +126,8 @@ public class OperationHistoryDataSource extends
fields.add(statusField);
if (this.entityContext.type != EntityContext.Type.Resource) {
- ViewLinkField resourceNameField = new
ViewLinkField(AncestryUtil.RESOURCE_NAME, MSG.common_title_resource()) {
- protected ViewLink getViewLink(ListGrid grid, ListGridRecord record,
Object value) {
+ CanvasField resourceNameField = new CanvasField(AncestryUtil.RESOURCE_NAME,
MSG.common_title_resource()) {
+ protected com.smartgwt.client.widgets.Canvas createCanvas(ListGrid grid,
ListGridRecord record, Object value) {
String url = LinkManager
.getResourceLink(record.getAttributeAsInt(AncestryUtil.RESOURCE_ID));
return new ViewLink(value.toString(), url);
@@ -164,7 +164,7 @@ public class OperationHistoryDataSource extends
protected ListGridField createStartedTimeField() {
CanvasField startedTimeField = new CanvasField(Field.STARTED_TIME, MSG
.view_operationHistoryDetails_dateSubmitted()) {
- protected Canvas createCanvas(ListGrid grid, ListGridRecord record, Object
value) {
+ protected com.smartgwt.client.widgets.Canvas createCanvas(ListGrid grid,
ListGridRecord record, Object value) {
if (value != null) {
String timestamp = TimestampCellFormatter.format(value);
Integer resourceId =
record.getAttributeAsInt(AncestryUtil.RESOURCE_ID);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java
index e26d3ef..2cf1a2a 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java
@@ -36,7 +36,7 @@ import org.rhq.enterprise.gui.coregui.client.components.Link;
import org.rhq.enterprise.gui.coregui.client.components.ViewLink;
import org.rhq.enterprise.gui.coregui.client.components.table.CanvasField;
import org.rhq.enterprise.gui.coregui.client.components.table.Table;
-import org.rhq.enterprise.gui.coregui.client.components.table.ViewLinkField;
+import org.rhq.enterprise.gui.coregui.client.components.table.CanvasField;
import org.rhq.enterprise.gui.coregui.client.components.view.ViewName;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil;
@@ -127,8 +127,8 @@ public class AlertDefinitionReportView extends
Table<AlertDefinitionReportView.D
if (fieldName.equals(FIELD_CTIME) || fieldName.equals(FIELD_MTIME)) {
field.setHidden(true);
} else if (fieldName.equals(FIELD_NAME)) {
- ViewLinkField nameField = new ViewLinkField(field) {
- protected ViewLink getViewLink(ListGrid grid, ListGridRecord
record, Object value) {
+ CanvasField nameField = new CanvasField(field) {
+ protected com.smartgwt.client.widgets.Canvas
createCanvas(ListGrid grid, ListGridRecord record, Object value) {
AlertDefinition alertDef = copyValues(record);
int resourceId = alertDef.getResource().getId();
int alertDefId = alertDef.getId();
@@ -143,7 +143,7 @@ public class AlertDefinitionReportView extends
Table<AlertDefinitionReportView.D
// add more columns
CanvasField parentField = new CanvasField(FIELD_PARENT,
MSG.view_alerts_field_parent(), 100) {
- protected Canvas createCanvas(ListGrid grid, final ListGridRecord record,
Object value) {
+ protected com.smartgwt.client.widgets.Canvas createCanvas(ListGrid grid,
final ListGridRecord record, Object value) {
final AlertDefinition alertDef = copyValues(record);
boolean hasParent;
String linkText;
@@ -223,7 +223,7 @@ public class AlertDefinitionReportView extends
Table<AlertDefinitionReportView.D
fields.add(parentField);
CanvasField resourceField = new CanvasField(FIELD_RESOURCE,
MSG.common_title_resource()) {
- protected Canvas createCanvas(ListGrid grid, ListGridRecord record,
Object value) {
+ protected com.smartgwt.client.widgets.Canvas createCanvas(ListGrid grid,
ListGridRecord record, Object value) {
Integer resourceId =
record.getAttributeAsInt(AncestryUtil.RESOURCE_ID);
String url = LinkManager.getResourceLink(resourceId);
String resourceName = record.getAttribute(FIELD_RESOURCE);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ResourceInstallReport.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ResourceInstallReport.java
index 6ab2b2a..af0d7a2 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ResourceInstallReport.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ResourceInstallReport.java
@@ -117,7 +117,7 @@ public class ResourceInstallReport extends LocatableVLayout implements
Bookmarka
@Override
protected void configureTable() {
CanvasField fieldTypeName = new CanvasField(DataSource.Field.TYPENAME,
MSG.common_title_resource_type()) {
- protected Canvas createCanvas(ListGrid grid, ListGridRecord record,
Object value) {
+ protected com.smartgwt.client.widgets.Canvas createCanvas(ListGrid grid,
ListGridRecord record, Object value) {
String typeName = record.getAttribute(DataSource.Field.TYPENAME);
String url = getResourceTypeTableUrl(record);
Canvas canvas;
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/measurement/MeasurementOOBDataSource.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/measurement/MeasurementOOBDataSource.java
index 7794e3a..8715183 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/measurement/MeasurementOOBDataSource.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/measurement/MeasurementOOBDataSource.java
@@ -49,7 +49,7 @@ import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.LinkManager;
import org.rhq.enterprise.gui.coregui.client.components.ViewLink;
-import org.rhq.enterprise.gui.coregui.client.components.table.ViewLinkField;
+import org.rhq.enterprise.gui.coregui.client.components.table.CanvasField;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil;
import
org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
@@ -79,8 +79,8 @@ public class MeasurementOOBDataSource extends
RPCDataSource<MeasurementOOBCompos
public ArrayList<ListGridField> getListGridFields() {
ArrayList<ListGridField> fields = new ArrayList<ListGridField>();
- ViewLinkField resourceNameField = new ViewLinkField(AncestryUtil.RESOURCE_NAME,
MSG.common_title_resource()) {
- protected ViewLink getViewLink(ListGrid grid, ListGridRecord record, Object
value) {
+ CanvasField resourceNameField = new CanvasField(AncestryUtil.RESOURCE_NAME,
MSG.common_title_resource()) {
+ protected com.smartgwt.client.widgets.Canvas createCanvas(ListGrid grid,
ListGridRecord record, Object value) {
String url =
LinkManager.getResourceLink(record.getAttributeAsInt(AncestryUtil.RESOURCE_ID));
return new ViewLink(value.toString(), url);
}