From 357109c5a5518db5925f49a6700a87e7ed30ca14 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 28 Dec 2011 16:19:29 -0500
Subject: [PATCH] Unit testing. Documentation.
---
src/com/gitblit/utils/TimeUtils.java | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/src/com/gitblit/utils/TimeUtils.java b/src/com/gitblit/utils/TimeUtils.java
index 7ac1e79..6cc4dcb 100644
--- a/src/com/gitblit/utils/TimeUtils.java
+++ b/src/com/gitblit/utils/TimeUtils.java
@@ -145,15 +145,13 @@
* Return the difference in days between now and the date.
*
* @param date
- * @param roundup
* @return days ago
*/
- public static int daysAgo(Date date, boolean roundup) {
- long diff = System.currentTimeMillis() - date.getTime();
+ public static int daysAgo(Date date) {
+ long today = ONEDAY * (System.currentTimeMillis()/ONEDAY);
+ long day = ONEDAY * (date.getTime()/ONEDAY);
+ long diff = today - day;
int days = (int) (diff / ONEDAY);
- if (roundup && (diff % ONEDAY) > 0) {
- days++;
- }
return days;
}
@@ -208,7 +206,7 @@
if (css) {
return "age2";
}
- int days = daysAgo(date, true);
+ int days = daysAgo(date);
if (days < 365) {
if (days <= 30) {
return days + " days ago";
@@ -253,11 +251,9 @@
int mins = 60;
if (!StringUtils.isEmpty(frequency)) {
try {
- String str;
+ String str = frequency.trim();
if (frequency.indexOf(' ') > -1) {
- str = frequency.substring(0, frequency.indexOf(' ')).trim();
- } else {
- str = frequency.trim();
+ str = str.substring(0, str.indexOf(' ')).trim();
}
mins = (int) Float.parseFloat(str);
} catch (NumberFormatException e) {
@@ -268,7 +264,7 @@
}
if (frequency.indexOf("day") > -1) {
// convert to minutes
- mins *= 24 * 60;
+ mins *= 1440;
} else if (frequency.indexOf("hour") > -1) {
// convert to minutes
mins *= 60;
--
Gitblit v1.9.1