Move formatter.formatDuration to utils

Fixes CLIENT-41

Change-Id: I8742650e3f2801470446590a32922bef32995fb8
Depends-On: I8269aab84413d3865975a6ca15dc656a525895ea
Depends-On: I5010c1c77247579e586e20a11a1a9b7b73b81307
Reviewed-on: http://gerrit.dmdirc.com/1929
Reviewed-by: Chris Smith <chris@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

src/com/dmdirc/ui/messages/Formatter.java

@@ -24,6 +24,7 @@ package com.dmdirc.ui.messages;
 
 import com.dmdirc.Precondition;
 import com.dmdirc.config.ConfigManager;
+import com.dmdirc.util.DateUtils;
 
 import java.util.HashMap;
 import java.util.IllegalFormatConversionException;
@@ -141,7 +142,8 @@ public final class Formatter {
                 break;
             case 'u':
                 // Duration hacks
-                res[i] = formatDuration(Integer.valueOf(String.valueOf(args[i].toString())));
+                res[i] = DateUtils.formatDuration(Integer.valueOf(
+                        String.valueOf(args[i].toString())));
                 break;
             default:
                 res[i] = args[i];
@@ -153,55 +155,6 @@ public final class Formatter {
         return res;
     }
 
-    /**
-     * Tests for and adds one component of the duration format.
-     *
-     * @param builder The string builder to append text to
-     * @param current The number of seconds in the duration
-     * @param duration The number of seconds in this component
-     * @param name The name of this component
-     * @return The number of seconds used by this component
-     */
-    private static int doDuration(final StringBuilder builder, final int current,
-            final int duration, final String name) {
-        int res = 0;
-
-        if (current >= duration) {
-            final int units = current / duration;
-            res = units * duration;
-
-            if (builder.length() > 0) {
-                builder.append(", ");
-            }
-
-            builder.append(units);
-            builder.append(' ');
-            builder.append(name + (units != 1 ? 's' : ""));
-        }
-
-        return res;
-    }
-
-    /**
-     * Formats the specified number of seconds as a string containing the
-     * number of days, hours, minutes and seconds.
-     *
-     * @param duration The duration in seconds to be formatted
-     * @return A textual version of the duration
-     */
-    public static String formatDuration(final int duration) {
-        final StringBuilder buff = new StringBuilder();
-
-        int seconds = duration;
-
-        seconds -= doDuration(buff, seconds, 60*60*24, "day");
-        seconds -= doDuration(buff, seconds, 60*60, "hour");
-        seconds -= doDuration(buff, seconds, 60, "minute");
-        seconds -= doDuration(buff, seconds, 1, "second");
-
-        return buff.length() == 0 ? "0 seconds" : buff.toString();
-    }
-
     /**
      * Analyses the specified format string and fills in the format type cache.
      *

test/com/dmdirc/ui/messages/FormatterTest.java

@@ -60,38 +60,4 @@ public class FormatterTest {
     public void testFormatDuration() {
         assertEquals("1 minute, 1 second", Formatter.formatMessage(mcm, "1%1$u", "61"));
     }
-    
-    @Test
-    public void testFormatDurationSeconds() {
-        assertEquals("1 second", Formatter.formatDuration(1));
-        assertEquals("2 seconds", Formatter.formatDuration(2));
-    }
-    
-    @Test
-    public void testFormatDurationMinutes() {
-        assertEquals("1 minute", Formatter.formatDuration(60));
-        assertEquals("1 minute, 1 second", Formatter.formatDuration(61));
-        assertEquals("1 minute, 2 seconds", Formatter.formatDuration(62));
-        assertEquals("2 minutes, 2 seconds", Formatter.formatDuration(122));
-    }
-    
-    @Test
-    public void testFormatDurationHours() {
-        assertEquals("1 hour", Formatter.formatDuration(3600));
-        assertEquals("1 hour, 1 second", Formatter.formatDuration(3601));
-        assertEquals("2 hours, 1 minute, 5 seconds", Formatter.formatDuration(7265));
-    }
-    
-    @Test
-    public void testFormatDurationDays() {
-        assertEquals("1 day", Formatter.formatDuration(86400));
-        assertEquals("1 day, 10 minutes, 1 second", Formatter.formatDuration(87001));
-    }
-
-    @Test
-    public void testFormatNoSeconds() {
-        assertEquals("0 seconds", Formatter.formatDuration(0));
-        assertEquals("0 seconds", Formatter.formatDuration(-100));
-    }
-
-}
+}