modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsDataSource.java
| 18 ++++++++--
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GeneralPropertiesAlertDefinitionForm.java
| 14 +++++--
2 files changed, 26 insertions(+), 6 deletions(-)
New commits:
commit e3421f51e395eda30bcb42e44658e37e26ad6800
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Fri Sep 10 12:55:31 2010 -0400
show priority flag icons in alert def pages
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsDataSource.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsDataSource.java
index 7e56aec..8f8c5c3 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsDataSource.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsDataSource.java
@@ -23,6 +23,7 @@ import java.util.Date;
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.fields.DataSourceImageField;
import com.smartgwt.client.data.fields.DataSourceTextField;
import com.smartgwt.client.types.FieldType;
import com.smartgwt.client.widgets.grid.ListGridRecord;
@@ -70,7 +71,20 @@ public abstract class AbstractAlertDefinitionsDataSource extends
RPCDataSource<A
record.setAttribute(FIELD_MTIME, new Date(from.getMtime()));
record.setAttribute(FIELD_ENABLED, from.getEnabled());
record.setAttribute(FIELD_DELETED, from.getDeleted());
- record.setAttribute(FIELD_PRIORITY, from.getPriority().getDisplayName());
+ switch (from.getPriority()) {
+ case HIGH: {
+ record.setAttribute(FIELD_PRIORITY,
"/images/icons/Flag_red_16.png");
+ break;
+ }
+ case MEDIUM: {
+ record.setAttribute(FIELD_PRIORITY,
"/images/icons/Flag_yellow_16.png");
+ break;
+ }
+ case LOW: {
+ record.setAttribute(FIELD_PRIORITY,
"/images/icons/Flag_blue_16.png");
+ break;
+ }
+ }
record.setAttribute(FIELD_OBJECT, from);
return record;
}
@@ -99,7 +113,7 @@ public abstract class AbstractAlertDefinitionsDataSource extends
RPCDataSource<A
enabledField.setType(FieldType.BOOLEAN);
addField(enabledField);
- DataSourceTextField priorityField = new DataSourceTextField(FIELD_PRIORITY,
"Priority");
+ DataSourceImageField priorityField = new DataSourceImageField(FIELD_PRIORITY,
"Priority");
addField(priorityField);
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GeneralPropertiesAlertDefinitionForm.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GeneralPropertiesAlertDefinitionForm.java
index b3f07bd..d1f5de5 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GeneralPropertiesAlertDefinitionForm.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GeneralPropertiesAlertDefinitionForm.java
@@ -97,7 +97,7 @@ public class GeneralPropertiesAlertDefinitionForm extends
LocatableDynamicForm i
descriptionStatic.setValue(alertDef.getDescription());
prioritySelection.setValue(alertDef.getPriority().name());
- priorityStatic.setValue(alertDef.getPriority().getDisplayName());
+ priorityStatic.setValue(alertDef.getPriority().name());
enabledSelection.setValue(alertDef.getEnabled() ? "Yes" :
"No");
enabledStatic.setValue(alertDef.getEnabled() ? "Yes" :
"No");
@@ -216,12 +216,18 @@ public class GeneralPropertiesAlertDefinitionForm extends
LocatableDynamicForm i
prioritySelection = new SelectItem("priority",
"Priority");
LinkedHashMap<String, String> priorities = new LinkedHashMap<String,
String>(3);
- priorities.put(AlertPriority.HIGH.name(),
AlertPriority.HIGH.getDisplayName());
- priorities.put(AlertPriority.MEDIUM.name(),
AlertPriority.MEDIUM.getDisplayName());
- priorities.put(AlertPriority.LOW.name(),
AlertPriority.LOW.getDisplayName());
+ priorities.put(AlertPriority.HIGH.name(), AlertPriority.HIGH.name());
+ priorities.put(AlertPriority.MEDIUM.name(), AlertPriority.MEDIUM.name());
+ priorities.put(AlertPriority.LOW.name(), AlertPriority.LOW.name());
+ LinkedHashMap<String, String> priorityIcons = new
LinkedHashMap<String, String>();
+ priorityIcons.put(AlertPriority.HIGH.name(),
"/images/icons/Flag_red_16.png");
+ priorityIcons.put(AlertPriority.MEDIUM.name(),
"/images/icons/Flag_yellow_16.png");
+ priorityIcons.put(AlertPriority.LOW.name(),
"/images/icons/Flag_blue_16.png");
prioritySelection.setValueMap(priorities);
+ prioritySelection.setValueIcons(priorityIcons);
prioritySelection.setDefaultValue(AlertPriority.MEDIUM.name());
priorityStatic = new StaticTextItem("priorityStatic",
"Priority");
+ priorityStatic.setValueIcons(priorityIcons);
enabledSelection = new RadioGroupItem("enabled",
"Enabled");
enabledSelection.setValueMap("Yes", "No");
Show replies by date