| |
@@ -1,14 +1,13 @@ |
| 1 |
1 |
|
package com.esotericsoftware.utils; |
| 2 |
2 |
|
|
| 3 |
|
- |
public class NewerBy |
| 4 |
|
- |
{ |
| |
3 |
+ |
public class NewerBy { |
| 5 |
4 |
|
public static final long MILLISECS_IN_SEC = 1000; |
| 6 |
5 |
|
public static final long MILLISECS_IN_MIN = 60 * MILLISECS_IN_SEC; |
| 7 |
6 |
|
public static final long MILLISECS_IN_HOUR = 60 * MILLISECS_IN_MIN; |
| 8 |
7 |
|
public static final long MILLISECS_IN_DAY = 24 * MILLISECS_IN_HOUR; |
| 9 |
8 |
|
public static final long MILLISECS_IN_SHORT_MONTH = 28 * MILLISECS_IN_DAY; |
| 10 |
9 |
|
public static final long MILLISECS_IN_LONG_MONTH = 31 * MILLISECS_IN_DAY; |
| 11 |
|
- |
public static final long MILLISECS_IN_YEAR = (long)(365.242 * MILLISECS_IN_DAY); |
| |
10 |
+ |
public static final long MILLISECS_IN_YEAR = (long) (365.242 * MILLISECS_IN_DAY); |
| 12 |
11 |
|
|
| 13 |
12 |
|
public static final long MILLISECS_IN_AVERAGE_MONTH = MILLISECS_IN_YEAR / 12; |
| 14 |
13 |
|
public static final long MILLISECS_IN_TWO_AVERAGE_MONTHS = MILLISECS_IN_AVERAGE_MONTH + MILLISECS_IN_AVERAGE_MONTH; |
| |
@@ -17,83 +16,58 @@ |
| 17 |
16 |
|
private final Long mToTimeMillis; |
| 18 |
17 |
|
private final Boolean mNewer; |
| 19 |
18 |
|
|
| 20 |
|
- |
public NewerBy( Long pFromTimeMillis, Long pToTimeMillis ) |
| 21 |
|
- |
{ |
| |
19 |
+ |
public NewerBy( Long pFromTimeMillis, Long pToTimeMillis ) { |
| 22 |
20 |
|
mFromTimeMillis = pFromTimeMillis; |
| 23 |
21 |
|
mToTimeMillis = pToTimeMillis; |
| 24 |
|
- |
if ( (pFromTimeMillis == null) || (pToTimeMillis == null) ) |
| 25 |
|
- |
{ |
| |
22 |
+ |
if ( (pFromTimeMillis == null) || (pToTimeMillis == null) ) { |
| 26 |
23 |
|
mNewer = null; |
| 27 |
|
- |
} |
| 28 |
|
- |
else |
| 29 |
|
- |
{ |
| |
24 |
+ |
} else { |
| 30 |
25 |
|
mNewer = (pToTimeMillis > pFromTimeMillis); |
| 31 |
26 |
|
} |
| 32 |
27 |
|
} |
| 33 |
28 |
|
|
| 34 |
|
- |
public boolean isNewer() |
| 35 |
|
- |
{ |
| |
29 |
+ |
public boolean isNewer() { |
| 36 |
30 |
|
return Boolean.TRUE.equals( mNewer ); |
| 37 |
31 |
|
} |
| 38 |
32 |
|
|
| 39 |
|
- |
public Long getFromTimeMillis() |
| 40 |
|
- |
{ |
| |
33 |
+ |
public Long getFromTimeMillis() { |
| 41 |
34 |
|
return mFromTimeMillis; |
| 42 |
35 |
|
} |
| 43 |
36 |
|
|
| 44 |
|
- |
public Long getToTimeMillis() |
| 45 |
|
- |
{ |
| |
37 |
+ |
public Long getToTimeMillis() { |
| 46 |
38 |
|
return mToTimeMillis; |
| 47 |
39 |
|
} |
| 48 |
40 |
|
|
| 49 |
41 |
|
@Override |
| 50 |
|
- |
public String toString() |
| 51 |
|
- |
{ |
| 52 |
|
- |
if ( mNewer == null ) |
| 53 |
|
- |
{ |
| |
42 |
+ |
public String toString() { |
| |
43 |
+ |
if ( mNewer == null ) { |
| 54 |
44 |
|
return "???"; |
| 55 |
45 |
|
} |
| 56 |
|
- |
if ( mToTimeMillis.equals( mFromTimeMillis ) ) |
| 57 |
|
- |
{ |
| |
46 |
+ |
if ( mToTimeMillis.equals( mFromTimeMillis ) ) { |
| 58 |
47 |
|
return "No Difference"; |
| 59 |
48 |
|
} |
| 60 |
49 |
|
StringBuilder sb = new StringBuilder(); |
| 61 |
50 |
|
long zDelta; |
| 62 |
|
- |
if ( mNewer ) |
| 63 |
|
- |
{ |
| |
51 |
+ |
if ( mNewer ) { |
| 64 |
52 |
|
sb.append( "Newer" ); |
| 65 |
53 |
|
zDelta = mToTimeMillis - mFromTimeMillis; |
| 66 |
|
- |
} |
| 67 |
|
- |
else |
| 68 |
|
- |
{ |
| |
54 |
+ |
} else { |
| 69 |
55 |
|
sb.append( "Older" ); |
| 70 |
56 |
|
zDelta = mFromTimeMillis - mToTimeMillis; |
| 71 |
57 |
|
} |
| 72 |
58 |
|
sb.append( " by " ); |
| 73 |
|
- |
if ( (zDelta < 0) || (MILLISECS_IN_YEAR < zDelta) ) |
| 74 |
|
- |
{ |
| |
59 |
+ |
if ( (zDelta < 0) || (MILLISECS_IN_YEAR < zDelta) ) { |
| 75 |
60 |
|
sb.append( "more than a year" ); |
| 76 |
|
- |
} |
| 77 |
|
- |
else if ( MILLISECS_IN_TWO_AVERAGE_MONTHS <= zDelta ) |
| 78 |
|
- |
{ |
| |
61 |
+ |
} else if ( MILLISECS_IN_TWO_AVERAGE_MONTHS <= zDelta ) { |
| 79 |
62 |
|
check( sb, zDelta, MILLISECS_IN_AVERAGE_MONTH, "month" ); |
| 80 |
|
- |
} |
| 81 |
|
- |
else if ( MILLISECS_IN_LONG_MONTH < zDelta ) |
| 82 |
|
- |
{ |
| |
63 |
+ |
} else if ( MILLISECS_IN_LONG_MONTH < zDelta ) { |
| 83 |
64 |
|
sb.append( "more than a month" ); |
| 84 |
|
- |
} |
| 85 |
|
- |
else if ( MILLISECS_IN_SHORT_MONTH < zDelta ) |
| 86 |
|
- |
{ |
| |
65 |
+ |
} else if ( MILLISECS_IN_SHORT_MONTH < zDelta ) { |
| 87 |
66 |
|
sb.append( "about a month" ); |
| 88 |
|
- |
} |
| 89 |
|
- |
else if ( !check( sb, zDelta, MILLISECS_IN_DAY, "day" ) ) |
| 90 |
|
- |
{ |
| 91 |
|
- |
if ( !check( sb, zDelta, MILLISECS_IN_HOUR, "hour" ) ) |
| 92 |
|
- |
{ |
| 93 |
|
- |
if ( !check( sb, zDelta, MILLISECS_IN_MIN, "minute" ) ) |
| 94 |
|
- |
{ |
| 95 |
|
- |
if ( !check( sb, zDelta, MILLISECS_IN_SEC, "second" ) ) |
| 96 |
|
- |
{ |
| |
67 |
+ |
} else if ( !check( sb, zDelta, MILLISECS_IN_DAY, "day" ) ) { |
| |
68 |
+ |
if ( !check( sb, zDelta, MILLISECS_IN_HOUR, "hour" ) ) { |
| |
69 |
+ |
if ( !check( sb, zDelta, MILLISECS_IN_MIN, "minute" ) ) { |
| |
70 |
+ |
if ( !check( sb, zDelta, MILLISECS_IN_SEC, "second" ) ) { |
| 97 |
71 |
|
sb.append( zDelta ).append( "ms" ); |
| 98 |
72 |
|
} |
| 99 |
73 |
|
} |
| |
@@ -102,23 +76,19 @@ |
| 102 |
76 |
|
return sb.toString(); |
| 103 |
77 |
|
} |
| 104 |
78 |
|
|
| 105 |
|
- |
private boolean check( StringBuilder sb, long pDelta, long pDenominator, String pWhat ) |
| 106 |
|
- |
{ |
| 107 |
|
- |
if ( (pDenominator + pDenominator) <= pDelta ) |
| 108 |
|
- |
{ |
| |
79 |
+ |
private boolean check( StringBuilder sb, long pDelta, long pDenominator, String pWhat ) { |
| |
80 |
+ |
if ( (pDenominator + pDenominator) <= pDelta ) { |
| 109 |
81 |
|
sb.append( "about " ).append( roundUp( pDelta, pDenominator ) ).append( " " + pWhat + "s" ); |
| 110 |
82 |
|
return true; |
| 111 |
83 |
|
} |
| 112 |
|
- |
if ( pDenominator < pDelta ) |
| 113 |
|
- |
{ |
| |
84 |
+ |
if ( pDenominator < pDelta ) { |
| 114 |
85 |
|
sb.append( "more than a " + pWhat ); |
| 115 |
86 |
|
return true; |
| 116 |
87 |
|
} |
| 117 |
88 |
|
return false; |
| 118 |
89 |
|
} |
| 119 |
90 |
|
|
| 120 |
|
- |
private long roundUp( long pNumerator, long pDenominator ) |
| 121 |
|
- |
{ |
| |
91 |
+ |
private long roundUp( long pNumerator, long pDenominator ) { |
| 122 |
92 |
|
return (pNumerator + (pDenominator / 2)) / pDenominator; |
| 123 |
93 |
|
} |
| 124 |
94 |
|
} |
View this file contents
View the full history
Commits for