diff options
| author | James Moger <james.moger@gitblit.com> | 2012-11-23 12:01:47 -0500 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2012-11-23 12:01:47 -0500 |
| commit | 4ad1ebce249519369d24b4ea7da1da62a685627a (patch) | |
| tree | 765afbc2bf5cb374bb731ad6169b591119c2def9 /src/com/gitblit/client/DateCellRenderer.java | |
| parent | 0040210c8290bf60b8b08437d18b6cc05e863f32 (diff) | |
| download | gitblit-4ad1ebce249519369d24b4ea7da1da62a685627a.tar.gz gitblit-4ad1ebce249519369d24b4ea7da1da62a685627a.zip | |
Mostly functional Gitblit Certificate Authority tool
Diffstat (limited to 'src/com/gitblit/client/DateCellRenderer.java')
| -rw-r--r-- | 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 954dad2a..751c7dbb 100644 --- a/src/com/gitblit/client/DateCellRenderer.java +++ b/src/com/gitblit/client/DateCellRenderer.java @@ -24,8 +24,6 @@ import javax.swing.JTable; 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 @@ public class DateCellRenderer extends DefaultTableCellRenderer { 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);
}
|