From a0ee79a781603e98adce0fd1b717481ebdb08986 Mon Sep 17 00:00:00 2001
From: Anton Makeev <Anton.Makeev@jetbrains.com>
Date: Fri, 2 Jul 2010 19:00:27 +0400
Subject: [PATCH] LH: date formatting

---
 .../src/com/intellij/history/integration/FormatUtil.java | 9 +++++++--
 .../integration/ui/models/FileDifferenceModel.java       | 2 +-
 .../history/integration/ui/views/RecentChangesPopup.java | 2 +-
 .../history/integration/ui/views/RevisionsList.java      | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/platform/lvcs-impl/src/com/intellij/history/integration/FormatUtil.java b/platform/lvcs-impl/src/com/intellij/history/integration/FormatUtil.java
index 38194b0d5e48..57a93026c042 100644
--- a/platform/lvcs-impl/src/com/intellij/history/integration/FormatUtil.java
+++ b/platform/lvcs-impl/src/com/intellij/history/integration/FormatUtil.java
@@ -16,6 +16,8 @@
 
 package com.intellij.history.integration;
 
+import com.intellij.openapi.util.text.StringUtil;
+
 import java.text.DateFormat;
 import java.util.Date;
 
@@ -23,7 +25,10 @@ public class FormatUtil {
   public static final DateFormat FORMAT = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT);
 
   public static String formatTimestamp(long t) {
-    DateFormat f = FORMAT;
-    return f.format(new Date(t));
+    return FORMAT.format(new Date(t));
+  }
+
+  public static String formatRelativeTimestamp(long t) {
+    return StringUtil.formatDate(t, FORMAT);
   }
 }
diff --git a/platform/lvcs-impl/src/com/intellij/history/integration/ui/models/FileDifferenceModel.java b/platform/lvcs-impl/src/com/intellij/history/integration/ui/models/FileDifferenceModel.java
index 5b2e04913a55..30587ea347f0 100644
--- a/platform/lvcs-impl/src/com/intellij/history/integration/ui/models/FileDifferenceModel.java
+++ b/platform/lvcs-impl/src/com/intellij/history/integration/ui/models/FileDifferenceModel.java
@@ -58,7 +58,7 @@ public abstract class FileDifferenceModel {
   }
 
   private String formatTitle(Entry e, boolean isAvailable) {
-    String result = FormatUtil.formatTimestamp(e.getTimestamp()) + " - " + e.getName();
+    String result = FormatUtil.formatRelativeTimestamp(e.getTimestamp()) + " - " + e.getName();
     if (!isAvailable) {
       result += " - " + LocalHistoryBundle.message("content.not.available");
     }
diff --git a/platform/lvcs-impl/src/com/intellij/history/integration/ui/views/RecentChangesPopup.java b/platform/lvcs-impl/src/com/intellij/history/integration/ui/views/RecentChangesPopup.java
index fecb79954f33..865e611c6727 100644
--- a/platform/lvcs-impl/src/com/intellij/history/integration/ui/views/RecentChangesPopup.java
+++ b/platform/lvcs-impl/src/com/intellij/history/integration/ui/views/RecentChangesPopup.java
@@ -108,7 +108,7 @@ public class RecentChangesPopup {
     public Component getListCellRendererComponent(JList l, Object val, int i, boolean isSelected, boolean cellHasFocus) {
       RecentChange c = (RecentChange)val;
       myActionLabel.setText(c.getChangeName());
-      myDateLabel.setText(FormatUtil.formatTimestamp(c.getTimestamp()));
+      myDateLabel.setText(FormatUtil.formatRelativeTimestamp(c.getTimestamp()));
 
       updateColors(isSelected);
       return myPanel;
diff --git a/platform/lvcs-impl/src/com/intellij/history/integration/ui/views/RevisionsList.java b/platform/lvcs-impl/src/com/intellij/history/integration/ui/views/RevisionsList.java
index e1942a8c28cd..8ca329b1d3d2 100644
--- a/platform/lvcs-impl/src/com/intellij/history/integration/ui/views/RevisionsList.java
+++ b/platform/lvcs-impl/src/com/intellij/history/integration/ui/views/RevisionsList.java
@@ -309,7 +309,7 @@ public class RevisionsList {
 
       myBorder.set(row == table.getModel().getRowCount() - 1);
 
-      myDateLabel.setText(ensureString(StringUtil.formatDate(r.revision.getTimestamp(), FormatUtil.FORMAT)));
+      myDateLabel.setText(ensureString(FormatUtil.formatRelativeTimestamp(r.revision.getTimestamp())));
       myFilesCountLabel.setText(ensureString(labelsAndColor.filesCount));
 
       myTitleLabel.setFont(myTitleLabel.getFont().deriveFont(labelsAndColor.isNamed ? Font.BOLD : Font.PLAIN));