Normand Briere
2019-04-22 a9e12f6c508810604c8c91ee15451776b08ce1a1
timeflow/data/time/TimeUnit.java
....@@ -5,15 +5,16 @@
55
66 public class TimeUnit
77 {
8
-
98 public static final TimeUnit YEAR = new TimeUnit("Years", Calendar.YEAR, 365 * 24 * 60 * 60 * 1000L, "yyyy", "yyyy");
109 public static final TimeUnit MONTH = new TimeUnit("Months", Calendar.MONTH, 30 * 24 * 60 * 60 * 1000L, "MMM", "MMM yyyy");
1110 public static final TimeUnit WEEK = new TimeUnit("Weeks", Calendar.WEEK_OF_YEAR, 7 * 24 * 60 * 60 * 1000L, "d", "MMM d yyyy");
1211 public static final TimeUnit DAY = new TimeUnit("Days", Calendar.DAY_OF_MONTH, 24 * 60 * 60 * 1000L, "d", "MMM d yyyy");
1312 public static final TimeUnit DAY_OF_WEEK = new TimeUnit("Days", Calendar.DAY_OF_WEEK, 24 * 60 * 60 * 1000L, "d", "MMM d yyyy");
14
- public static final TimeUnit HOUR = new TimeUnit("Hours", Calendar.HOUR_OF_DAY, 60 * 60 * 1000L, "kk:mm", "MMM d yyyy kk:mm");
15
- public static final TimeUnit MINUTE = new TimeUnit("Minutes", Calendar.MINUTE, 60 * 1000L, ":mm", "MMM d yyyy kk:mm");
16
- public static final TimeUnit SECOND = new TimeUnit("Seconds", Calendar.SECOND, 1000L, ":ss", "MMM d yyyy kk:mm:ss");
13
+ public static final TimeUnit HOUR = new TimeUnit("Hours", Calendar.HOUR_OF_DAY, 60 * 60 * 1000L, "HH:mm", "MMM d yyyy HH:mm");
14
+ public static final TimeUnit MINUTE = new TimeUnit("Minutes", Calendar.MINUTE, 60 * 1000L, ":mm", "MMM d yyyy HH:mm");
15
+ public static final TimeUnit SECOND = new TimeUnit("Seconds", Calendar.SECOND, 1000L, ":ss", "MMM d yyyy HH:mm:ss");
16
+ public static final TimeUnit REALTIME = new TimeUnit("Realtime", Calendar.MILLISECOND, 1L, ".SS", "HH:mm:ss.SS");
17
+
1718 public static final TimeUnit DECADE = multipleYears(10);
1819 public static final TimeUnit CENTURY = multipleYears(100);
1920 private static final double DAY_SIZE = 24 * 60 * 60 * 1000L;
....@@ -100,7 +101,7 @@
100101 }
101102 private static final int[] calendarUnits =
102103 {
103
- Calendar.SECOND, Calendar.MINUTE, Calendar.HOUR_OF_DAY, Calendar.DAY_OF_MONTH, Calendar.MONTH, Calendar.YEAR
104
+ Calendar.MILLISECOND, Calendar.SECOND, Calendar.MINUTE, Calendar.HOUR_OF_DAY, Calendar.DAY_OF_MONTH, Calendar.MONTH, Calendar.YEAR
104105 };
105106
106107 public RoughTime round(long timestamp, boolean up)
....@@ -127,7 +128,7 @@
127128 }
128129 if (i == calendarUnits.length - 1)
129130 {
130
- throw new IllegalArgumentException("Unsupported Calendar Unit: " + calendarCode);
131
+ //throw new IllegalArgumentException("Unsupported Calendar Unit: " + calendarCode);
131132 }
132133 c.set(calendarUnits[i], c.getMinimum(calendarUnits[i]));
133134 }
....@@ -237,7 +238,7 @@
237238
238239 public String format(Date date)
239240 {
240
- return format.format(date);
241
+ return format.format(date);
241242 }
242243
243244 public String formatFull(Date date)