[jtrac-svn] SF.net SVN: j-trac:[1437] trunk/jtrac/src/main/java/info/jtrac

[<udi...@us...>]

Revision: 1437
          http://sourceforge.net/p/j-trac/code/1437
Author:   udittmer
Date:     2022-02-16 10:55:50 +0000 (Wed, 16 Feb 2022)
Log Message:
-----------
#166 Timestamp not being logged 

Modified Paths:
--------------
    trunk/jtrac/src/main/java/info/jtrac/domain/AbstractItem.java
    trunk/jtrac/src/main/java/info/jtrac/util/DateUtils.java

Modified: trunk/jtrac/src/main/java/info/jtrac/domain/AbstractItem.java
===================================================================
--- trunk/jtrac/src/main/java/info/jtrac/domain/AbstractItem.java	2022-02-14 08:44:23 UTC (rev 1436)
+++ trunk/jtrac/src/main/java/info/jtrac/domain/AbstractItem.java	2022-02-16 10:55:50 UTC (rev 1437)
@@ -148,7 +148,7 @@
                 return "";
             }
             if (o instanceof Date) {
-                return DateUtils.formatTimeStamp((Date) o); 
+                return DateUtils.format((Date) o); 
             }
             return o.toString();
         }

Modified: trunk/jtrac/src/main/java/info/jtrac/util/DateUtils.java
===================================================================
--- trunk/jtrac/src/main/java/info/jtrac/util/DateUtils.java	2022-02-14 08:44:23 UTC (rev 1436)
+++ trunk/jtrac/src/main/java/info/jtrac/util/DateUtils.java	2022-02-16 10:55:50 UTC (rev 1437)
@@ -57,9 +57,14 @@
 	}
 
     public static String format (Date date) {
+        //return date == null
+		//		? ""
+		//		: dateFormat.format(date);
         return date == null
 				? ""
-				: dateFormat.format(date);
+				: (showPretty()
+					? getPrettyTime().format(date)
+					: dateFormat.format(date));
     }
 
     public static String formatTimeStamp (Date date) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.