Work in progress: adding timestamp into message

zanata · Jun 6, 2012 · a5f7855 · a5f7855
1 parent 7699cdc
commit a5f7855
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/NotificationPresenter.java b/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/NotificationPresenter.java
@@ -20,6 +20,8 @@
  */
 package org.zanata.webtrans.client.presenter;
 
+import java.util.Date;
+
 import net.customware.gwt.presenter.client.EventBus;
 import net.customware.gwt.presenter.client.widget.WidgetDisplay;
 import net.customware.gwt.presenter.client.widget.WidgetPresenter;
@@ -32,6 +34,8 @@
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.ClickHandler;
 import com.google.gwt.event.dom.client.HasClickHandlers;
+import com.google.gwt.i18n.client.DateTimeFormat;
+import com.google.gwt.i18n.client.DateTimeFormat.PredefinedFormat;
 import com.google.gwt.user.client.Timer;
 import com.google.inject.Inject;
 
@@ -63,7 +67,7 @@ public interface Display extends WidgetDisplay
 
       void hide(boolean autoClosed);
 
-      void appendMessage(Severity severity, String message);
+      void appendMessage(Severity severity, String message, String time);
 
       void setMessagesToKeep(int count);
 
@@ -127,7 +131,7 @@ public void onClick(ClickEvent event)
          @Override
          public void onNotification(NotificationEvent event)
          {
-            appendNotification(event.getSeverity(), event.getMessage());
+            appendNotification(event.getSeverity(), event.getMessage(), DateTimeFormat.getFormat(PredefinedFormat.DATE_TIME_SHORT).format(new Date()));
             Log.info("Notification:" + event.getMessage());
             listener.setErrorNotificationLabel(display.getMessageCount());
          }
@@ -152,9 +156,9 @@ public void showNotificationWithNoTimer()
       display.show();
    }
 
-   private void appendNotification(Severity severity, String msg)
+   private void appendNotification(Severity severity, String msg, String time)
    {
-      display.appendMessage(severity, msg);
+      display.appendMessage(severity, msg, time);
       if (severity == Severity.Error)
       {
          showNotificationWithNoTimer();

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.java b/zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.java
@@ -31,6 +31,7 @@
 import com.google.gwt.uibinder.client.UiField;
 import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.ui.Anchor;
+import com.google.gwt.user.client.ui.HasHorizontalAlignment;
 import com.google.gwt.user.client.ui.HasVerticalAlignment;
 import com.google.gwt.user.client.ui.HorizontalPanel;
 import com.google.gwt.user.client.ui.Image;
@@ -123,7 +124,7 @@ public int getWidth()
    }
 
    @Override
-   public void appendMessage(Severity severity, String msg)
+   public void appendMessage(Severity severity, String msg, String time)
    {
       HorizontalPanel panel = new HorizontalPanel();
       Image severityImg;
@@ -141,13 +142,20 @@ else if (severity == Severity.Warning)
          severityImg = new Image(resources.infoMsg());
       }
       severityImg.addStyleName(style.image());
+
+      Label timeLabel = new Label("[" + time + "]");
       Label msgLabel = new Label(msg);
 
       panel.add(severityImg);
+      panel.add(timeLabel);
       panel.add(msgLabel);
       panel.setCellWidth(severityImg, "20px");
+      panel.setCellWidth(timeLabel, "115px");
+
       panel.setCellVerticalAlignment(severityImg, HasVerticalAlignment.ALIGN_MIDDLE);
+      panel.setCellVerticalAlignment(timeLabel, HasVerticalAlignment.ALIGN_MIDDLE);
       panel.setCellVerticalAlignment(msgLabel, HasVerticalAlignment.ALIGN_MIDDLE);
+      panel.setCellHorizontalAlignment(msgLabel, HasHorizontalAlignment.ALIGN_LEFT);
 
       messagePanel.insert(panel, 0);
       messagePanel.getWidget(0).setStyleName(style.messageRow());

diff --git a/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/NotificationPresenterTest.java b/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/NotificationPresenterTest.java
@@ -82,7 +82,7 @@ public void testErrorNotificationShows()
    {
       String testMessage = "error testing";
 
-      mockDisplay.appendMessage(Severity.Error, testMessage);
+      mockDisplay.appendMessage(Severity.Error, testMessage, "");
       expectLastCall().once();
 
       mockDisplay.setPopupTopRightCorner();
@@ -105,7 +105,7 @@ public void testErrorMessageCount()
 
       for (String msg : testMessages)
       {
-         mockDisplay.appendMessage(Severity.Error, msg);
+         mockDisplay.appendMessage(Severity.Error, msg, "");
          expectLastCall().once();
       }
 
@@ -134,7 +134,7 @@ public void testErrorMessageCountExceedMax()
 
       for (String msg : testMessages)
       {
-         mockDisplay.appendMessage(Severity.Error, msg);
+         mockDisplay.appendMessage(Severity.Error, msg, "");
          expectLastCall().once();
       }