From 2031efc332258218d68b8a72187f1e79eb61d7da Mon Sep 17 00:00:00 2001 From: peter Date: Tue, 18 Dec 2012 16:57:03 +0100 Subject: [PATCH] IDEA-97350 Perforce integration doesn't account for time zone differences --- platform/util/src/com/intellij/util/text/DateFormatUtil.java | 2 +- .../util/testSrc/com/intellij/util/text/DateFormatUtilTest.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/platform/util/src/com/intellij/util/text/DateFormatUtil.java b/platform/util/src/com/intellij/util/text/DateFormatUtil.java index e4c95722a099..2ee25917f0ce 100644 --- a/platform/util/src/com/intellij/util/text/DateFormatUtil.java +++ b/platform/util/src/com/intellij/util/text/DateFormatUtil.java @@ -198,7 +198,7 @@ public class DateFormatUtil { if (formatTime) { long delta = currentTime - time; - if (delta <= HOUR) { + if (delta <= HOUR && delta >= 0) { return CommonBundle.message("date.format.minutes.ago", (int)Math.rint(delta / (double)MINUTE)); } } diff --git a/platform/util/testSrc/com/intellij/util/text/DateFormatUtilTest.java b/platform/util/testSrc/com/intellij/util/text/DateFormatUtilTest.java index aa40d77c244c..42602b9e1d47 100644 --- a/platform/util/testSrc/com/intellij/util/text/DateFormatUtilTest.java +++ b/platform/util/testSrc/com/intellij/util/text/DateFormatUtilTest.java @@ -66,6 +66,8 @@ public class DateFormatUtilTest extends TestCase { doTestDateTime(DateFormatUtil.formatDateTime(DATE_FORMAT.parse("08.12.2004 15.00.00")), "08.12.2004 15.00.00"); doTestDateTime(DateFormatUtil.formatDateTime(DATE_FORMAT.parse("07.12.2004 15.00.00")), "07.12.2004 15.00.00"); + doTestDateTime("Today " + DateFormatUtil.formatTime(DATE_FORMAT.parse("10.12.2004 19.00.00")), "10.12.2004 19.00.00"); + Clock.setTime(2004, 0, 1, 15, 53); doTestDateTime(DateFormatUtil.formatDateTime(DATE_FORMAT.parse("01.01.2003 15.53.00")), "01.01.2003 15.53.00"); doTestDateTime("Yesterday " + DateFormatUtil.formatTime(DATE_FORMAT.parse("31.12.2003 15.00.00")), "31.12.2003 15.00.00");