Use new formatter method.

Change-Id: I26a93d47ae740426ff56e9690302ceebad0fda53
Reviewed-on: http://gerrit.dmdirc.com/3987
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

dcc/src/com/dmdirc/addons/dcc/ui/TransferPanel.java

@@ -33,6 +33,7 @@ import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.callbacks.SocketCloseListener;
+import com.dmdirc.util.DateUtils;
 
 import java.awt.Desktop;
 import java.awt.event.ActionEvent;
@@ -237,34 +238,12 @@ public class TransferPanel extends JPanel implements ActionListener,
                 }
 
                 remaining.setText(String.format("Time Remaining: %s",
-                        duration((int) transferContainer.getRemainingTime())));
+                        DateUtils.formatDurationAsTime((int) transferContainer.getRemainingTime())));
                 taken.setText(String.format("Time Taken: %s", transferContainer
-                        .getStartTime() == 0 ? "N/A" : duration(
-                                transferContainer.getElapsedTime())));
+                        .getStartTime() == 0 ? "N/A" : DateUtils.formatDurationAsTime(
+                        (int) transferContainer.getElapsedTime())));
             }
         });
     }
 
-    /**
-     * Get the duration in seconds as a string.
-     *
-     * @param secondsInput to get duration for
-     *
-     * @return Duration as a string
-     */
-    private String duration(final long secondsInput) {
-        final StringBuilder result = new StringBuilder();
-        final long hours = (secondsInput / 3600);
-        final long minutes = (secondsInput / 60 % 60);
-        final long seconds = (secondsInput % 60);
-
-        if (hours > 0) {
-            result.append(hours);
-            result.append(':');
-        }
-        result.append(String.format("%0,2d:%0,2d", minutes, seconds));
-
-        return result.toString();
-    }
-
 }

mediasource_dbus/src/com/dmdirc/addons/mediasource_dbus/MPRISSource.java

@@ -24,6 +24,7 @@ package com.dmdirc.addons.mediasource_dbus;
 
 import com.dmdirc.addons.nowplaying.MediaSource;
 import com.dmdirc.addons.nowplaying.MediaSourceState;
+import com.dmdirc.util.DateUtils;
 
 import java.util.List;
 import java.util.Map;
@@ -135,7 +136,7 @@ public class MPRISSource implements MediaSource {
     public String getLength() {
         try {
             final Long len = Long.parseLong(getData("mpris:length"));
-            return duration(len / 1000);
+            return DateUtils.formatDurationAsTime((int) (len / 1000));
         } catch (final NumberFormatException nfe) {
             return "Unknown";
         }
@@ -149,7 +150,7 @@ public class MPRISSource implements MediaSource {
             if (len == 0) {
                 return "Unknown";
             } else {
-                return duration(len / 1000);
+                return DateUtils.formatDurationAsTime((int) (len / 1000));
             }
         } catch (final NumberFormatException nfe) {
             return "Unknown";
@@ -190,40 +191,4 @@ public class MPRISSource implements MediaSource {
         return getFirstValue("org.mpris.MediaPlayer2.Player.PlaybackStatus");
     }
 
-    /**
-     * Get the duration in seconds as a string.
-     *
-     * @param secondsInput Input to get duration for
-     *
-     * @return Duration as a string
-     */
-    private String duration(final long secondsInput) {
-        final StringBuilder result = new StringBuilder();
-        final long hours = secondsInput / 3600;
-        final long minutes = secondsInput / 60 % 60;
-        final long seconds = secondsInput % 60;
-
-        if (hours > 0) {
-            if (hours < 10) {
-                result.append('0');
-            }
-
-            result.append(hours).append(':');
-        }
-
-        if (minutes < 10) {
-            result.append('0');
-        }
-
-        result.append(minutes).append(':');
-
-        if (seconds < 10) {
-            result.append('0');
-        }
-
-        result.append(seconds);
-
-        return result.toString();
-    }
-
 }

mediasource_dcop/src/com/dmdirc/addons/mediasource_dcop/KaffeineSource.java

@@ -24,6 +24,7 @@ package com.dmdirc.addons.mediasource_dcop;
 
 import com.dmdirc.addons.nowplaying.MediaSource;
 import com.dmdirc.addons.nowplaying.MediaSourceState;
+import com.dmdirc.util.DateUtils;
 
 import java.util.List;
 
@@ -81,14 +82,14 @@ public class KaffeineSource implements MediaSource {
 
     @Override
     public String getLength() {
-        return duration(Integer.parseInt(myPlugin.getDcopResult(
-                "dcop kaffeine KaffeineIface getLength").get(0)));
+        return DateUtils.formatDurationAsTime(Integer.parseInt(
+                myPlugin.getDcopResult("dcop kaffeine KaffeineIface getLength").get(0)));
     }
 
     @Override
     public String getTime() {
-        return duration(Integer.parseInt(myPlugin.getDcopResult(
-                "dcop kaffeine KaffeineIface getTimePos").get(0)));
+        return DateUtils.formatDurationAsTime(Integer.parseInt(
+                myPlugin.getDcopResult("dcop kaffeine KaffeineIface getTimePos").get(0)));
     }
 
     @Override
@@ -101,40 +102,4 @@ public class KaffeineSource implements MediaSource {
         return null;
     }
 
-    /**
-     * Get the duration in seconds as a string.
-     *
-     * @param secondsInput to get duration for
-     *
-     * @return Duration as a string
-     */
-    private String duration(final long secondsInput) {
-        final StringBuilder result = new StringBuilder();
-        final long hours = secondsInput / 3600;
-        final long minutes = secondsInput / 60 % 60;
-        final long seconds = secondsInput % 60;
-
-        if (hours > 0) {
-            if (hours < 10) {
-                result.append('0');
-            }
-
-            result.append(hours).append(':');
-        }
-
-        if (minutes < 10) {
-            result.append('0');
-        }
-
-        result.append(minutes).append(':');
-
-        if (seconds < 10) {
-            result.append('0');
-        }
-
-        result.append(seconds);
-
-        return result.toString();
-    }
-
 }

mediasource_dcop/src/com/dmdirc/addons/mediasource_dcop/NoatunSource.java

@@ -24,6 +24,7 @@ package com.dmdirc.addons.mediasource_dcop;
 
 import com.dmdirc.addons.nowplaying.MediaSource;
 import com.dmdirc.addons.nowplaying.MediaSourceState;
+import com.dmdirc.util.DateUtils;
 
 import java.util.List;
 
@@ -104,8 +105,9 @@ public class NoatunSource implements MediaSource {
 
     @Override
     public String getTime() {
-        return duration(Integer.parseInt(myPlugin.getDcopResult(
-                "dcop noatun Noatun position").get(0)) / 1000);
+        return DateUtils.formatDurationAsTime(
+                Integer.parseInt(myPlugin.getDcopResult("dcop noatun Noatun position").get(0)) /
+                        1000);
     }
 
     @Override
@@ -118,27 +120,4 @@ public class NoatunSource implements MediaSource {
         return null;
     }
 
-    /**
-     * Get the duration in seconds as a string.
-     *
-     * @param secondsInput to get duration for
-     *
-     * @return Duration as a string
-     */
-    private String duration(final long secondsInput) {
-        final StringBuilder result = new StringBuilder();
-        final long hours = secondsInput / 3600;
-        final long minutes = secondsInput / 60 % 60;
-        final long seconds = secondsInput % 60;
-
-        if (hours > 0) {
-            result.append(hours).append(':');
-        }
-
-        result.append(minutes).append(':');
-        result.append(seconds).append(':');
-
-        return result.toString();
-    }
-
 }

mediasource_windows/src/com/dmdirc/addons/mediasource_windows/DllSource.java

@@ -24,6 +24,7 @@ package com.dmdirc.addons.mediasource_windows;
 
 import com.dmdirc.addons.nowplaying.MediaSource;
 import com.dmdirc.addons.nowplaying.MediaSourceState;
+import com.dmdirc.util.DateUtils;
 
 /**
  * Uses WindowsMediaSourcePlugin to retrieve now playing info.
@@ -84,11 +85,11 @@ public class DllSource implements MediaSource {
 
         if (result.getExitCode() == 0) {
             final String output = result.getGoodOutput();
-            if (output.equalsIgnoreCase("stopped")) {
+            if ("stopped".equalsIgnoreCase(output)) {
                 return MediaSourceState.STOPPED;
-            } else if (output.equalsIgnoreCase("playing")) {
+            } else if ("playing".equalsIgnoreCase(output)) {
                 return MediaSourceState.PLAYING;
-            } else if (output.equalsIgnoreCase("paused")) {
+            } else if ("paused".equalsIgnoreCase(output)) {
                 return MediaSourceState.PAUSED;
             } else {
                 return MediaSourceState.NOTKNOWN;
@@ -111,7 +112,7 @@ public class DllSource implements MediaSource {
     public String getTitle() {
         if (useArtistTitle) {
             final String[] bits = getOutput("getArtistTitle").split("\\s-\\s", 2);
-            return (bits.length > 1) ? bits[1] : "";
+            return bits.length > 1 ? bits[1] : "";
         } else {
             return getOutput("getTitle");
         }
@@ -122,32 +123,11 @@ public class DllSource implements MediaSource {
         return getOutput("getAlbum");
     }
 
-    /**
-     * Get the duration in seconds as a string.
-     *
-     * @param secondsInput to get duration for
-     *
-     * @return Duration as a string
-     */
-    private String duration(final long secondsInput) {
-        final StringBuilder result = new StringBuilder();
-        final long hours = (secondsInput / 3600);
-        final long minutes = (secondsInput / 60 % 60);
-        final long seconds = (secondsInput % 60);
-
-        if (hours > 0) {
-            result.append(hours).append(':');
-        }
-        result.append(String.format("%0,2d:%0,2d", minutes, seconds));
-
-        return result.toString();
-    }
-
     @Override
     public String getLength() {
         try {
             final int seconds = Integer.parseInt(getOutput("getLength"));
-            return duration(seconds);
+            return DateUtils.formatDurationAsTime(seconds);
         } catch (NumberFormatException nfe) {
         }
         return "Unknown";
@@ -157,7 +137,7 @@ public class DllSource implements MediaSource {
     public String getTime() {
         try {
             final int seconds = Integer.parseInt(getOutput("getTime"));
-            return duration(seconds);
+            return DateUtils.formatDurationAsTime(seconds);
         } catch (NumberFormatException nfe) {
         }
         return "Unknown";