modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NotificationsAlertDefinitionForm.java
| 4 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java
| 38 ++++++----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupDataSourceField.java
| 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java
| 18 +++-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupsDataSource.java
| 32 ++++----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java
| 6 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/SearchBarPane.java
| 19 +++--
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java
| 12 ---
8 files changed, 69 insertions(+), 62 deletions(-)
New commits:
commit 2a6f63978e077abb1bba6f81a7aee7e7b6e85b28
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Thu Oct 21 14:25:27 2010 -0400
- Fix issue with resource group list view using bad field name
-- Make better use of the datasource field enums
- add "id" to the resourcegroupcompositedatasource for display in debug
mode
- cosmetic, remove obsolete straggler defs of useDatasourceDefinedFields()
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NotificationsAlertDefinitionForm.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NotificationsAlertDefinitionForm.java
index f783b4c..6e7e81e 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NotificationsAlertDefinitionForm.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NotificationsAlertDefinitionForm.java
@@ -190,10 +190,6 @@ public class NotificationsAlertDefinitionForm extends
LocatableVLayout implement
}
@Override
- public void useDatasourceDefinedFields() {
- }
-
- @Override
public AlertNotification copyValues(ListGridRecord from) {
return (AlertNotification) from.getAttributeAsObject(FIELD_OBJECT);
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java
index b2fea0a..cb338a7 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java
@@ -19,7 +19,10 @@
package org.rhq.enterprise.gui.coregui.client.inventory.groups;
import static
org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupDataSourceField.CATEGORY;
+import static
org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupDataSourceField.DESCRIPTION;
import static
org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupDataSourceField.NAME;
+import static
org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupDataSourceField.PLUGIN;
+import static
org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupDataSourceField.TYPE;
import java.util.List;
@@ -27,6 +30,7 @@ import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.DSRequest;
import com.smartgwt.client.data.DSResponse;
import com.smartgwt.client.data.DataSourceField;
+import com.smartgwt.client.data.fields.DataSourceIntegerField;
import com.smartgwt.client.data.fields.DataSourceTextField;
import com.smartgwt.client.rpc.RPCResponse;
import com.smartgwt.client.widgets.grid.ListGridRecord;
@@ -68,21 +72,27 @@ public class ResourceGroupCompositeDataSource extends
RPCDataSource<ResourceGrou
protected List<DataSourceField> addDataSourceFields() {
List<DataSourceField> fields = super.addDataSourceFields();
- DataSourceTextField nameDataField = new DataSourceTextField("name",
"Name", 200);
+ DataSourceField idDataField = new DataSourceIntegerField("id",
"ID", 50);
+ idDataField.setPrimaryKey(true);
+ idDataField.setCanEdit(false);
+ fields.add(idDataField);
+
+ DataSourceTextField nameDataField = new DataSourceTextField(NAME.propertyName(),
NAME.title(), 200);
nameDataField.setCanEdit(false);
fields.add(nameDataField);
- DataSourceTextField descriptionDataField = new
DataSourceTextField("description", "Description");
+ DataSourceTextField descriptionDataField = new
DataSourceTextField(DESCRIPTION.propertyName(), DESCRIPTION
+ .title());
descriptionDataField.setCanEdit(false);
fields.add(descriptionDataField);
- DataSourceTextField typeNameDataField = new
DataSourceTextField("typeName", "Type");
+ DataSourceTextField typeNameDataField = new
DataSourceTextField(TYPE.propertyName(), TYPE.title());
fields.add(typeNameDataField);
- DataSourceTextField pluginNameDataField = new
DataSourceTextField("pluginName", "Plugin");
+ DataSourceTextField pluginNameDataField = new
DataSourceTextField(PLUGIN.propertyName(), PLUGIN.title());
fields.add(pluginNameDataField);
- DataSourceTextField categoryDataField = new
DataSourceTextField("category", "Category");
+ DataSourceTextField categoryDataField = new
DataSourceTextField(CATEGORY.propertyName(), CATEGORY.title());
fields.add(categoryDataField);
return fields;
@@ -123,10 +133,10 @@ public class ResourceGroupCompositeDataSource extends
RPCDataSource<ResourceGrou
@Override
public ResourceGroupComposite copyValues(ListGridRecord from) {
Integer idAttrib = from.getAttributeAsInt("id");
- String nameAttrib = from.getAttribute("name");
- String descriptionAttrib = from.getAttribute("description");
- String typeNameAttrib = from.getAttribute("typeName");
- String pluginNameAttrib = from.getAttribute("pluginName");
+ String nameAttrib = from.getAttribute(NAME.propertyName());
+ String descriptionAttrib = from.getAttribute(DESCRIPTION.propertyName());
+ String typeNameAttrib = from.getAttribute(TYPE.propertyName());
+ String pluginNameAttrib = from.getAttribute(PLUGIN.propertyName());
ResourceType rt = null;
ResourceGroup rg = new ResourceGroup(nameAttrib);
@@ -155,9 +165,9 @@ public class ResourceGroupCompositeDataSource extends
RPCDataSource<ResourceGrou
ListGridRecord record = new ListGridRecord();
record.setAttribute("group", from);
record.setAttribute("id", from.getResourceGroup().getId());
- record.setAttribute("name", from.getResourceGroup().getName());
- record.setAttribute("description",
from.getResourceGroup().getDescription());
- record.setAttribute("category",
from.getResourceGroup().getGroupCategory().name());
+ record.setAttribute(NAME.propertyName(), from.getResourceGroup().getName());
+ record.setAttribute(DESCRIPTION.propertyName(),
from.getResourceGroup().getDescription());
+ record.setAttribute(CATEGORY.propertyName(),
from.getResourceGroup().getGroupCategory().name());
record.setAttribute("explicitUp",
String.valueOf(from.getExplicitUp()));
record.setAttribute("explicitDown",
String.valueOf(from.getExplicitDown()));
@@ -169,8 +179,8 @@ public class ResourceGroupCompositeDataSource extends
RPCDataSource<ResourceGrou
if (from.getResourceGroup().getResourceType() != null) {
record.setAttribute("resourceType",
from.getResourceGroup().getResourceType());
- record.setAttribute("typeName",
from.getResourceGroup().getResourceType().getName());
- record.setAttribute("pluginName",
from.getResourceGroup().getResourceType().getPlugin());
+ record.setAttribute(TYPE.propertyName(),
from.getResourceGroup().getResourceType().getName());
+ record.setAttribute(PLUGIN.propertyName(),
from.getResourceGroup().getResourceType().getPlugin());
}
return record;
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupDataSourceField.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupDataSourceField.java
index d7deadd..88ecdf6 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupDataSourceField.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupDataSourceField.java
@@ -35,7 +35,7 @@ public enum ResourceGroupDataSourceField {
PLUGIN("pluginName", "Plugin"),
- CATEGORY("category", "Category");
+ CATEGORY("groupCategory", "Category");
/**
* Corresponds to a property name of Resource
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 32aabb0..5aced32 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
@@ -18,6 +18,12 @@
*/
package org.rhq.enterprise.gui.coregui.client.inventory.groups;
+import static
org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupDataSourceField.CATEGORY;
+import static
org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupDataSourceField.DESCRIPTION;
+import static
org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupDataSourceField.NAME;
+import static
org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupDataSourceField.PLUGIN;
+import static
org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupDataSourceField.TYPE;
+
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.Criteria;
import com.smartgwt.client.types.Alignment;
@@ -64,7 +70,7 @@ public class ResourceGroupListView extends Table {
@Override
protected void configureTable() {
- ListGridField nameField = new ListGridField("name", "Name",
300);
+ ListGridField nameField = new ListGridField(NAME.propertyName(), NAME.title(),
300);
nameField.setCellFormatter(new CellFormatter() {
public String format(Object value, ListGridRecord record, int i, int i1) {
String groupId = record.getAttribute("id");
@@ -73,10 +79,10 @@ public class ResourceGroupListView extends Table {
}
});
- ListGridField descriptionField = new ListGridField("description",
"Description");
- ListGridField typeNameField = new ListGridField("typeName",
"Type", 130);
- ListGridField pluginNameField = new ListGridField("pluginName",
"Plugin", 100);
- ListGridField categoryField = new ListGridField("category",
"Category", 100);
+ ListGridField descriptionField = new ListGridField(DESCRIPTION.propertyName(),
DESCRIPTION.title());
+ ListGridField typeNameField = new ListGridField(TYPE.propertyName(),
TYPE.title(), 130);
+ ListGridField pluginNameField = new ListGridField(PLUGIN.propertyName(),
PLUGIN.title(), 100);
+ ListGridField categoryField = new ListGridField(CATEGORY.propertyName(),
CATEGORY.title(), 100);
ListGridField availabilityChildrenField = new
ListGridField("availabilityChildren", "Children", 100);
availabilityChildrenField.setWrap(false);
@@ -86,7 +92,7 @@ public class ResourceGroupListView extends Table {
availabilityDescendantsField.setWrap(false);
availabilityDescendantsField.setAlign(Alignment.CENTER);
- getListGrid().setFields(nameField, descriptionField, typeNameField,
pluginNameField, categoryField,
+ setListGridFields(nameField, descriptionField, typeNameField, pluginNameField,
categoryField,
availabilityChildrenField, availabilityDescendantsField);
addTableAction(extendLocatorId("Delete"), "Delete",
Table.SelectionEnablement.ANY,
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupsDataSource.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupsDataSource.java
index 3f6e197..a862db6 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupsDataSource.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupsDataSource.java
@@ -19,7 +19,10 @@
package org.rhq.enterprise.gui.coregui.client.inventory.groups;
import static
org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupDataSourceField.CATEGORY;
+import static
org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupDataSourceField.DESCRIPTION;
import static
org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupDataSourceField.NAME;
+import static
org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupDataSourceField.PLUGIN;
+import static
org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupDataSourceField.TYPE;
import java.util.List;
@@ -72,21 +75,22 @@ public class ResourceGroupsDataSource extends
RPCDataSource<ResourceGroup> {
idDataField.setPrimaryKey(true);
fields.add(idDataField);
- DataSourceTextField nameDataField = new DataSourceTextField("name",
"Name", 200);
+ DataSourceTextField nameDataField = new DataSourceTextField(NAME.propertyName(),
NAME.title(), 200);
nameDataField.setCanEdit(false);
fields.add(nameDataField);
- DataSourceTextField descriptionDataField = new
DataSourceTextField("description", "Description");
+ DataSourceTextField descriptionDataField = new
DataSourceTextField(DESCRIPTION.propertyName(), DESCRIPTION
+ .title());
descriptionDataField.setCanEdit(false);
fields.add(descriptionDataField);
- DataSourceTextField typeNameDataField = new
DataSourceTextField("typeName", "Type");
+ DataSourceTextField typeNameDataField = new
DataSourceTextField(TYPE.propertyName(), TYPE.title());
fields.add(typeNameDataField);
- DataSourceTextField pluginNameDataField = new
DataSourceTextField("pluginName", "Plugin");
+ DataSourceTextField pluginNameDataField = new
DataSourceTextField(PLUGIN.propertyName(), PLUGIN.title());
fields.add(pluginNameDataField);
- DataSourceTextField categoryDataField = new
DataSourceTextField("category", "Category");
+ DataSourceTextField categoryDataField = new
DataSourceTextField(CATEGORY.propertyName(), CATEGORY.title());
fields.add(categoryDataField);
return fields;
@@ -126,10 +130,10 @@ public class ResourceGroupsDataSource extends
RPCDataSource<ResourceGroup> {
@Override
public ResourceGroup copyValues(ListGridRecord from) {
Integer idAttrib = from.getAttributeAsInt("id");
- String nameAttrib = from.getAttribute("name");
- String descriptionAttrib = from.getAttribute("description");
- String typeNameAttrib = from.getAttribute("typeName");
- String pluginNameAttrib = from.getAttribute("pluginName");
+ String nameAttrib = from.getAttribute(NAME.propertyName());
+ String descriptionAttrib = from.getAttribute(DESCRIPTION.propertyName());
+ String typeNameAttrib = from.getAttribute(TYPE.propertyName());
+ String pluginNameAttrib = from.getAttribute(PLUGIN.propertyName());
ResourceType rt = null;
ResourceGroup rg = new ResourceGroup(nameAttrib);
@@ -150,14 +154,14 @@ public class ResourceGroupsDataSource extends
RPCDataSource<ResourceGroup> {
ListGridRecord record = new ListGridRecord();
record.setAttribute("group", from);
record.setAttribute("id", from.getId());
- record.setAttribute("name", from.getName());
- record.setAttribute("description", from.getDescription());
- record.setAttribute("category", from.getGroupCategory().name());
+ record.setAttribute(NAME.propertyName(), from.getName());
+ record.setAttribute(DESCRIPTION.propertyName(), from.getDescription());
+ record.setAttribute(CATEGORY.propertyName(), from.getGroupCategory().name());
if (from.getResourceType() != null) {
record.setAttribute("resourceType", from.getResourceType());
- record.setAttribute("typeName", from.getResourceType().getName());
- record.setAttribute("pluginName",
from.getResourceType().getPlugin());
+ record.setAttribute(TYPE.propertyName(), from.getResourceType().getName());
+ record.setAttribute(PLUGIN.propertyName(),
from.getResourceType().getPlugin());
}
return record;
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java
index 7759f53..c2c2e0e 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java
@@ -99,12 +99,6 @@ public class ResourceDatasource extends RPCDataSource<Resource>
{
return fields;
}
- @Override
- public void useDatasourceDefinedFields() {
- // TODO Auto-generated method stub
-
- }
-
public void executeFetch(final DSRequest request, final DSResponse response) {
ResourceCriteria criteria = getFetchCriteria(request);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/SearchBarPane.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/SearchBarPane.java
index 9546d66..9d8c94d 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/SearchBarPane.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/SearchBarPane.java
@@ -18,6 +18,12 @@
*/
package org.rhq.enterprise.gui.coregui.client.menu;
+import static
org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupDataSourceField.CATEGORY;
+import static
org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupDataSourceField.DESCRIPTION;
+import static
org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupDataSourceField.NAME;
+import static
org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupDataSourceField.PLUGIN;
+import static
org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupDataSourceField.TYPE;
+
import com.google.gwt.user.client.History;
import com.smartgwt.client.types.Alignment;
import com.smartgwt.client.types.TextMatchStyle;
@@ -34,7 +40,6 @@ import com.smartgwt.client.widgets.form.fields.events.ChangedHandler;
import com.smartgwt.client.widgets.grid.ListGridField;
import org.rhq.enterprise.gui.coregui.client.LinkManager;
-import
org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupDataSourceField;
import org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupsDataSource;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDatasource;
@@ -137,16 +142,16 @@ public class SearchBarPane extends LocatableHLayout {
private ComboBoxItem getGroupComboBox() {
final ComboBoxItem comboBox = getBaseComboBox(SearchType.GROUP);
- ListGridField nameField =
ResourceGroupDataSourceField.NAME.getListGridField(250);
- ListGridField descriptionField =
ResourceGroupDataSourceField.DESCRIPTION.getListGridField();
- ListGridField typeNameField =
ResourceGroupDataSourceField.TYPE.getListGridField(130);
- ListGridField pluginNameField =
ResourceGroupDataSourceField.PLUGIN.getListGridField(100);
- ListGridField categoryField =
ResourceGroupDataSourceField.CATEGORY.getListGridField(105);
+ ListGridField nameField = NAME.getListGridField(250);
+ ListGridField descriptionField = DESCRIPTION.getListGridField();
+ ListGridField typeNameField = TYPE.getListGridField(130);
+ ListGridField pluginNameField = PLUGIN.getListGridField(100);
+ ListGridField categoryField = CATEGORY.getListGridField(105);
comboBox.setPickListFields(nameField, descriptionField, typeNameField,
pluginNameField, categoryField);
comboBox.setValueField("id");
- comboBox.setDisplayField(ResourceGroupDataSourceField.NAME.propertyName());
+ comboBox.setDisplayField(NAME.propertyName());
comboBox.setOptionDataSource(new ResourceGroupsDataSource());
return comboBox;
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 ce0ce25..d61a308 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
@@ -73,14 +73,6 @@ public abstract class RPCDataSource<T> extends DataSource {
}
/**
- * Override in each subclass to set the default ds fields for the ds. The datasource
should not
- * define and set ds fields in the constructor in case a user of the ds wants to set
their own. For example,
- * those that want to use list grid fields (like our list views).
- */
- public void useDatasourceDefinedFields() {
- }
-
- /**
* A pattern that can be used for Datasource subclassing. Each subclass can add
it's own fields prior to
* all of the fields being added to the datasource.
*/
@@ -130,8 +122,8 @@ public abstract class RPCDataSource<T> extends DataSource {
if (request.getStartRow() == null || request.getEndRow() == null) {
pageControl = new PageControl();
} else {
- pageControl = PageControl.getExplicitPageControl(request.getStartRow(),
- request.getEndRow() - request.getStartRow());
+ pageControl = PageControl.getExplicitPageControl(request.getStartRow(),
request.getEndRow()
+ - request.getStartRow());
}
// Initialize sorting.