[Amdatu-commits] SVN r748 - trunk/amdatu-core/loghandler/src/main/java/org/amdatu/core/loghandler/service

[subvers...@amdatu.org]

Author: ivol37 at gmail.com
Date: Wed Feb  2 17:12:40 2011
New Revision: 748

Log:
[AMDATU-279] Fixed appending '0' when hour, minute or second < 10

Modified:
   
trunk/amdatu-core/loghandler/src/main/java/org/amdatu/core/loghandler/service/ConsoleLogHandler.java

Modified: 
trunk/amdatu-core/loghandler/src/main/java/org/amdatu/core/loghandler/service/ConsoleLogHandler.java
==============================================================================
--- 
trunk/amdatu-core/loghandler/src/main/java/org/amdatu/core/loghandler/service/ConsoleLogHandler.java
        (original)
+++ 
trunk/amdatu-core/loghandler/src/main/java/org/amdatu/core/loghandler/service/ConsoleLogHandler.java
        Wed Feb  2 17:12:40 2011
@@ -71,23 +71,23 @@
 
     private String getTimestamp() {
        Calendar cal = Calendar.getInstance();
-       String timestamp = new Integer(cal.get(Calendar.YEAR)).toString();
-       String month = new Integer(cal.get(Calendar.MONTH)+ 1).toString();
-       if (month.length() < 2) {
-               month = "0" + month;
-       }
-       timestamp += "-" + month;
-       String day = new Integer(cal.get(Calendar.DAY_OF_MONTH)).toString();
-       if (day.length() < 2) {
-               day = "0" + day;
-       }
-       timestamp += "-" + day;
-       timestamp += " " + new 
Integer(cal.get(Calendar.HOUR_OF_DAY)).toString();
-       timestamp += ":" + new Integer(cal.get(Calendar.MINUTE)).toString();
-       timestamp += ":" + new Integer(cal.get(Calendar.SECOND)).toString();
+       String timestamp = new Integer(cal.get(Calendar.YEAR)).toString(); // 
year
+       timestamp += "-" + toTwoDigits(cal.get(Calendar.MONTH)+ 1); // month
+       timestamp += "-" + toTwoDigits(cal.get(Calendar.DAY_OF_MONTH)); //day
+       timestamp += " " + toTwoDigits(cal.get(Calendar.HOUR_OF_DAY)); // hour
+       timestamp += ":" + toTwoDigits(cal.get(Calendar.MINUTE)); // minutes
+       timestamp += ":" + toTwoDigits(cal.get(Calendar.SECOND)); //seconds
        return timestamp;
     }
 
+    private String toTwoDigits(int dt) {
+       if (dt < 10) {
+               return "0" + new Integer(dt).toString();
+       } else {
+                return new Integer(dt).toString();
+       }
+    }
+
     public void updated(Dictionary properties) throws ConfigurationException {
         m_minLogLevel = getLogLevelFromProperties(properties);
     }