modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/TimestampCellFormatter.java | 7 +++++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ResourceErrorsView.java | 6 ++++-- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/discovery/ResourceAutodiscoveryView.java | 2 ++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenterView.java | 5 ++++- 4 files changed, 17 insertions(+), 3 deletions(-)
New commits: commit 4871543e3fd99c94efcb5b27f9039e25642244c3 Author: John Mazzitelli mazz@redhat.com Date: Wed Mar 30 14:17:01 2011 -0400
quick fix to ctime field
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ResourceErrorsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ResourceErrorsView.java index 1c75bcc..3980125 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ResourceErrorsView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ResourceErrorsView.java @@ -22,7 +22,6 @@ import com.google.gwt.user.client.rpc.AsyncCallback; import com.smartgwt.client.data.Criteria; import com.smartgwt.client.types.Alignment; import com.smartgwt.client.types.AutoFitWidthApproach; -import com.smartgwt.client.types.DateDisplayFormat; import com.smartgwt.client.types.ListGridFieldType; import com.smartgwt.client.types.Overflow; import com.smartgwt.client.types.SelectionStyle; @@ -42,6 +41,7 @@ import org.rhq.enterprise.gui.coregui.client.CoreGUI; 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.TimestampCellFormatter; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.summary.ResourceErrorsDataSource.Field; import org.rhq.enterprise.gui.coregui.client.util.message.Message; @@ -75,9 +75,11 @@ public class ResourceErrorsView extends Table<ResourceErrorsDataSource> { ListGridField timeField = new ListGridField(Field.TIME_OCCURED, MSG .dataSource_resourceErrors_field_timeOccured()); timeField.setType(ListGridFieldType.DATE); - timeField.setDateFormatter(DateDisplayFormat.TOLOCALESTRING); + timeField.setCellFormatter(new TimestampCellFormatter()); timeField.setAlign(Alignment.CENTER); timeField.setWidth("20%"); + timeField.setShowHover(true); + timeField.setHoverCustomizer(TimestampCellFormatter.getHoverCustomizer(Field.TIME_OCCURED));
ListGridField summaryField = new ListGridField(Field.SUMMARY, MSG.dataSource_resourceErrors_field_summary()); summaryField.setAlign(Alignment.CENTER); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/discovery/ResourceAutodiscoveryView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/discovery/ResourceAutodiscoveryView.java index c2b3748..6955700 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/discovery/ResourceAutodiscoveryView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/discovery/ResourceAutodiscoveryView.java @@ -50,6 +50,7 @@ import com.smartgwt.client.widgets.tree.TreeNode;
import org.rhq.core.domain.resource.InventoryStatus; import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter; 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.TableUtility; @@ -130,6 +131,7 @@ public class ResourceAutodiscoveryView extends LocatableVLayout { description = new TreeGridField("description"); status = new TreeGridField("statusLabel"); ctime = new TreeGridField("ctime"); + TimestampCellFormatter.prepareDateField(ctime, "ctime");
if (!simple) { treeGrid.setFields(name, key, type, description, status, ctime);
commit e7ec5cfe2a6da8ea2a0487e256e284cb9d03b8a8 Author: John Mazzitelli mazz@redhat.com Date: Wed Mar 30 14:13:20 2011 -0400
add a convienence method that prepares a list grid field as a data field, complete wiht a hover and a standard time format
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/TimestampCellFormatter.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/TimestampCellFormatter.java index d8a86c7..3cf8695 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/TimestampCellFormatter.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/TimestampCellFormatter.java @@ -5,6 +5,7 @@ import java.util.Date; import com.google.gwt.i18n.client.DateTimeFormat; import com.smartgwt.client.widgets.grid.CellFormatter; import com.smartgwt.client.widgets.grid.HoverCustomizer; +import com.smartgwt.client.widgets.grid.ListGridField; import com.smartgwt.client.widgets.grid.ListGridRecord;
/** @@ -79,6 +80,12 @@ public class TimestampCellFormatter implements CellFormatter { return (null == dateTimeFormat) ? DATE_TIME_FORMAT_MEDIUM.format(date) : dateTimeFormat.format(date); }
+ public static void prepareDateField(final ListGridField field, final String dateTimeAttributeName) { + field.setCellFormatter(new TimestampCellFormatter()); + field.setShowHover(true); + field.setHoverCustomizer(getHoverCustomizer(dateTimeAttributeName)); + } + public static HoverCustomizer getHoverCustomizer(final String dateTimeAttributeName) { return new HoverCustomizer() {
commit 874fd083a82b0b42a39f3d1b001fed2c55312ace Author: John Mazzitelli mazz@redhat.com Date: Wed Mar 30 13:50:45 2011 -0400
fix message center time
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenterView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenterView.java index b5907fd..f692f44 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenterView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenterView.java @@ -49,6 +49,7 @@ import org.rhq.enterprise.gui.coregui.client.CoreGUI; 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.TimestampCellFormatter; import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableWindow; @@ -182,6 +183,8 @@ public class MessageCenterView extends Table implements MessageCenter.MessageLis timeField.setType(ListGridFieldType.TIME); timeField.setAttribute("displayFormat", TimeFormatter.TOPADDEDTIME); timeField.setAlign(Alignment.LEFT); + timeField.setShowHover(true); + timeField.setHoverCustomizer(TimestampCellFormatter.getHoverCustomizer(FIELD_TIME));
ListGridField messageField = new ListGridField(FIELD_CONCISEMESSAGE, MSG.common_title_message());
@@ -339,7 +342,7 @@ public class MessageCenterView extends Table implements MessageCenter.MessageLis severity.setValue(message.severity.name());
StaticTextItem date = new StaticTextItem("time", MSG.view_messageCenter_messageTime()); - date.setValue(message.fired); + date.setValue(TimestampCellFormatter.format(message.fired, TimestampCellFormatter.DATE_TIME_FORMAT_FULL));
StaticTextItem detail = new StaticTextItem("detail", MSG.view_messageCenter_messageDetail()); detail.setTitleVAlign(VerticalAlignment.TOP);