[Sblim-commit] jsr48-client/src/org/sblim/cimclient/internal/logging TimeStamp.java, 1.6, 1.7

[Dave B. <bla...@us...>]

Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/logging
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv29496/src/org/sblim/cimclient/internal/logging

Modified Files:
	TimeStamp.java 
Log Message:
3062747 - SblimCIMClient does not log all CIM-XML responces.

Index: TimeStamp.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/logging/TimeStamp.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- TimeStamp.java	10 Mar 2009 17:05:33 -0000	1.6
+++ TimeStamp.java	9 Nov 2010 22:42:20 -0000	1.7
@@ -1,5 +1,5 @@
 /**
- * (C) Copyright IBM Corp. 2006, 2009
+ * (C) Copyright IBM Corp. 2006, 2010
  *
  * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE 
  * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE 
@@ -16,6 +16,7 @@
  * 1745282    2007-06-29  ebak         Uniform time stamps for log files
  * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
  * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ * 3062747    2010-09-21  blaschke-oss SblimCIMClient does not log all CIM-XML responces.
  */
 
 package org.sblim.cimclient.internal.logging;
@@ -44,6 +45,36 @@
 	}
 
 	/**
+	 * formatWorker
+	 * 
+	 * @param pMillis
+	 *            - total milliseconds
+	 * @param pIncludeMillis
+	 *            - include milliseconds in String
+	 * @return formatted date/time String. ( YYYY.MM.DD HH:mm:SS[.sss] )
+	 */
+	private static String formatWorker(long pMillis, boolean pIncludeMillis) {
+		Calendar cal = Calendar.getInstance();
+		cal.setTimeInMillis(pMillis);
+		StringBuilder sb = new StringBuilder(Integer.toString(cal.get(Calendar.YEAR)));
+		sb.append('.');
+		sb.append(pad(2, cal.get(Calendar.MONTH) + 1));
+		sb.append('.');
+		sb.append(pad(2, cal.get(Calendar.DAY_OF_MONTH)));
+		sb.append(' ');
+		sb.append(pad(2, cal.get(Calendar.HOUR_OF_DAY)));
+		sb.append(':');
+		sb.append(pad(2, cal.get(Calendar.MINUTE)));
+		sb.append(':');
+		sb.append(pad(2, cal.get(Calendar.SECOND)));
+		if (pIncludeMillis) {
+			sb.append('.');
+			sb.append(pad(3, cal.get(Calendar.MILLISECOND)));
+		}
+		return sb.toString();
+	}
+
+	/**
 	 * format
 	 * 
 	 * @param pMillis
@@ -51,12 +82,17 @@
 	 * @return formatted date/time String. ( YYYY.MM.DD HH:mm:SS )
 	 */
 	public static String format(long pMillis) {
-		Calendar cal = Calendar.getInstance();
-		cal.setTimeInMillis(pMillis);
-		return Integer.toString(cal.get(Calendar.YEAR)) + '.' + pad(2, cal.get(Calendar.MONTH) + 1)
-				+ '.' + pad(2, cal.get(Calendar.DAY_OF_MONTH)) + ' '
-				+ pad(2, cal.get(Calendar.HOUR_OF_DAY)) + ':' + pad(2, cal.get(Calendar.MINUTE))
-				+ ':' + pad(2, cal.get(Calendar.SECOND));
+		return formatWorker(pMillis, false);
 	}
 
+	/**
+	 * formatWithMillis
+	 * 
+	 * @param pMillis
+	 *            - total milliseconds
+	 * @return formatted date/time String. ( YYYY.MM.DD HH:mm:SS.sss )
+	 */
+	public static String formatWithMillis(long pMillis) {
+		return formatWorker(pMillis, true);
+	}
 }