From 764d944c3fc2b36640d0fa09ba0c0a575f7d43cc Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 07 Jun 2012 17:31:47 -0400
Subject: [PATCH] Build gitblit jar file instead of exploded classes for Express build
---
src/com/gitblit/utils/TimeUtils.java | 40 ++++++++++++++++++++--------------------
1 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/src/com/gitblit/utils/TimeUtils.java b/src/com/gitblit/utils/TimeUtils.java
index 056735c..662025b 100644
--- a/src/com/gitblit/utils/TimeUtils.java
+++ b/src/com/gitblit/utils/TimeUtils.java
@@ -15,10 +15,9 @@
*/
package com.gitblit.utils;
+import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
-
-import com.gitblit.models.FederationModel;
/**
* Utility class of time functions.
@@ -55,9 +54,10 @@
*/
public static boolean isYesterday(Date date) {
Calendar cal = Calendar.getInstance();
- cal.setTime(date);
- cal.add(Calendar.DATE, 1);
- return (System.currentTimeMillis() - cal.getTimeInMillis()) < ONEDAY;
+ cal.setTime(new Date());
+ cal.add(Calendar.DATE, -1);
+ SimpleDateFormat df = new SimpleDateFormat("yyyyMMdd");
+ return df.format(cal.getTime()).equals(df.format(date));
}
/**
@@ -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;
}
@@ -205,10 +203,16 @@
}
return mins + " min" + (mins > 1 ? "s" : "") + " ago";
} else {
+ int days = daysAgo(date);
if (css) {
- return "age2";
+ if (days <= 7) {
+ return "age2";
+ } if (days <= 30) {
+ return "age3";
+ } else {
+ return "age4";
+ }
}
- int days = daysAgo(date, true);
if (days < 365) {
if (days <= 30) {
return days + " days ago";
@@ -253,11 +257,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,12 +270,10 @@
}
if (frequency.indexOf("day") > -1) {
// convert to minutes
- mins *= 24 * 60;
+ mins *= 1440;
} else if (frequency.indexOf("hour") > -1) {
// convert to minutes
mins *= 60;
- } else if (frequency.indexOf("min") > -1) {
- // default mins
}
return mins;
}
--
Gitblit v1.9.1