Changeset 5668

Timestamp:

10/09/08 12:43:21 (6 weeks ago)

Author:

will

Message:

Fixed Date-Time printing of "n days". 3.1.2

Files:

• branches/ProtocolEditor/src/util/DefaultExport.java (modified) (2 diffs)

branches/ProtocolEditor/src/util/DefaultExport.java

@@ -34 +34 @@
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.GregorianCalendar;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -301 +303 @@
                 String UTCmillisecs = dataField.getAttribute(DataFieldConstants.UTC_MILLISECS);
                         if (UTCmillisecs != null) {
-                                SimpleDateFormat sdf = new SimpleDateFormat("MMM d, yyyy");
-                                date = date + sdf.format(new Long(UTCmillisecs));
+                                Calendar cal = new GregorianCalendar();
+                                cal.setTimeInMillis(new Long(UTCmillisecs));
+                                if (cal.get(Calendar.YEAR) == 1970) {
+                                        int days = cal.get(Calendar.DAY_OF_MONTH) - 1; // 1st of month is 0 days
+                                        date = date + days + " Days.";
+                                } else {
+                                        SimpleDateFormat sdf = new SimpleDateFormat("MMM d, yyyy");
+                                        date = date + sdf.format(cal.getTimeInMillis());
+                                }
                         } else {
                                 date = date + "none set.";