Fixed build script. Fixed date display on activity page headers.

James Moger

2011-11-20 712210f4c56cc9b74455c9b994f9102a178288c9

Fixed build script. Fixed date display on activity page headers.

 build.xml

@@ -440,7 +440,7 @@
    <target name="buildManager" depends="compile" description="Builds the stand-alone Gitblit Manager">

        <echo>Building Gitblit Manager ${gb.version}</echo>

    

        <genjar jarfile="maanager-${gb.version}.jar">

        <genjar jarfile="manager-${gb.version}.jar">

            <resource file="${basedir}/src/com/gitblit/client/splash.png" />

            <resource file="${basedir}/resources/gitblt-favicon.png" />

            <resource file="${basedir}/resources/gitweb-favicon.png" />


 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";


 src/com/gitblit/wicket/WicketUtils.java

@@ -453,7 +453,11 @@
            dateString = df.format(date);

        }

        String title = null;

        if (date.getTime() <= System.currentTimeMillis()) {

        if (TimeUtils.isToday(date)) {

            title = "today";

        } else if (TimeUtils.isYesterday(date)) {

                title = "yesterday";

        } else if (date.getTime() <= System.currentTimeMillis()) {

            // past

            title = TimeUtils.timeAgo(date);

        }


 tests/com/gitblit/tests/TimeUtilsTest.java

@@ -28,14 +28,13 @@
    }



    public void testBasicTimeFunctions() throws Exception {

        assertTrue(TimeUtils.minutesAgo(offset(2 * TimeUtils.MIN), false) == 2);

        assertTrue(TimeUtils.minutesAgo(offset((2 * TimeUtils.MIN) + (35 * 1000L)), true) == 3);

        assertEquals(2, TimeUtils.minutesAgo(offset(2 * TimeUtils.MIN), false));

        assertEquals(3, TimeUtils.minutesAgo(offset((2 * TimeUtils.MIN) + (35 * 1000L)), true));



        assertTrue(TimeUtils.hoursAgo(offset(2 * TimeUtils.ONEHOUR), false) == 2);

        assertTrue(TimeUtils.hoursAgo(offset(5 * TimeUtils.HALFHOUR), true) == 3);

        assertEquals(2, TimeUtils.hoursAgo(offset(2 * TimeUtils.ONEHOUR), false));

        assertEquals(3, TimeUtils.hoursAgo(offset(5 * TimeUtils.HALFHOUR), true));



        assertTrue(TimeUtils.daysAgo(offset(4 * TimeUtils.ONEDAY), false) == 4);

        assertTrue(TimeUtils.daysAgo(offset(4 * TimeUtils.ONEDAY + 12 * TimeUtils.ONEHOUR), true) == 5);

        assertEquals(4, TimeUtils.daysAgo(offset(4 * TimeUtils.ONEDAY)));

    }



    public void testToday() throws Exception {