ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/main/java/util/concurrent/TimeUnit.java
(Generate patch)

Comparing jsr166/src/main/java/util/concurrent/TimeUnit.java (file contents):
Revision 1.42 by jsr166, Tue Jun 18 19:29:26 2013 UTC vs.
Revision 1.43 by jsr166, Wed Jul 17 21:17:43 2013 UTC

# Line 40 | Line 40 | package java.util.concurrent;
40   * @author Doug Lea
41   */
42   public enum TimeUnit {
43 +    /**
44 +     * Time unit representing one thousandth of a microsecond
45 +     */
46      NANOSECONDS {
47          public long toNanos(long d)   { return d; }
48          public long toMicros(long d)  { return d/(C1/C0); }
# Line 51 | Line 54 | public enum TimeUnit {
54          public long convert(long d, TimeUnit u) { return u.toNanos(d); }
55          int excessNanos(long d, long m) { return (int)(d - (m*C2)); }
56      },
57 +
58 +    /**
59 +     * Time unit representing one thousandth of a millisecond
60 +     */
61      MICROSECONDS {
62          public long toNanos(long d)   { return x(d, C1/C0, MAX/(C1/C0)); }
63          public long toMicros(long d)  { return d; }
# Line 62 | Line 69 | public enum TimeUnit {
69          public long convert(long d, TimeUnit u) { return u.toMicros(d); }
70          int excessNanos(long d, long m) { return (int)((d*C1) - (m*C2)); }
71      },
72 +
73 +    /**
74 +     * Time unit representing one thousandth of a second
75 +     */
76      MILLISECONDS {
77          public long toNanos(long d)   { return x(d, C2/C0, MAX/(C2/C0)); }
78          public long toMicros(long d)  { return x(d, C2/C1, MAX/(C2/C1)); }
# Line 73 | Line 84 | public enum TimeUnit {
84          public long convert(long d, TimeUnit u) { return u.toMillis(d); }
85          int excessNanos(long d, long m) { return 0; }
86      },
87 +
88 +    /**
89 +     * Time unit representing one second
90 +     */
91      SECONDS {
92          public long toNanos(long d)   { return x(d, C3/C0, MAX/(C3/C0)); }
93          public long toMicros(long d)  { return x(d, C3/C1, MAX/(C3/C1)); }
# Line 84 | Line 99 | public enum TimeUnit {
99          public long convert(long d, TimeUnit u) { return u.toSeconds(d); }
100          int excessNanos(long d, long m) { return 0; }
101      },
102 +
103 +    /**
104 +     * Time unit representing sixty seconds
105 +     */
106      MINUTES {
107          public long toNanos(long d)   { return x(d, C4/C0, MAX/(C4/C0)); }
108          public long toMicros(long d)  { return x(d, C4/C1, MAX/(C4/C1)); }
# Line 95 | Line 114 | public enum TimeUnit {
114          public long convert(long d, TimeUnit u) { return u.toMinutes(d); }
115          int excessNanos(long d, long m) { return 0; }
116      },
117 +
118 +    /**
119 +     * Time unit representing sixty minutes
120 +     */
121      HOURS {
122          public long toNanos(long d)   { return x(d, C5/C0, MAX/(C5/C0)); }
123          public long toMicros(long d)  { return x(d, C5/C1, MAX/(C5/C1)); }
# Line 106 | Line 129 | public enum TimeUnit {
129          public long convert(long d, TimeUnit u) { return u.toHours(d); }
130          int excessNanos(long d, long m) { return 0; }
131      },
132 +
133 +    /**
134 +     * Time unit representing twenty four hours
135 +     */
136      DAYS {
137          public long toNanos(long d)   { return x(d, C6/C0, MAX/(C6/C0)); }
138          public long toMicros(long d)  { return x(d, C6/C1, MAX/(C6/C1)); }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines