From 75705a3b40a3f42bda57de62b29c6f853d94dfb8 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 28 Nov 2012 17:07:52 -0500
Subject: [PATCH] Short commit ids in log and history take two (issue 168)
---
src/com/gitblit/client/DateCellRenderer.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/com/gitblit/client/DateCellRenderer.java b/src/com/gitblit/client/DateCellRenderer.java
index 954dad2..751c7db 100644
--- a/src/com/gitblit/client/DateCellRenderer.java
+++ b/src/com/gitblit/client/DateCellRenderer.java
@@ -24,8 +24,6 @@
import javax.swing.SwingConstants;
import javax.swing.table.DefaultTableCellRenderer;
-import com.gitblit.utils.TimeUtils;
-
/**
* Time ago cell renderer with real date tooltip.
*
@@ -55,7 +53,13 @@
title = "--";
dateString = "never";
} else {
- title = Translation.getTimeUtils().timeAgo(date);
+ if (date.getTime() - System.currentTimeMillis() > 0) {
+ // future
+ title = Translation.getTimeUtils().inFuture(date);
+ } else {
+ // past
+ title = Translation.getTimeUtils().timeAgo(date);
+ }
dateString = new SimpleDateFormat(pattern).format((Date) value);
}
--
Gitblit v1.9.1