Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/services/DynamicMainValuesService.java @ 9396:6ebc9357550c
Fixed: bundu bzws start year plus one
| author | mschaefer |
|---|---|
| date | Mon, 13 Aug 2018 17:15:05 +0200 |
| parents | 0255c51283a4 |
| children | bc9a45d2b1fa |
comparison
equal
deleted
inserted
replaced
| 9395:0255c51283a4 | 9396:6ebc9357550c |
|---|---|
| 82 if (startStr == null) | 82 if (startStr == null) |
| 83 throw new MainValuesServiceException("no start year"); | 83 throw new MainValuesServiceException("no start year"); |
| 84 | 84 |
| 85 try { | 85 try { |
| 86 final int year = Integer.parseInt(startStr); | 86 final int year = Integer.parseInt(startStr); |
| 87 | |
| 88 // FIXME: timezone? probably must match timezone of database | |
| 89 final Calendar cal = Calendar.getInstance(); | 87 final Calendar cal = Calendar.getInstance(); |
| 90 cal.clear(); | 88 cal.clear(); |
| 91 cal.set(year, 0, 1); | 89 cal.set(year, 0, 1); |
| 92 return cal.getTime(); | 90 return cal.getTime(); |
| 93 } | 91 } |
| 104 if (endStr == null) | 102 if (endStr == null) |
| 105 throw new MainValuesServiceException("no end year"); | 103 throw new MainValuesServiceException("no end year"); |
| 106 | 104 |
| 107 try { | 105 try { |
| 108 final int year = Integer.parseInt(endStr); | 106 final int year = Integer.parseInt(endStr); |
| 109 | |
| 110 // FIXME: timezone? probably must match timezone of database | |
| 111 final Calendar cal = Calendar.getInstance(); | 107 final Calendar cal = Calendar.getInstance(); |
| 112 cal.clear(); | 108 cal.clear(); |
| 113 cal.set(year, 11, 31); | 109 cal.set(year, 11, 31); |
| 114 return cal.getTime(); | 110 return cal.getTime(); |
| 115 } | 111 } |