modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java
| 16 ++++++----
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
| 1
2 files changed, 12 insertions(+), 5 deletions(-)
New commits:
commit e515acc7a0c083dd3969305d095f3a5274b6c8bd
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Mar 30 14:17:21 2011 -0400
Protect against NPE and improve hover text.
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 9fde105..71a698a 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
@@ -165,11 +165,17 @@ public class AlertDataSource extends RPCDataSource<Alert,
AlertCriteria> {
statusField.setHoverCustomizer(new HoverCustomizer() {
public String hoverHTML(Object value, ListGridRecord record, int rowNum, int
colNum) {
String ackSubject =
record.getAttribute("acknowledgingSubject");
- Date ackTime = record.getAttributeAsDate("acknowledgeTime");
- String ackTimeString = TimestampCellFormatter.format(ackTime,
- TimestampCellFormatter.DATE_TIME_FORMAT_FULL);
- StringBuilder sb = new StringBuilder("<p
style='width:500px'>");
- sb.append(MSG.view_alerts_field_ack_status_ackHover(ackSubject,
ackTimeString));
+ StringBuilder sb = new StringBuilder("<p");
+ if (ackSubject == null) {
+ sb.append(" style='width:150px'>");
+ sb.append(MSG.view_alerts_field_ack_status_noAckHover());
+ } else {
+ sb.append(" style='width:500px'>");
+ Date ackTime =
record.getAttributeAsDate("acknowledgeTime");
+ String ackTimeString = TimestampCellFormatter.format(ackTime,
+ TimestampCellFormatter.DATE_TIME_FORMAT_FULL);
+ sb.append(MSG.view_alerts_field_ack_status_ackHover(ackSubject,
ackTimeString));
+ }
sb.append("</p>");
return sb.toString();
}
diff --git
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
index 7bc3ea4..ae8ccbd 100644
---
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
+++
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
@@ -881,6 +881,7 @@ view_alerts_field_ack_time = Acknowledge Time
view_alerts_field_ack_subject = Acknowledge Subject
view_alerts_field_ack_status = Status
view_alerts_field_ack_status_noAck = No Ack
+view_alerts_field_ack_status_noAckHover = Not yet Acknowledged
view_alerts_field_ack_status_ack = Ack ({0})
view_alerts_field_ack_status_ackHover = Acknowledged by {0} at {1}
view_alerts_field_name = Name
Show replies by date