From dfc4ece4083bbbb98f55291d05e7d2b1513464b7 Mon Sep 17 00:00:00 2001 From: Thomas Pummer <dev@nullpointer.at> Date: Fri, 22 Feb 2013 11:10:11 -0500 Subject: [PATCH] the display-name in web.xml now shows the actual version of Gitblit --- src/com/gitblit/client/DateCellRenderer.java | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/com/gitblit/client/DateCellRenderer.java b/src/com/gitblit/client/DateCellRenderer.java index 3d0ab15..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. * @@ -37,7 +35,7 @@ private static final long serialVersionUID = 1L; private final String pattern; - + public DateCellRenderer(String pattern, Color foreground) { this.pattern = (pattern == null ? "yyyy-MM-dd HH:mm" : pattern); setForeground(foreground); @@ -55,7 +53,13 @@ title = "--"; dateString = "never"; } else { - title = TimeUtils.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