Fixed time formatting.

Submitted by: ruchet@besancon.sema.slb.com (stephane ruchet)
PR: 5901


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271016 13f79535-47bb-0310-9956-ffa450edef68

src/main/org/apache/tools/ant/DefaultLogger.java

@@ -223,11 +223,11 @@ public class DefaultLogger implements BuildLogger {
             return Long.toString(minutes) + " minute"
                 + (minutes == 1 ? " " : "s ")
                 + Long.toString(seconds%60) + " second"
-                + (seconds%60 == 1 ? "" : "s");
+                + (seconds%60 > 1 ? "s" : "");
         }
         else {
             return Long.toString(seconds) + " second"
-                + (seconds%60 == 1 ? "" : "s");
+                + (seconds%60 > 1 ? "s" : "");
         }
 
     }

src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java

@@ -549,16 +549,15 @@ public class VAJAntToolGUI extends Frame {
     public static String formatTime(long millis) {
         long seconds = millis / 1000;
         long minutes = seconds / 60;
-
         if (minutes > 0) {
             return Long.toString(minutes) + " minute"
                 + (minutes == 1 ? " " : "s ")
                 + Long.toString(seconds%60) + " second"
-                + (seconds%60 == 1 ? "" : "s");
+                + (seconds%60 > 1 ? "s" : "");
         }
         else {
             return Long.toString(seconds) + " second"
-                + (seconds%60 == 1 ? "" : "s");
+                + (seconds%60 > 1 ? "s" : "");
         }
     }
     /**