From d1231c63669f4bc3643985b9032de7f998612e08 Mon Sep 17 00:00:00 2001 From: Jason Pyeron <jpyeron@pdinc.us> Date: Sun, 19 Aug 2012 21:35:52 -0400 Subject: [PATCH] fixed build to allow builds where a proxy is needed for access to outside resources see: http://ant.apache.org/manual/proxy.html --- src/com/gitblit/client/DateCellRenderer.java | 23 ++++++++++++++++++----- 1 files changed, 18 insertions(+), 5 deletions(-) diff --git a/src/com/gitblit/client/DateCellRenderer.java b/src/com/gitblit/client/DateCellRenderer.java index 053cf52..954dad2 100644 --- a/src/com/gitblit/client/DateCellRenderer.java +++ b/src/com/gitblit/client/DateCellRenderer.java @@ -37,7 +37,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); @@ -49,10 +49,23 @@ super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column); if (value instanceof Date) { Date date = (Date) value; - String timeAgo = TimeUtils.timeAgo(date); - String strDate = new SimpleDateFormat(pattern).format((Date) value); - this.setText(timeAgo); - this.setToolTipText(strDate); + String title; + String dateString; + if (date.getTime() == 0) { + title = "--"; + dateString = "never"; + } else { + title = Translation.getTimeUtils().timeAgo(date); + dateString = new SimpleDateFormat(pattern).format((Date) value); + } + + 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