From b94965e87929c6b4e42f9a2078dc0d910cc2637d Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 09 May 2012 07:59:00 -0400
Subject: [PATCH] Merge pull request #17 from peterloron/master
---
src/com/gitblit/client/DateCellRenderer.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/src/com/gitblit/client/DateCellRenderer.java b/src/com/gitblit/client/DateCellRenderer.java
index f30b05f..3d0ab15 100644
--- a/src/com/gitblit/client/DateCellRenderer.java
+++ b/src/com/gitblit/client/DateCellRenderer.java
@@ -49,18 +49,23 @@
super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
if (value instanceof Date) {
Date date = (Date) value;
- String timeAgo;
- String strDate;
+ String title;
+ String dateString;
if (date.getTime() == 0) {
- timeAgo = "--";
- strDate = "never";
+ title = "--";
+ dateString = "never";
} else {
- timeAgo = TimeUtils.timeAgo(date);
- strDate = new SimpleDateFormat(pattern).format((Date) value);
+ title = TimeUtils.timeAgo(date);
+ dateString = new SimpleDateFormat(pattern).format((Date) value);
}
- this.setText(timeAgo);
- this.setToolTipText(strDate);
+ if ((System.currentTimeMillis() - date.getTime()) > 10 * 24 * 60 * 60 * 1000L) {
+ String tmp = dateString;
+ dateString = title;
+ title = tmp;
+ }
+ this.setText(title);
+ this.setToolTipText(dateString);
}
return this;
}
--
Gitblit v1.9.1